From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 19:51:31 +0800
Subject: [PATCH] 最新代码
---
ZigbeeApp/Home.Ios/AppDelegate.cs | 20
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 39
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 52
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json | 58
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/7.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/12.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 12
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 29
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/6.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.png | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 53
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 27
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json | 365
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs | 5
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/21.jpg | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 32
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 19
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/10.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 106
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/17.jpg | 0
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 23
ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs | 5
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG | 0
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 98
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 26
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 15
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/17.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.png | 0
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/10.jpg | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 10
ZigbeeApp/Home.Ios/Info.plist | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 46
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/13.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/13.png | 0
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 239
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs | 257
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/3.JPG | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 11
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 25
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs | 87
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/11.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 28
ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs | 1
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll | 0
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 161
ZigbeeApp/Shared/Common/CommonPage.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 26
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/6.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/7.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/11.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs | 26
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/12.png | 0
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs | 27
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs | 6
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 6
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/16.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon1.png | 0
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png | 0
ZigbeeApp/Home.Ios/Home.IOS.csproj | 139
ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon6.png | 0
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs | 11
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.png | 0
ZigbeeApp/Shared/R.cs | 131
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/11.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 6
ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon_6.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 314
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs | 45
ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs | 3817 ++++----
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/16.jpg | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs | 34
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/2.JPG | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs | 88
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 7
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs | 26
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon_6.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11pro.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png | 0
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs | 4
ZigbeeApp/Shared/Common/House.cs | 34
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconBigViewControl.cs | 81
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/11.png | 0
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 73
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 10050 +++++++++++-----------
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/5.JPG | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/15.jpg | 0
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 29
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG | 0
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 805 +
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 2439 ++---
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/20.jpg | 0
ZigbeeApp/Home.Ios/ZXingOverlayView.cs | 168
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/12.jpg | 0
ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 327
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs | 69
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/8.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/19.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 16
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/10.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.png | 0
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs | 23
ZigbeeApp/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs | 39
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs | 18
ZigbeeApp/Shared/Common/ZigbeeColor.cs | 10
ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11 Pro Max.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 66
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 14
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 171
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 69
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png | 0
ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs | 2
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/15.jpg | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 65
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/19.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/1.JPG | 0
ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs | 11
ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs | 45
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs | 26
ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 26
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs | 95
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 379
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs | 42
ZigbeeApp/Shared/Shared.projitems | 12
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.png | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs | 372
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs | 10
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/8.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs | 11
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/12.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/13.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs | 400
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 90
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080.png | 0
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs | 23
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs | 12
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 8
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/21.jpg | 0
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 2
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 198
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/4.JPG | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/14.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/18.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs | 10
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 2
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG | 0
ZigbeeApp/Shared/Phone/Login/AccountLogin.cs | 6
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 31
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/9.jpg | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/10.png | 0
ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/20.jpg | 0
ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs | 437
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/18.jpg | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceRelayDetailCardForm.cs | 308
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 11
ZigbeeApp/Shared/Phone/Login/AccountRegister.cs | 18
ZigbeeApp/Home.Ios/Resources/Language.ini | 73
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs | 12
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.png | 0
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs | 327
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs | 5
ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs | 437
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs | 4
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 1064 ++
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG | 0
ZigbeeApp/Shared/Common/Device.cs | 386
ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs | 24
ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs | 56
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/9.jpg | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/5.JPG | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 5
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/13.jpg | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 67
/dev/null | 77
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 31
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/14.jpg | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.png | 0
261 files changed, 15,936 insertions(+), 10,528 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 9c7a3d0..d6137cf 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -245,7 +245,6 @@
238=闀挎寜5绉掞紙鎸夐敭锛�
239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-240= S-one
241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
242=鐢甸噺
243=甯稿紑妯″紡宸插紑鍚�
@@ -271,7 +270,9 @@
263=鍖�
264=涓�
265=瑗�
-266=褰撳墠璁惧涓嶆敮鎸佽鍔熻兘
+266=褰撳墠璁惧涓嶅湪绾�
+267=鑾峰彇闊抽噺澶辫触
+268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
5097=鍙栨秷
5098=纭畾
@@ -527,6 +528,7 @@
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5380=甯稿紑妯″紡
+5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
@@ -1737,6 +1739,12 @@
16072=鑳屽厜鐏寒搴�
16073=鎵撳紑
16074=鏃ョ珛绌鸿皟妯″潡
+16075=瀹夎浣嶇疆
+16076=鎵�灞炰綇瀹�
+16077=涓嶅垎閰�
+16078=瀹ゅ唴鏈�
+16079=鎸夐敭
+16080=鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1822,7 +1830,7 @@
;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
30001=鐕冩皵浼犳劅鍣�
30002=鐑熼浘浼犳劅鍣�
@@ -1860,6 +1868,7 @@
30034=绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
30035=绠�绾�2璺獥甯橀潰鏉�
30036=鏂规偊/2璺獥甯橀潰鏉�-Z
+30037=S-one
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -1876,4 +1885,60 @@
40011=娓╂箍搴︿紶鎰熷櫒
40012=娓╁害浼犳劅鍣�
40013=婀垮害浼犳劅鍣�
-40014=骞叉帴鐐�
\ No newline at end of file
+40014=寮�鍏�
+40015=鎻掑骇
+40016=鐏厜
+40017=骞叉帴鐐�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+50000=绱ф�ユ寜閽�
+50001=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐕冩皵浼犳劅鍣�
+50003=Zigbee姘存蹈浼犳劅鍣�
+50004=閽ュ寵鎵�
+50005=Zigbee闂ㄧ獥浼犳劅鍣�
+50006=Zigbee鏅鸿兘绌哄紑
+50007=Zigbee寮�鍚堝笜鐢垫満
+50008=Zigbee 4鎸夐敭闈㈡澘
+50009=Zigbee鍚搁《寮忎汉浣撶Щ鍔ㄤ紶鎰熷櫒
+50010=Zigbee澧欒缃戝叧
+50011=Zigbee 3鎸夐敭闈㈡澘
+50012=Zigbee 2鎸夐敭闈㈡澘
+50013=Zigbee 3璺�10A缁х數鍣�
+50014=Zigbee妗岄潰缃戝叧
+50015=璋冭瘯璁惧
+50016=Zigbee鍗峰笜鐢垫満
+50017=Zigbee涓户鍣�
+50018=Zigbee 12鎸夐敭闈㈡澘
+50019=Zigbee 4鎸夐敭闈㈡澘
+50020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
+50021=Zigbee 1璺�1.5A璋冨厜鍣�
+50022=Zigbee杞珺uspro鍗忚杞崲鍣�
+50023=Zigbee杞�485鍗忚杞崲鍣�
+50024=Zigbee绌鸿皟缃戝叧妯″潡
+50025=Zigbee鏅鸿兘闂ㄩ攣
+50026=Zigbee绠�绾�4鎸夐敭闈㈡澘
+50027=Zigbee绠�绾�3鎸夐敭闈㈡澘
+50028=Zigbee绠�绾�2鎸夐敭闈㈡澘
+50029=Zigbee鏂规偊鍗曞紑鍙屾帶闈㈡澘
+50030=Zigbee鏂规偊鍙屽紑鍥涙帶闈㈡澘
+50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
+50032=Zigbee鏂规偊鏂伴闈㈡澘
+50033=Zigbee鏂规偊鐜闈㈡澘
+50034=Zigbee绠�绾�4鎸夐敭闈㈡澘
+50035=Zigbee绠�绾�2璺潰鏉�
+50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
+50037=Zigbee鏅鸿兘闂ㄩ攣
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+60000=浼犳劅鍣�
+60001=寮�鍏虫ā鍧�
+60002=閬槼妯″潡
+60003=鏅鸿兘闈㈡澘
+60004=鏅鸿兘缃戝叧
+60005=璋冭瘯璁惧
+60006=绯荤粺璁惧
+60007=璋冨厜妯″潡
+60008=杞崲鍣�
+60009=绌鸿皟妯″潡
+60010=鏅鸿兘闂ㄩ攣
\ No newline at end of file
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
index f11d3c7..4e66c42 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
index 8100032..f11d3c7 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon6.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon_6.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon_6.png
new file mode 100755
index 0000000..8100032
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Gateway/GatewayIcon_6.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
index 9856d91..0c0417d 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/0.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG
index 57d12a3..9e3b447 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/1.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/10.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/10.jpg
new file mode 100755
index 0000000..7c9d697
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/10.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/11.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/11.jpg
new file mode 100755
index 0000000..0db80d1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/11.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/12.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/12.jpg
new file mode 100755
index 0000000..f3078c4
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/12.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/13.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/13.jpg
new file mode 100755
index 0000000..9eda99f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/13.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/14.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/14.jpg
new file mode 100755
index 0000000..aa48b13
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/14.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/15.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/15.jpg
new file mode 100755
index 0000000..f97c0c4
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/15.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/16.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/16.jpg
new file mode 100755
index 0000000..ec735b2
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/16.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/17.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/17.jpg
new file mode 100755
index 0000000..eb83b2b
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/17.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/18.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/18.jpg
new file mode 100755
index 0000000..786212f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/18.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/19.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/19.jpg
new file mode 100755
index 0000000..5ce4d02
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/19.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG
index 3fd5092..e3dd8a7 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/2.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/20.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/20.jpg
new file mode 100755
index 0000000..689d58e
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/20.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/21.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/21.jpg
new file mode 100755
index 0000000..cc30bcf
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/21.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG
index f067431..f687c2f 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/3.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
index 783119c..ccd4c22 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/4.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/5.JPG b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/5.JPG
index 11acf8a..fcfe099 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/5.JPG
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/5.JPG
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/6.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/6.jpg
new file mode 100755
index 0000000..ced08fc
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/6.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/7.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/7.jpg
new file mode 100755
index 0000000..e921b5f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/7.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/8.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/8.jpg
new file mode 100755
index 0000000..fef83e1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/8.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/9.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/9.jpg
new file mode 100755
index 0000000..6307eb3
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RoomIcon/9.jpg
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg
deleted file mode 100755
index 842fbdb..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.png
new file mode 100755
index 0000000..291e99a
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/0.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg
deleted file mode 100755
index 85a2df1..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png
new file mode 100755
index 0000000..7cb8a39
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/10.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/10.png
new file mode 100755
index 0000000..229952e
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/10.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/11.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/11.png
new file mode 100755
index 0000000..b20b362
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/11.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/12.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/12.png
new file mode 100755
index 0000000..75a0a18
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/12.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/13.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/13.png
new file mode 100755
index 0000000..3910ba3
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/13.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg
deleted file mode 100755
index 8d969d8..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png
new file mode 100755
index 0000000..60ba5d0
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg
deleted file mode 100755
index e65a012..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png
new file mode 100755
index 0000000..8114692
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/3.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg
deleted file mode 100755
index 01bdaa4..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png
new file mode 100755
index 0000000..39173d5
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/4.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg
deleted file mode 100755
index 12fa10b..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.png
new file mode 100755
index 0000000..fdbfba0
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/5.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg
deleted file mode 100755
index c4f8c1c..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.png
new file mode 100755
index 0000000..cfe616b
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/6.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg
deleted file mode 100755
index 5404baa..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.png
new file mode 100755
index 0000000..281b3fa
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/7.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg
deleted file mode 100755
index c82a229..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.png
new file mode 100755
index 0000000..02cebe0
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/8.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg
deleted file mode 100755
index 0a90bf0..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.png
new file mode 100755
index 0000000..3d478a4
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/SceneIcon/9.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 4a0a2a6..b2b460f 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -422,8 +422,8 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\8IconSelected.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\9Icon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\9IconSelected.png" />
- <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon6.png" />
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon_6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway1.png" />
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />
@@ -1212,18 +1212,6 @@
<AndroidAsset Include="Assets\Phone\Account\Back.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\0.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\1.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\2.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\3.JPG" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\AutoBackup.png" />
</ItemGroup>
<ItemGroup>
@@ -1231,42 +1219,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Scene\Delaying.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\4.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomIcon\5.JPG" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\0.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\1.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\2.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\3.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\4.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\5.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\6.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\7.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\8.jpg" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\SceneIcon\9.jpg" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\MinusSign2.png" />
@@ -1967,6 +1919,117 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\BindPic\FreshAirIcon.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Gateway\GatewayIcon1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\0.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\1.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\2.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\3.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\4.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\5.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\6.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\7.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\8.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\9.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\10.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\11.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\12.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\SceneIcon\13.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\7.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\8.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\9.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\10.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\11.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\12.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\13.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\14.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\15.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\16.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\17.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\18.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\19.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\20.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\21.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\0.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\1.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\2.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\3.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\4.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\5.jpg" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\RoomIcon\6.jpg" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 928e93a..551a67c 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020032001" android:installLocation="auto" android:versionName="1.0.20032001">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020032301" android:installLocation="auto" android:versionName="1.0.20032301">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 012ca3c..d393349 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -34,233 +34,233 @@
public partial class Animation
{
- // aapt resource value: 0x7f050000
- public const int abc_fade_in = 2131034112;
+ // aapt resource value: 0x7F010000
+ public const int abc_fade_in = 2130771968;
- // aapt resource value: 0x7f050001
- public const int abc_fade_out = 2131034113;
+ // aapt resource value: 0x7F010001
+ public const int abc_fade_out = 2130771969;
- // aapt resource value: 0x7f050002
- public const int abc_grow_fade_in_from_bottom = 2131034114;
+ // aapt resource value: 0x7F010002
+ public const int abc_grow_fade_in_from_bottom = 2130771970;
- // aapt resource value: 0x7f050003
- public const int abc_popup_enter = 2131034115;
+ // aapt resource value: 0x7F010003
+ public const int abc_popup_enter = 2130771971;
- // aapt resource value: 0x7f050004
- public const int abc_popup_exit = 2131034116;
+ // aapt resource value: 0x7F010004
+ public const int abc_popup_exit = 2130771972;
- // aapt resource value: 0x7f050005
- public const int abc_shrink_fade_out_from_bottom = 2131034117;
+ // aapt resource value: 0x7F010005
+ public const int abc_shrink_fade_out_from_bottom = 2130771973;
- // aapt resource value: 0x7f050006
- public const int abc_slide_in_bottom = 2131034118;
+ // aapt resource value: 0x7F010006
+ public const int abc_slide_in_bottom = 2130771974;
- // aapt resource value: 0x7f050007
- public const int abc_slide_in_top = 2131034119;
+ // aapt resource value: 0x7F010007
+ public const int abc_slide_in_top = 2130771975;
- // aapt resource value: 0x7f050008
- public const int abc_slide_out_bottom = 2131034120;
+ // aapt resource value: 0x7F010008
+ public const int abc_slide_out_bottom = 2130771976;
- // aapt resource value: 0x7f050009
- public const int abc_slide_out_top = 2131034121;
+ // aapt resource value: 0x7F010009
+ public const int abc_slide_out_top = 2130771977;
- // aapt resource value: 0x7f05000a
- public const int design_bottom_sheet_slide_in = 2131034122;
+ // aapt resource value: 0x7F01000A
+ public const int design_bottom_sheet_slide_in = 2130771978;
- // aapt resource value: 0x7f05000b
- public const int design_bottom_sheet_slide_out = 2131034123;
+ // aapt resource value: 0x7F01000B
+ public const int design_bottom_sheet_slide_out = 2130771979;
- // aapt resource value: 0x7f05000c
- public const int design_snackbar_in = 2131034124;
+ // aapt resource value: 0x7F01000C
+ public const int design_snackbar_in = 2130771980;
- // aapt resource value: 0x7f05000d
- public const int design_snackbar_out = 2131034125;
+ // aapt resource value: 0x7F01000D
+ public const int design_snackbar_out = 2130771981;
- // aapt resource value: 0x7f05000e
- public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
+ // aapt resource value: 0x7F01000E
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
- // aapt resource value: 0x7f05000f
- public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
+ // aapt resource value: 0x7F01000F
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
- // aapt resource value: 0x7f050010
- public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
+ // aapt resource value: 0x7F010010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
- // aapt resource value: 0x7f050011
- public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
+ // aapt resource value: 0x7F010011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
- // aapt resource value: 0x7f050012
- public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
+ // aapt resource value: 0x7F010012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
- // aapt resource value: 0x7f050013
- public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
+ // aapt resource value: 0x7F010013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
- // aapt resource value: 0x7f050014
- public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
+ // aapt resource value: 0x7F010014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
- // aapt resource value: 0x7f050015
- public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
+ // aapt resource value: 0x7F010015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
- // aapt resource value: 0x7f050016
- public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
+ // aapt resource value: 0x7F010016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
- // aapt resource value: 0x7f050017
- public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
+ // aapt resource value: 0x7F010017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
- // aapt resource value: 0x7f050018
- public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
+ // aapt resource value: 0x7F010018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
- // aapt resource value: 0x7f050019
- public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
+ // aapt resource value: 0x7F010019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
- // aapt resource value: 0x7f05001a
- public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
+ // aapt resource value: 0x7F01001A
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
- // aapt resource value: 0x7f05001b
- public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
+ // aapt resource value: 0x7F01001B
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
- // aapt resource value: 0x7f05001c
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
+ // aapt resource value: 0x7F01001C
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
- // aapt resource value: 0x7f05001d
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
+ // aapt resource value: 0x7F01001D
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
- // aapt resource value: 0x7f05001e
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
+ // aapt resource value: 0x7F01001E
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
- // aapt resource value: 0x7f05001f
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
+ // aapt resource value: 0x7F01001F
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
- // aapt resource value: 0x7f050020
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
+ // aapt resource value: 0x7F010020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
- // aapt resource value: 0x7f050021
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
+ // aapt resource value: 0x7F010021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
- // aapt resource value: 0x7f050022
- public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+ // aapt resource value: 0x7F010022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
- // aapt resource value: 0x7f050023
- public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+ // aapt resource value: 0x7F010023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
- // aapt resource value: 0x7f050024
- public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+ // aapt resource value: 0x7F010024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
- // aapt resource value: 0x7f050025
- public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+ // aapt resource value: 0x7F010025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
- // aapt resource value: 0x7f050026
- public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
+ // aapt resource value: 0x7F010026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
- // aapt resource value: 0x7f050027
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
+ // aapt resource value: 0x7F010027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
- // aapt resource value: 0x7f050028
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
+ // aapt resource value: 0x7F010028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
- // aapt resource value: 0x7f050029
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
+ // aapt resource value: 0x7F010029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
- // aapt resource value: 0x7f05002a
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
+ // aapt resource value: 0x7F01002A
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
- // aapt resource value: 0x7f05002b
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
+ // aapt resource value: 0x7F01002B
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
- // aapt resource value: 0x7f05002c
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
+ // aapt resource value: 0x7F01002C
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
- // aapt resource value: 0x7f05002d
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
+ // aapt resource value: 0x7F01002D
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
- // aapt resource value: 0x7f05002e
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
+ // aapt resource value: 0x7F01002E
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
- // aapt resource value: 0x7f05002f
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
+ // aapt resource value: 0x7F01002F
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
- // aapt resource value: 0x7f050030
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
+ // aapt resource value: 0x7F010030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
- // aapt resource value: 0x7f050031
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
+ // aapt resource value: 0x7F010031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
- // aapt resource value: 0x7f050032
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
+ // aapt resource value: 0x7F010032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
- // aapt resource value: 0x7f050033
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
+ // aapt resource value: 0x7F010033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
- // aapt resource value: 0x7f050034
- public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
+ // aapt resource value: 0x7F010034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
- // aapt resource value: 0x7f050035
- public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
+ // aapt resource value: 0x7F010035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
- // aapt resource value: 0x7f050036
- public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
+ // aapt resource value: 0x7F010036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
- // aapt resource value: 0x7f050037
- public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
+ // aapt resource value: 0x7F010037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
- // aapt resource value: 0x7f050038
- public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
+ // aapt resource value: 0x7F010038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
- // aapt resource value: 0x7f050039
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
+ // aapt resource value: 0x7F010039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
- // aapt resource value: 0x7f05003a
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
+ // aapt resource value: 0x7F01003A
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
- // aapt resource value: 0x7f05003b
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
+ // aapt resource value: 0x7F01003B
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
- // aapt resource value: 0x7f05003c
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
+ // aapt resource value: 0x7F01003C
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
- // aapt resource value: 0x7f05003d
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
+ // aapt resource value: 0x7F01003D
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
- // aapt resource value: 0x7f05003e
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
+ // aapt resource value: 0x7F01003E
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
- // aapt resource value: 0x7f05003f
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
+ // aapt resource value: 0x7F01003F
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
- // aapt resource value: 0x7f050040
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
+ // aapt resource value: 0x7F010040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
- // aapt resource value: 0x7f050041
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
+ // aapt resource value: 0x7F010041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
- // aapt resource value: 0x7f050042
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
+ // aapt resource value: 0x7F010042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
- // aapt resource value: 0x7f050043
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
+ // aapt resource value: 0x7F010043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
- // aapt resource value: 0x7f050044
- public const int move_in = 2131034180;
+ // aapt resource value: 0x7F010044
+ public const int move_in = 2130772036;
- // aapt resource value: 0x7f050045
- public const int move_out = 2131034181;
+ // aapt resource value: 0x7F010045
+ public const int move_out = 2130772037;
- // aapt resource value: 0x7f050046
- public const int pickerview_dialog_scale_in = 2131034182;
+ // aapt resource value: 0x7F010046
+ public const int pickerview_dialog_scale_in = 2130772038;
- // aapt resource value: 0x7f050047
- public const int pickerview_dialog_scale_out = 2131034183;
+ // aapt resource value: 0x7F010047
+ public const int pickerview_dialog_scale_out = 2130772039;
- // aapt resource value: 0x7f050048
- public const int pickerview_slide_in_bottom = 2131034184;
+ // aapt resource value: 0x7F010048
+ public const int pickerview_slide_in_bottom = 2130772040;
- // aapt resource value: 0x7f050049
- public const int pickerview_slide_out_bottom = 2131034185;
+ // aapt resource value: 0x7F010049
+ public const int pickerview_slide_out_bottom = 2130772041;
- // aapt resource value: 0x7f05004a
- public const int tooltip_enter = 2131034186;
+ // aapt resource value: 0x7F01004A
+ public const int tooltip_enter = 2130772042;
- // aapt resource value: 0x7f05004b
- public const int tooltip_exit = 2131034187;
+ // aapt resource value: 0x7F01004B
+ public const int tooltip_exit = 2130772043;
static Animation()
{
@@ -275,8 +275,8 @@
public partial class Animator
{
- // aapt resource value: 0x7f060000
- public const int design_appbar_state_list_animator = 2131099648;
+ // aapt resource value: 0x7F020000
+ public const int design_appbar_state_list_animator = 2130837504;
static Animator()
{
@@ -291,8 +291,8 @@
public partial class Array
{
- // aapt resource value: 0x7f0f0000
- public const int arc_colors_default = 2131689472;
+ // aapt resource value: 0x7F030000
+ public const int arc_colors_default = 2130903040;
static Array()
{
@@ -307,1355 +307,1355 @@
public partial class Attribute
{
- // aapt resource value: 0x7f010052
- public const int actionBarDivider = 2130772050;
+ // aapt resource value: 0x7F040000
+ public const int actionBarDivider = 2130968576;
- // aapt resource value: 0x7f010053
- public const int actionBarItemBackground = 2130772051;
+ // aapt resource value: 0x7F040001
+ public const int actionBarItemBackground = 2130968577;
- // aapt resource value: 0x7f01004c
- public const int actionBarPopupTheme = 2130772044;
+ // aapt resource value: 0x7F040002
+ public const int actionBarPopupTheme = 2130968578;
- // aapt resource value: 0x7f010051
- public const int actionBarSize = 2130772049;
+ // aapt resource value: 0x7F040003
+ public const int actionBarSize = 2130968579;
- // aapt resource value: 0x7f01004e
- public const int actionBarSplitStyle = 2130772046;
+ // aapt resource value: 0x7F040004
+ public const int actionBarSplitStyle = 2130968580;
- // aapt resource value: 0x7f01004d
- public const int actionBarStyle = 2130772045;
+ // aapt resource value: 0x7F040005
+ public const int actionBarStyle = 2130968581;
- // aapt resource value: 0x7f010048
- public const int actionBarTabBarStyle = 2130772040;
+ // aapt resource value: 0x7F040006
+ public const int actionBarTabBarStyle = 2130968582;
- // aapt resource value: 0x7f010047
- public const int actionBarTabStyle = 2130772039;
+ // aapt resource value: 0x7F040007
+ public const int actionBarTabStyle = 2130968583;
- // aapt resource value: 0x7f010049
- public const int actionBarTabTextStyle = 2130772041;
+ // aapt resource value: 0x7F040008
+ public const int actionBarTabTextStyle = 2130968584;
- // aapt resource value: 0x7f01004f
- public const int actionBarTheme = 2130772047;
+ // aapt resource value: 0x7F040009
+ public const int actionBarTheme = 2130968585;
- // aapt resource value: 0x7f010050
- public const int actionBarWidgetTheme = 2130772048;
+ // aapt resource value: 0x7F04000A
+ public const int actionBarWidgetTheme = 2130968586;
- // aapt resource value: 0x7f01006d
- public const int actionButtonStyle = 2130772077;
+ // aapt resource value: 0x7F04000B
+ public const int actionButtonStyle = 2130968587;
- // aapt resource value: 0x7f010069
- public const int actionDropDownStyle = 2130772073;
+ // aapt resource value: 0x7F04000C
+ public const int actionDropDownStyle = 2130968588;
- // aapt resource value: 0x7f0100c4
- public const int actionLayout = 2130772164;
+ // aapt resource value: 0x7F04000D
+ public const int actionLayout = 2130968589;
- // aapt resource value: 0x7f010054
- public const int actionMenuTextAppearance = 2130772052;
+ // aapt resource value: 0x7F04000E
+ public const int actionMenuTextAppearance = 2130968590;
- // aapt resource value: 0x7f010055
- public const int actionMenuTextColor = 2130772053;
+ // aapt resource value: 0x7F04000F
+ public const int actionMenuTextColor = 2130968591;
- // aapt resource value: 0x7f010058
- public const int actionModeBackground = 2130772056;
+ // aapt resource value: 0x7F040010
+ public const int actionModeBackground = 2130968592;
- // aapt resource value: 0x7f010057
- public const int actionModeCloseButtonStyle = 2130772055;
+ // aapt resource value: 0x7F040011
+ public const int actionModeCloseButtonStyle = 2130968593;
- // aapt resource value: 0x7f01005a
- public const int actionModeCloseDrawable = 2130772058;
+ // aapt resource value: 0x7F040012
+ public const int actionModeCloseDrawable = 2130968594;
- // aapt resource value: 0x7f01005c
- public const int actionModeCopyDrawable = 2130772060;
+ // aapt resource value: 0x7F040013
+ public const int actionModeCopyDrawable = 2130968595;
- // aapt resource value: 0x7f01005b
- public const int actionModeCutDrawable = 2130772059;
+ // aapt resource value: 0x7F040014
+ public const int actionModeCutDrawable = 2130968596;
- // aapt resource value: 0x7f010060
- public const int actionModeFindDrawable = 2130772064;
+ // aapt resource value: 0x7F040015
+ public const int actionModeFindDrawable = 2130968597;
- // aapt resource value: 0x7f01005d
- public const int actionModePasteDrawable = 2130772061;
+ // aapt resource value: 0x7F040016
+ public const int actionModePasteDrawable = 2130968598;
- // aapt resource value: 0x7f010062
- public const int actionModePopupWindowStyle = 2130772066;
+ // aapt resource value: 0x7F040017
+ public const int actionModePopupWindowStyle = 2130968599;
- // aapt resource value: 0x7f01005e
- public const int actionModeSelectAllDrawable = 2130772062;
+ // aapt resource value: 0x7F040018
+ public const int actionModeSelectAllDrawable = 2130968600;
- // aapt resource value: 0x7f01005f
- public const int actionModeShareDrawable = 2130772063;
+ // aapt resource value: 0x7F040019
+ public const int actionModeShareDrawable = 2130968601;
- // aapt resource value: 0x7f010059
- public const int actionModeSplitBackground = 2130772057;
+ // aapt resource value: 0x7F04001A
+ public const int actionModeSplitBackground = 2130968602;
- // aapt resource value: 0x7f010056
- public const int actionModeStyle = 2130772054;
+ // aapt resource value: 0x7F04001B
+ public const int actionModeStyle = 2130968603;
- // aapt resource value: 0x7f010061
- public const int actionModeWebSearchDrawable = 2130772065;
+ // aapt resource value: 0x7F04001C
+ public const int actionModeWebSearchDrawable = 2130968604;
- // aapt resource value: 0x7f01004a
- public const int actionOverflowButtonStyle = 2130772042;
+ // aapt resource value: 0x7F04001D
+ public const int actionOverflowButtonStyle = 2130968605;
- // aapt resource value: 0x7f01004b
- public const int actionOverflowMenuStyle = 2130772043;
+ // aapt resource value: 0x7F04001E
+ public const int actionOverflowMenuStyle = 2130968606;
- // aapt resource value: 0x7f0100c6
- public const int actionProviderClass = 2130772166;
+ // aapt resource value: 0x7F04001F
+ public const int actionProviderClass = 2130968607;
- // aapt resource value: 0x7f0100c5
- public const int actionViewClass = 2130772165;
+ // aapt resource value: 0x7F040020
+ public const int actionViewClass = 2130968608;
- // aapt resource value: 0x7f010075
- public const int activityChooserViewStyle = 2130772085;
+ // aapt resource value: 0x7F040021
+ public const int activityChooserViewStyle = 2130968609;
- // aapt resource value: 0x7f01009a
- public const int alertDialogButtonGroupStyle = 2130772122;
+ // aapt resource value: 0x7F040022
+ public const int alertDialogButtonGroupStyle = 2130968610;
- // aapt resource value: 0x7f01009b
- public const int alertDialogCenterButtons = 2130772123;
+ // aapt resource value: 0x7F040023
+ public const int alertDialogCenterButtons = 2130968611;
- // aapt resource value: 0x7f010099
- public const int alertDialogStyle = 2130772121;
+ // aapt resource value: 0x7F040024
+ public const int alertDialogStyle = 2130968612;
- // aapt resource value: 0x7f01009c
- public const int alertDialogTheme = 2130772124;
+ // aapt resource value: 0x7F040025
+ public const int alertDialogTheme = 2130968613;
- // aapt resource value: 0x7f0100b2
- public const int allowStacking = 2130772146;
+ // aapt resource value: 0x7F040026
+ public const int allowStacking = 2130968614;
- // aapt resource value: 0x7f0100b3
- public const int alpha = 2130772147;
+ // aapt resource value: 0x7F040027
+ public const int alpha = 2130968615;
- // aapt resource value: 0x7f0100c1
- public const int alphabeticModifiers = 2130772161;
+ // aapt resource value: 0x7F040028
+ public const int alphabeticModifiers = 2130968616;
- // aapt resource value: 0x7f0101a3
- public const int arc_border_color = 2130772387;
+ // aapt resource value: 0x7F040029
+ public const int arc_border_color = 2130968617;
- // aapt resource value: 0x7f0101a2
- public const int arc_border_width = 2130772386;
+ // aapt resource value: 0x7F04002A
+ public const int arc_border_width = 2130968618;
- // aapt resource value: 0x7f0101a1
- public const int arc_colors = 2130772385;
+ // aapt resource value: 0x7F04002B
+ public const int arc_colors = 2130968619;
- // aapt resource value: 0x7f0101a4
- public const int arc_max = 2130772388;
+ // aapt resource value: 0x7F04002C
+ public const int arc_max = 2130968620;
- // aapt resource value: 0x7f0101a5
- public const int arc_min = 2130772389;
+ // aapt resource value: 0x7F04002D
+ public const int arc_min = 2130968621;
- // aapt resource value: 0x7f01019f
- public const int arc_open_angle = 2130772383;
+ // aapt resource value: 0x7F04002E
+ public const int arc_open_angle = 2130968622;
- // aapt resource value: 0x7f0101a6
- public const int arc_progress = 2130772390;
+ // aapt resource value: 0x7F04002F
+ public const int arc_progress = 2130968623;
- // aapt resource value: 0x7f0101ae
- public const int arc_progress_bar_color = 2130772398;
+ // aapt resource value: 0x7F040030
+ public const int arc_progress_bar_color = 2130968624;
- // aapt resource value: 0x7f0101af
- public const int arc_progress_bar_text_unit = 2130772399;
+ // aapt resource value: 0x7F040031
+ public const int arc_progress_bar_text_unit = 2130968625;
- // aapt resource value: 0x7f0101a0
- public const int arc_rotate_angle = 2130772384;
+ // aapt resource value: 0x7F040032
+ public const int arc_rotate_angle = 2130968626;
- // aapt resource value: 0x7f0101ad
- public const int arc_shadow_radius = 2130772397;
+ // aapt resource value: 0x7F040033
+ public const int arc_shadow_radius = 2130968627;
- // aapt resource value: 0x7f0101a8
- public const int arc_thumb_color = 2130772392;
+ // aapt resource value: 0x7F040034
+ public const int arc_thumb_color = 2130968628;
- // aapt resource value: 0x7f0101a9
- public const int arc_thumb_radius = 2130772393;
+ // aapt resource value: 0x7F040035
+ public const int arc_thumb_radius = 2130968629;
- // aapt resource value: 0x7f0101ab
- public const int arc_thumb_shadow_color = 2130772395;
+ // aapt resource value: 0x7F040036
+ public const int arc_thumb_shadow_color = 2130968630;
- // aapt resource value: 0x7f0101aa
- public const int arc_thumb_shadow_radius = 2130772394;
+ // aapt resource value: 0x7F040037
+ public const int arc_thumb_shadow_radius = 2130968631;
- // aapt resource value: 0x7f0101a7
- public const int arc_thumb_width = 2130772391;
+ // aapt resource value: 0x7F040038
+ public const int arc_thumb_width = 2130968632;
- // aapt resource value: 0x7f01019e
- public const int arc_width = 2130772382;
+ // aapt resource value: 0x7F040039
+ public const int arc_width = 2130968633;
- // aapt resource value: 0x7f0100ba
- public const int arrowHeadLength = 2130772154;
+ // aapt resource value: 0x7F04003A
+ public const int arrowHeadLength = 2130968634;
- // aapt resource value: 0x7f0100bb
- public const int arrowShaftLength = 2130772155;
+ // aapt resource value: 0x7F04003B
+ public const int arrowShaftLength = 2130968635;
- // aapt resource value: 0x7f0100a1
- public const int autoCompleteTextViewStyle = 2130772129;
+ // aapt resource value: 0x7F04003C
+ public const int autoCompleteTextViewStyle = 2130968636;
- // aapt resource value: 0x7f01003b
- public const int autoSizeMaxTextSize = 2130772027;
+ // aapt resource value: 0x7F04003D
+ public const int autoSizeMaxTextSize = 2130968637;
- // aapt resource value: 0x7f01003a
- public const int autoSizeMinTextSize = 2130772026;
+ // aapt resource value: 0x7F04003E
+ public const int autoSizeMinTextSize = 2130968638;
- // aapt resource value: 0x7f010039
- public const int autoSizePresetSizes = 2130772025;
+ // aapt resource value: 0x7F04003F
+ public const int autoSizePresetSizes = 2130968639;
- // aapt resource value: 0x7f010038
- public const int autoSizeStepGranularity = 2130772024;
+ // aapt resource value: 0x7F040040
+ public const int autoSizeStepGranularity = 2130968640;
- // aapt resource value: 0x7f010037
- public const int autoSizeTextType = 2130772023;
+ // aapt resource value: 0x7F040041
+ public const int autoSizeTextType = 2130968641;
- // aapt resource value: 0x7f010015
- public const int background = 2130771989;
+ // aapt resource value: 0x7F040042
+ public const int background = 2130968642;
- // aapt resource value: 0x7f010017
- public const int backgroundSplit = 2130771991;
+ // aapt resource value: 0x7F040043
+ public const int backgroundSplit = 2130968643;
- // aapt resource value: 0x7f010016
- public const int backgroundStacked = 2130771990;
+ // aapt resource value: 0x7F040044
+ public const int backgroundStacked = 2130968644;
- // aapt resource value: 0x7f0100fd
- public const int backgroundTint = 2130772221;
+ // aapt resource value: 0x7F040045
+ public const int backgroundTint = 2130968645;
- // aapt resource value: 0x7f0100fe
- public const int backgroundTintMode = 2130772222;
+ // aapt resource value: 0x7F040046
+ public const int backgroundTintMode = 2130968646;
- // aapt resource value: 0x7f0100bc
- public const int barLength = 2130772156;
+ // aapt resource value: 0x7F040047
+ public const int barLength = 2130968647;
- // aapt resource value: 0x7f010128
- public const int behavior_autoHide = 2130772264;
+ // aapt resource value: 0x7F040048
+ public const int behavior_autoHide = 2130968648;
- // aapt resource value: 0x7f010105
- public const int behavior_hideable = 2130772229;
+ // aapt resource value: 0x7F040049
+ public const int behavior_hideable = 2130968649;
- // aapt resource value: 0x7f010131
- public const int behavior_overlapTop = 2130772273;
+ // aapt resource value: 0x7F04004A
+ public const int behavior_overlapTop = 2130968650;
- // aapt resource value: 0x7f010104
- public const int behavior_peekHeight = 2130772228;
+ // aapt resource value: 0x7F04004B
+ public const int behavior_peekHeight = 2130968651;
- // aapt resource value: 0x7f010106
- public const int behavior_skipCollapsed = 2130772230;
+ // aapt resource value: 0x7F04004C
+ public const int behavior_skipCollapsed = 2130968652;
- // aapt resource value: 0x7f01015a
- public const int biometricPromptDialogTheme = 2130772314;
+ // aapt resource value: 0x7F04004D
+ public const int biometricPromptDialogTheme = 2130968653;
- // aapt resource value: 0x7f010126
- public const int borderWidth = 2130772262;
+ // aapt resource value: 0x7F04004F
+ public const int borderlessButtonStyle = 2130968655;
- // aapt resource value: 0x7f010072
- public const int borderlessButtonStyle = 2130772082;
+ // aapt resource value: 0x7F04004E
+ public const int borderWidth = 2130968654;
- // aapt resource value: 0x7f010120
- public const int bottomSheetDialogTheme = 2130772256;
+ // aapt resource value: 0x7F040050
+ public const int bottomSheetDialogTheme = 2130968656;
- // aapt resource value: 0x7f010121
- public const int bottomSheetStyle = 2130772257;
+ // aapt resource value: 0x7F040051
+ public const int bottomSheetStyle = 2130968657;
- // aapt resource value: 0x7f01006f
- public const int buttonBarButtonStyle = 2130772079;
+ // aapt resource value: 0x7F040052
+ public const int buttonBarButtonStyle = 2130968658;
- // aapt resource value: 0x7f01009f
- public const int buttonBarNegativeButtonStyle = 2130772127;
+ // aapt resource value: 0x7F040053
+ public const int buttonBarNegativeButtonStyle = 2130968659;
- // aapt resource value: 0x7f0100a0
- public const int buttonBarNeutralButtonStyle = 2130772128;
+ // aapt resource value: 0x7F040054
+ public const int buttonBarNeutralButtonStyle = 2130968660;
- // aapt resource value: 0x7f01009e
- public const int buttonBarPositiveButtonStyle = 2130772126;
+ // aapt resource value: 0x7F040055
+ public const int buttonBarPositiveButtonStyle = 2130968661;
- // aapt resource value: 0x7f01006e
- public const int buttonBarStyle = 2130772078;
+ // aapt resource value: 0x7F040056
+ public const int buttonBarStyle = 2130968662;
- // aapt resource value: 0x7f0100f2
- public const int buttonGravity = 2130772210;
+ // aapt resource value: 0x7F040057
+ public const int buttonGravity = 2130968663;
- // aapt resource value: 0x7f01002a
- public const int buttonPanelSideLayout = 2130772010;
+ // aapt resource value: 0x7F040058
+ public const int buttonPanelSideLayout = 2130968664;
- // aapt resource value: 0x7f0100a2
- public const int buttonStyle = 2130772130;
+ // aapt resource value: 0x7F040059
+ public const int buttonStyle = 2130968665;
- // aapt resource value: 0x7f0100a3
- public const int buttonStyleSmall = 2130772131;
+ // aapt resource value: 0x7F04005A
+ public const int buttonStyleSmall = 2130968666;
- // aapt resource value: 0x7f0100b4
- public const int buttonTint = 2130772148;
+ // aapt resource value: 0x7F04005B
+ public const int buttonTint = 2130968667;
- // aapt resource value: 0x7f0100b5
- public const int buttonTintMode = 2130772149;
+ // aapt resource value: 0x7F04005C
+ public const int buttonTintMode = 2130968668;
- // aapt resource value: 0x7f0100a4
- public const int checkboxStyle = 2130772132;
+ // aapt resource value: 0x7F04005D
+ public const int checkboxStyle = 2130968669;
- // aapt resource value: 0x7f0100a5
- public const int checkedTextViewStyle = 2130772133;
+ // aapt resource value: 0x7F04005E
+ public const int checkedTextViewStyle = 2130968670;
- // aapt resource value: 0x7f0100d5
- public const int closeIcon = 2130772181;
+ // aapt resource value: 0x7F04005F
+ public const int closeIcon = 2130968671;
- // aapt resource value: 0x7f010027
- public const int closeItemLayout = 2130772007;
+ // aapt resource value: 0x7F040060
+ public const int closeItemLayout = 2130968672;
- // aapt resource value: 0x7f0100f4
- public const int collapseContentDescription = 2130772212;
+ // aapt resource value: 0x7F040061
+ public const int collapseContentDescription = 2130968673;
- // aapt resource value: 0x7f0100f3
- public const int collapseIcon = 2130772211;
+ // aapt resource value: 0x7F040063
+ public const int collapsedTitleGravity = 2130968675;
- // aapt resource value: 0x7f010113
- public const int collapsedTitleGravity = 2130772243;
+ // aapt resource value: 0x7F040064
+ public const int collapsedTitleTextAppearance = 2130968676;
- // aapt resource value: 0x7f01010d
- public const int collapsedTitleTextAppearance = 2130772237;
+ // aapt resource value: 0x7F040062
+ public const int collapseIcon = 2130968674;
- // aapt resource value: 0x7f0100b6
- public const int color = 2130772150;
+ // aapt resource value: 0x7F040065
+ public const int color = 2130968677;
- // aapt resource value: 0x7f010091
- public const int colorAccent = 2130772113;
+ // aapt resource value: 0x7F040066
+ public const int colorAccent = 2130968678;
- // aapt resource value: 0x7f010098
- public const int colorBackgroundFloating = 2130772120;
+ // aapt resource value: 0x7F040067
+ public const int colorBackgroundFloating = 2130968679;
- // aapt resource value: 0x7f010095
- public const int colorButtonNormal = 2130772117;
+ // aapt resource value: 0x7F040068
+ public const int colorButtonNormal = 2130968680;
- // aapt resource value: 0x7f010093
- public const int colorControlActivated = 2130772115;
+ // aapt resource value: 0x7F040069
+ public const int colorControlActivated = 2130968681;
- // aapt resource value: 0x7f010094
- public const int colorControlHighlight = 2130772116;
+ // aapt resource value: 0x7F04006A
+ public const int colorControlHighlight = 2130968682;
- // aapt resource value: 0x7f010092
- public const int colorControlNormal = 2130772114;
+ // aapt resource value: 0x7F04006B
+ public const int colorControlNormal = 2130968683;
- // aapt resource value: 0x7f0100b1
- public const int colorError = 2130772145;
+ // aapt resource value: 0x7F04006C
+ public const int colorError = 2130968684;
- // aapt resource value: 0x7f01008f
- public const int colorPrimary = 2130772111;
+ // aapt resource value: 0x7F04006D
+ public const int colorPrimary = 2130968685;
- // aapt resource value: 0x7f010090
- public const int colorPrimaryDark = 2130772112;
+ // aapt resource value: 0x7F04006E
+ public const int colorPrimaryDark = 2130968686;
- // aapt resource value: 0x7f010096
- public const int colorSwitchThumbNormal = 2130772118;
+ // aapt resource value: 0x7F04006F
+ public const int colorSwitchThumbNormal = 2130968687;
- // aapt resource value: 0x7f0100da
- public const int commitIcon = 2130772186;
+ // aapt resource value: 0x7F040070
+ public const int commitIcon = 2130968688;
- // aapt resource value: 0x7f0100c7
- public const int contentDescription = 2130772167;
+ // aapt resource value: 0x7F040071
+ public const int contentDescription = 2130968689;
- // aapt resource value: 0x7f010020
- public const int contentInsetEnd = 2130772000;
+ // aapt resource value: 0x7F040072
+ public const int contentInsetEnd = 2130968690;
- // aapt resource value: 0x7f010024
- public const int contentInsetEndWithActions = 2130772004;
+ // aapt resource value: 0x7F040073
+ public const int contentInsetEndWithActions = 2130968691;
- // aapt resource value: 0x7f010021
- public const int contentInsetLeft = 2130772001;
+ // aapt resource value: 0x7F040074
+ public const int contentInsetLeft = 2130968692;
- // aapt resource value: 0x7f010022
- public const int contentInsetRight = 2130772002;
+ // aapt resource value: 0x7F040075
+ public const int contentInsetRight = 2130968693;
- // aapt resource value: 0x7f01001f
- public const int contentInsetStart = 2130771999;
+ // aapt resource value: 0x7F040076
+ public const int contentInsetStart = 2130968694;
- // aapt resource value: 0x7f010023
- public const int contentInsetStartWithNavigation = 2130772003;
+ // aapt resource value: 0x7F040077
+ public const int contentInsetStartWithNavigation = 2130968695;
- // aapt resource value: 0x7f01010e
- public const int contentScrim = 2130772238;
+ // aapt resource value: 0x7F040078
+ public const int contentScrim = 2130968696;
- // aapt resource value: 0x7f010097
- public const int controlBackground = 2130772119;
+ // aapt resource value: 0x7F040079
+ public const int controlBackground = 2130968697;
- // aapt resource value: 0x7f010147
- public const int counterEnabled = 2130772295;
+ // aapt resource value: 0x7F04007A
+ public const int counterEnabled = 2130968698;
- // aapt resource value: 0x7f010148
- public const int counterMaxLength = 2130772296;
+ // aapt resource value: 0x7F04007B
+ public const int counterMaxLength = 2130968699;
- // aapt resource value: 0x7f01014a
- public const int counterOverflowTextAppearance = 2130772298;
+ // aapt resource value: 0x7F04007C
+ public const int counterOverflowTextAppearance = 2130968700;
- // aapt resource value: 0x7f010149
- public const int counterTextAppearance = 2130772297;
+ // aapt resource value: 0x7F04007D
+ public const int counterTextAppearance = 2130968701;
- // aapt resource value: 0x7f0101b2
- public const int curtain_bar_bg_color = 2130772402;
+ // aapt resource value: 0x7F04007E
+ public const int curtain_bar_bg_color = 2130968702;
- // aapt resource value: 0x7f0101b3
- public const int curtain_bar_border_color = 2130772403;
+ // aapt resource value: 0x7F04007F
+ public const int curtain_bar_border_color = 2130968703;
- // aapt resource value: 0x7f0101b0
- public const int curtain_bar_color = 2130772400;
+ // aapt resource value: 0x7F040080
+ public const int curtain_bar_color = 2130968704;
- // aapt resource value: 0x7f0101b5
- public const int curtain_bar_height = 2130772405;
+ // aapt resource value: 0x7F040081
+ public const int curtain_bar_height = 2130968705;
- // aapt resource value: 0x7f0101b4
- public const int curtain_bar_width = 2130772404;
+ // aapt resource value: 0x7F040082
+ public const int curtain_bar_width = 2130968706;
- // aapt resource value: 0x7f010018
- public const int customNavigationLayout = 2130771992;
+ // aapt resource value: 0x7F040083
+ public const int customNavigationLayout = 2130968707;
- // aapt resource value: 0x7f0100d4
- public const int defaultQueryHint = 2130772180;
+ // aapt resource value: 0x7F040084
+ public const int defaultQueryHint = 2130968708;
- // aapt resource value: 0x7f010067
- public const int dialogPreferredPadding = 2130772071;
+ // aapt resource value: 0x7F040085
+ public const int dialogPreferredPadding = 2130968709;
- // aapt resource value: 0x7f010066
- public const int dialogTheme = 2130772070;
+ // aapt resource value: 0x7F040086
+ public const int dialogTheme = 2130968710;
- // aapt resource value: 0x7f01000e
- public const int displayOptions = 2130771982;
+ // aapt resource value: 0x7F040087
+ public const int displayOptions = 2130968711;
- // aapt resource value: 0x7f010014
- public const int divider = 2130771988;
+ // aapt resource value: 0x7F040088
+ public const int divider = 2130968712;
- // aapt resource value: 0x7f010074
- public const int dividerHorizontal = 2130772084;
+ // aapt resource value: 0x7F040089
+ public const int dividerHorizontal = 2130968713;
- // aapt resource value: 0x7f0100c0
- public const int dividerPadding = 2130772160;
+ // aapt resource value: 0x7F04008A
+ public const int dividerPadding = 2130968714;
- // aapt resource value: 0x7f010073
- public const int dividerVertical = 2130772083;
+ // aapt resource value: 0x7F04008B
+ public const int dividerVertical = 2130968715;
- // aapt resource value: 0x7f0100b8
- public const int drawableSize = 2130772152;
+ // aapt resource value: 0x7F04008C
+ public const int drawableSize = 2130968716;
- // aapt resource value: 0x7f010009
- public const int drawerArrowStyle = 2130771977;
+ // aapt resource value: 0x7F04008D
+ public const int drawerArrowStyle = 2130968717;
- // aapt resource value: 0x7f010086
- public const int dropDownListViewStyle = 2130772102;
+ // aapt resource value: 0x7F04008F
+ public const int dropdownListPreferredItemHeight = 2130968719;
- // aapt resource value: 0x7f01006a
- public const int dropdownListPreferredItemHeight = 2130772074;
+ // aapt resource value: 0x7F04008E
+ public const int dropDownListViewStyle = 2130968718;
- // aapt resource value: 0x7f01007b
- public const int editTextBackground = 2130772091;
+ // aapt resource value: 0x7F040090
+ public const int editTextBackground = 2130968720;
- // aapt resource value: 0x7f01007a
- public const int editTextColor = 2130772090;
+ // aapt resource value: 0x7F040091
+ public const int editTextColor = 2130968721;
- // aapt resource value: 0x7f0100a6
- public const int editTextStyle = 2130772134;
+ // aapt resource value: 0x7F040092
+ public const int editTextStyle = 2130968722;
- // aapt resource value: 0x7f010025
- public const int elevation = 2130772005;
+ // aapt resource value: 0x7F040093
+ public const int elevation = 2130968723;
- // aapt resource value: 0x7f010145
- public const int errorEnabled = 2130772293;
+ // aapt resource value: 0x7F040094
+ public const int errorEnabled = 2130968724;
- // aapt resource value: 0x7f010146
- public const int errorTextAppearance = 2130772294;
+ // aapt resource value: 0x7F040095
+ public const int errorTextAppearance = 2130968725;
- // aapt resource value: 0x7f010029
- public const int expandActivityOverflowButtonDrawable = 2130772009;
+ // aapt resource value: 0x7F040096
+ public const int expandActivityOverflowButtonDrawable = 2130968726;
- // aapt resource value: 0x7f0100ff
- public const int expanded = 2130772223;
+ // aapt resource value: 0x7F040097
+ public const int expanded = 2130968727;
- // aapt resource value: 0x7f010114
- public const int expandedTitleGravity = 2130772244;
+ // aapt resource value: 0x7F040098
+ public const int expandedTitleGravity = 2130968728;
- // aapt resource value: 0x7f010107
- public const int expandedTitleMargin = 2130772231;
+ // aapt resource value: 0x7F040099
+ public const int expandedTitleMargin = 2130968729;
- // aapt resource value: 0x7f01010b
- public const int expandedTitleMarginBottom = 2130772235;
+ // aapt resource value: 0x7F04009A
+ public const int expandedTitleMarginBottom = 2130968730;
- // aapt resource value: 0x7f01010a
- public const int expandedTitleMarginEnd = 2130772234;
+ // aapt resource value: 0x7F04009B
+ public const int expandedTitleMarginEnd = 2130968731;
- // aapt resource value: 0x7f010108
- public const int expandedTitleMarginStart = 2130772232;
+ // aapt resource value: 0x7F04009C
+ public const int expandedTitleMarginStart = 2130968732;
- // aapt resource value: 0x7f010109
- public const int expandedTitleMarginTop = 2130772233;
+ // aapt resource value: 0x7F04009D
+ public const int expandedTitleMarginTop = 2130968733;
- // aapt resource value: 0x7f01010c
- public const int expandedTitleTextAppearance = 2130772236;
+ // aapt resource value: 0x7F04009E
+ public const int expandedTitleTextAppearance = 2130968734;
- // aapt resource value: 0x7f010124
- public const int fabSize = 2130772260;
+ // aapt resource value: 0x7F04009F
+ public const int fabSize = 2130968735;
- // aapt resource value: 0x7f010004
- public const int fastScrollEnabled = 2130771972;
+ // aapt resource value: 0x7F0400A0
+ public const int fastScrollEnabled = 2130968736;
- // aapt resource value: 0x7f010007
- public const int fastScrollHorizontalThumbDrawable = 2130771975;
+ // aapt resource value: 0x7F0400A1
+ public const int fastScrollHorizontalThumbDrawable = 2130968737;
- // aapt resource value: 0x7f010008
- public const int fastScrollHorizontalTrackDrawable = 2130771976;
+ // aapt resource value: 0x7F0400A2
+ public const int fastScrollHorizontalTrackDrawable = 2130968738;
- // aapt resource value: 0x7f010005
- public const int fastScrollVerticalThumbDrawable = 2130771973;
+ // aapt resource value: 0x7F0400A3
+ public const int fastScrollVerticalThumbDrawable = 2130968739;
- // aapt resource value: 0x7f010006
- public const int fastScrollVerticalTrackDrawable = 2130771974;
+ // aapt resource value: 0x7F0400A4
+ public const int fastScrollVerticalTrackDrawable = 2130968740;
- // aapt resource value: 0x7f010158
- public const int font = 2130772312;
+ // aapt resource value: 0x7F0400A5
+ public const int font = 2130968741;
- // aapt resource value: 0x7f01003c
- public const int fontFamily = 2130772028;
+ // aapt resource value: 0x7F0400A6
+ public const int fontFamily = 2130968742;
- // aapt resource value: 0x7f010151
- public const int fontProviderAuthority = 2130772305;
+ // aapt resource value: 0x7F0400A7
+ public const int fontProviderAuthority = 2130968743;
- // aapt resource value: 0x7f010154
- public const int fontProviderCerts = 2130772308;
+ // aapt resource value: 0x7F0400A8
+ public const int fontProviderCerts = 2130968744;
- // aapt resource value: 0x7f010155
- public const int fontProviderFetchStrategy = 2130772309;
+ // aapt resource value: 0x7F0400A9
+ public const int fontProviderFetchStrategy = 2130968745;
- // aapt resource value: 0x7f010156
- public const int fontProviderFetchTimeout = 2130772310;
+ // aapt resource value: 0x7F0400AA
+ public const int fontProviderFetchTimeout = 2130968746;
- // aapt resource value: 0x7f010152
- public const int fontProviderPackage = 2130772306;
+ // aapt resource value: 0x7F0400AB
+ public const int fontProviderPackage = 2130968747;
- // aapt resource value: 0x7f010153
- public const int fontProviderQuery = 2130772307;
+ // aapt resource value: 0x7F0400AC
+ public const int fontProviderQuery = 2130968748;
- // aapt resource value: 0x7f010157
- public const int fontStyle = 2130772311;
+ // aapt resource value: 0x7F0400AD
+ public const int fontStyle = 2130968749;
- // aapt resource value: 0x7f010159
- public const int fontWeight = 2130772313;
+ // aapt resource value: 0x7F0400AE
+ public const int fontWeight = 2130968750;
- // aapt resource value: 0x7f010129
- public const int foregroundInsidePadding = 2130772265;
+ // aapt resource value: 0x7F0400AF
+ public const int foregroundInsidePadding = 2130968751;
- // aapt resource value: 0x7f0100b9
- public const int gapBetweenBars = 2130772153;
+ // aapt resource value: 0x7F0400B0
+ public const int gapBetweenBars = 2130968752;
- // aapt resource value: 0x7f0100d6
- public const int goIcon = 2130772182;
+ // aapt resource value: 0x7F0400B1
+ public const int goIcon = 2130968753;
- // aapt resource value: 0x7f0101ac
- public const int hdl_arc_thumb_mode = 2130772396;
+ // aapt resource value: 0x7F0400B2
+ public const int hdl_arc_thumb_mode = 2130968754;
- // aapt resource value: 0x7f01012f
- public const int headerLayout = 2130772271;
+ // aapt resource value: 0x7F0400B3
+ public const int headerLayout = 2130968755;
- // aapt resource value: 0x7f01000a
- public const int height = 2130771978;
+ // aapt resource value: 0x7F0400B4
+ public const int height = 2130968756;
- // aapt resource value: 0x7f01001e
- public const int hideOnContentScroll = 2130771998;
+ // aapt resource value: 0x7F0400B5
+ public const int hideOnContentScroll = 2130968757;
- // aapt resource value: 0x7f01014b
- public const int hintAnimationEnabled = 2130772299;
+ // aapt resource value: 0x7F0400B6
+ public const int hintAnimationEnabled = 2130968758;
- // aapt resource value: 0x7f010144
- public const int hintEnabled = 2130772292;
+ // aapt resource value: 0x7F0400B7
+ public const int hintEnabled = 2130968759;
- // aapt resource value: 0x7f010143
- public const int hintTextAppearance = 2130772291;
+ // aapt resource value: 0x7F0400B8
+ public const int hintTextAppearance = 2130968760;
- // aapt resource value: 0x7f01006c
- public const int homeAsUpIndicator = 2130772076;
+ // aapt resource value: 0x7F0400B9
+ public const int homeAsUpIndicator = 2130968761;
- // aapt resource value: 0x7f010019
- public const int homeLayout = 2130771993;
+ // aapt resource value: 0x7F0400BA
+ public const int homeLayout = 2130968762;
- // aapt resource value: 0x7f010012
- public const int icon = 2130771986;
+ // aapt resource value: 0x7F0400BB
+ public const int icon = 2130968763;
- // aapt resource value: 0x7f0100c9
- public const int iconTint = 2130772169;
+ // aapt resource value: 0x7F0400BE
+ public const int iconifiedByDefault = 2130968766;
- // aapt resource value: 0x7f0100ca
- public const int iconTintMode = 2130772170;
+ // aapt resource value: 0x7F0400BC
+ public const int iconTint = 2130968764;
- // aapt resource value: 0x7f0100d2
- public const int iconifiedByDefault = 2130772178;
+ // aapt resource value: 0x7F0400BD
+ public const int iconTintMode = 2130968765;
- // aapt resource value: 0x7f01007c
- public const int imageButtonStyle = 2130772092;
+ // aapt resource value: 0x7F0400BF
+ public const int imageButtonStyle = 2130968767;
- // aapt resource value: 0x7f01001b
- public const int indeterminateProgressStyle = 2130771995;
+ // aapt resource value: 0x7F0400C0
+ public const int indeterminateProgressStyle = 2130968768;
- // aapt resource value: 0x7f010028
- public const int initialActivityCount = 2130772008;
+ // aapt resource value: 0x7F0400C1
+ public const int initialActivityCount = 2130968769;
- // aapt resource value: 0x7f010130
- public const int insetForeground = 2130772272;
+ // aapt resource value: 0x7F0400C2
+ public const int insetForeground = 2130968770;
- // aapt resource value: 0x7f01000b
- public const int isLightTheme = 2130771979;
+ // aapt resource value: 0x7F0400C3
+ public const int isLightTheme = 2130968771;
- // aapt resource value: 0x7f01012d
- public const int itemBackground = 2130772269;
+ // aapt resource value: 0x7F0400C4
+ public const int itemBackground = 2130968772;
- // aapt resource value: 0x7f01012b
- public const int itemIconTint = 2130772267;
+ // aapt resource value: 0x7F0400C5
+ public const int itemIconTint = 2130968773;
- // aapt resource value: 0x7f01001d
- public const int itemPadding = 2130771997;
+ // aapt resource value: 0x7F0400C6
+ public const int itemPadding = 2130968774;
- // aapt resource value: 0x7f01012e
- public const int itemTextAppearance = 2130772270;
+ // aapt resource value: 0x7F0400C7
+ public const int itemTextAppearance = 2130968775;
- // aapt resource value: 0x7f01012c
- public const int itemTextColor = 2130772268;
+ // aapt resource value: 0x7F0400C8
+ public const int itemTextColor = 2130968776;
- // aapt resource value: 0x7f010118
- public const int keylines = 2130772248;
+ // aapt resource value: 0x7F0400C9
+ public const int keylines = 2130968777;
- // aapt resource value: 0x7f0100d1
- public const int layout = 2130772177;
+ // aapt resource value: 0x7F0400CA
+ public const int layout = 2130968778;
- // aapt resource value: 0x7f010000
- public const int layoutManager = 2130771968;
+ // aapt resource value: 0x7F0400CB
+ public const int layoutManager = 2130968779;
- // aapt resource value: 0x7f01011b
- public const int layout_anchor = 2130772251;
+ // aapt resource value: 0x7F0400CC
+ public const int layout_anchor = 2130968780;
- // aapt resource value: 0x7f01011d
- public const int layout_anchorGravity = 2130772253;
+ // aapt resource value: 0x7F0400CD
+ public const int layout_anchorGravity = 2130968781;
- // aapt resource value: 0x7f01011a
- public const int layout_behavior = 2130772250;
+ // aapt resource value: 0x7F0400CE
+ public const int layout_behavior = 2130968782;
- // aapt resource value: 0x7f010116
- public const int layout_collapseMode = 2130772246;
+ // aapt resource value: 0x7F0400CF
+ public const int layout_collapseMode = 2130968783;
- // aapt resource value: 0x7f010117
- public const int layout_collapseParallaxMultiplier = 2130772247;
+ // aapt resource value: 0x7F0400D0
+ public const int layout_collapseParallaxMultiplier = 2130968784;
- // aapt resource value: 0x7f01011f
- public const int layout_dodgeInsetEdges = 2130772255;
+ // aapt resource value: 0x7F0400D1
+ public const int layout_dodgeInsetEdges = 2130968785;
- // aapt resource value: 0x7f01011e
- public const int layout_insetEdge = 2130772254;
+ // aapt resource value: 0x7F0400D2
+ public const int layout_insetEdge = 2130968786;
- // aapt resource value: 0x7f01011c
- public const int layout_keyline = 2130772252;
+ // aapt resource value: 0x7F0400D3
+ public const int layout_keyline = 2130968787;
- // aapt resource value: 0x7f010102
- public const int layout_scrollFlags = 2130772226;
+ // aapt resource value: 0x7F0400D4
+ public const int layout_scrollFlags = 2130968788;
- // aapt resource value: 0x7f010103
- public const int layout_scrollInterpolator = 2130772227;
+ // aapt resource value: 0x7F0400D5
+ public const int layout_scrollInterpolator = 2130968789;
- // aapt resource value: 0x7f010197
- public const int layout_srlBackgroundColor = 2130772375;
+ // aapt resource value: 0x7F0400D6
+ public const int layout_srlBackgroundColor = 2130968790;
- // aapt resource value: 0x7f01015b
- public const int layout_srlSpinnerStyle = 2130772315;
+ // aapt resource value: 0x7F0400D7
+ public const int layout_srlSpinnerStyle = 2130968791;
- // aapt resource value: 0x7f01008e
- public const int listChoiceBackgroundIndicator = 2130772110;
+ // aapt resource value: 0x7F0400D8
+ public const int listChoiceBackgroundIndicator = 2130968792;
- // aapt resource value: 0x7f010068
- public const int listDividerAlertDialog = 2130772072;
+ // aapt resource value: 0x7F0400D9
+ public const int listDividerAlertDialog = 2130968793;
- // aapt resource value: 0x7f01002e
- public const int listItemLayout = 2130772014;
+ // aapt resource value: 0x7F0400DA
+ public const int listItemLayout = 2130968794;
- // aapt resource value: 0x7f01002b
- public const int listLayout = 2130772011;
+ // aapt resource value: 0x7F0400DB
+ public const int listLayout = 2130968795;
- // aapt resource value: 0x7f0100ae
- public const int listMenuViewStyle = 2130772142;
+ // aapt resource value: 0x7F0400DC
+ public const int listMenuViewStyle = 2130968796;
- // aapt resource value: 0x7f010087
- public const int listPopupWindowStyle = 2130772103;
+ // aapt resource value: 0x7F0400DD
+ public const int listPopupWindowStyle = 2130968797;
- // aapt resource value: 0x7f010081
- public const int listPreferredItemHeight = 2130772097;
+ // aapt resource value: 0x7F0400DE
+ public const int listPreferredItemHeight = 2130968798;
- // aapt resource value: 0x7f010083
- public const int listPreferredItemHeightLarge = 2130772099;
+ // aapt resource value: 0x7F0400DF
+ public const int listPreferredItemHeightLarge = 2130968799;
- // aapt resource value: 0x7f010082
- public const int listPreferredItemHeightSmall = 2130772098;
+ // aapt resource value: 0x7F0400E0
+ public const int listPreferredItemHeightSmall = 2130968800;
- // aapt resource value: 0x7f010084
- public const int listPreferredItemPaddingLeft = 2130772100;
+ // aapt resource value: 0x7F0400E1
+ public const int listPreferredItemPaddingLeft = 2130968801;
- // aapt resource value: 0x7f010085
- public const int listPreferredItemPaddingRight = 2130772101;
+ // aapt resource value: 0x7F0400E2
+ public const int listPreferredItemPaddingRight = 2130968802;
- // aapt resource value: 0x7f010013
- public const int logo = 2130771987;
+ // aapt resource value: 0x7F0400E3
+ public const int logo = 2130968803;
- // aapt resource value: 0x7f0100f7
- public const int logoDescription = 2130772215;
+ // aapt resource value: 0x7F0400E4
+ public const int logoDescription = 2130968804;
- // aapt resource value: 0x7f010132
- public const int maxActionInlineWidth = 2130772274;
+ // aapt resource value: 0x7F0400E5
+ public const int maxActionInlineWidth = 2130968805;
- // aapt resource value: 0x7f0100f1
- public const int maxButtonHeight = 2130772209;
+ // aapt resource value: 0x7F0400E6
+ public const int maxButtonHeight = 2130968806;
- // aapt resource value: 0x7f0100be
- public const int measureWithLargestChild = 2130772158;
+ // aapt resource value: 0x7F0400E7
+ public const int measureWithLargestChild = 2130968807;
- // aapt resource value: 0x7f01012a
- public const int menu = 2130772266;
+ // aapt resource value: 0x7F0400E8
+ public const int menu = 2130968808;
- // aapt resource value: 0x7f01002c
- public const int multiChoiceItemLayout = 2130772012;
+ // aapt resource value: 0x7F0400E9
+ public const int multiChoiceItemLayout = 2130968809;
- // aapt resource value: 0x7f0100f6
- public const int navigationContentDescription = 2130772214;
+ // aapt resource value: 0x7F0400EA
+ public const int navigationContentDescription = 2130968810;
- // aapt resource value: 0x7f0100f5
- public const int navigationIcon = 2130772213;
+ // aapt resource value: 0x7F0400EB
+ public const int navigationIcon = 2130968811;
- // aapt resource value: 0x7f01000d
- public const int navigationMode = 2130771981;
+ // aapt resource value: 0x7F0400EC
+ public const int navigationMode = 2130968812;
- // aapt resource value: 0x7f0100c2
- public const int numericModifiers = 2130772162;
+ // aapt resource value: 0x7F0400ED
+ public const int numericModifiers = 2130968813;
- // aapt resource value: 0x7f0100cd
- public const int overlapAnchor = 2130772173;
+ // aapt resource value: 0x7F0400EE
+ public const int overlapAnchor = 2130968814;
- // aapt resource value: 0x7f0100cf
- public const int paddingBottomNoButtons = 2130772175;
+ // aapt resource value: 0x7F0400EF
+ public const int paddingBottomNoButtons = 2130968815;
- // aapt resource value: 0x7f0100fb
- public const int paddingEnd = 2130772219;
+ // aapt resource value: 0x7F0400F0
+ public const int paddingEnd = 2130968816;
- // aapt resource value: 0x7f0100fa
- public const int paddingStart = 2130772218;
+ // aapt resource value: 0x7F0400F1
+ public const int paddingStart = 2130968817;
- // aapt resource value: 0x7f0100d0
- public const int paddingTopNoTitle = 2130772176;
+ // aapt resource value: 0x7F0400F2
+ public const int paddingTopNoTitle = 2130968818;
- // aapt resource value: 0x7f01008b
- public const int panelBackground = 2130772107;
+ // aapt resource value: 0x7F0400F3
+ public const int panelBackground = 2130968819;
- // aapt resource value: 0x7f01008d
- public const int panelMenuListTheme = 2130772109;
+ // aapt resource value: 0x7F0400F4
+ public const int panelMenuListTheme = 2130968820;
- // aapt resource value: 0x7f01008c
- public const int panelMenuListWidth = 2130772108;
+ // aapt resource value: 0x7F0400F5
+ public const int panelMenuListWidth = 2130968821;
- // aapt resource value: 0x7f01014e
- public const int passwordToggleContentDescription = 2130772302;
+ // aapt resource value: 0x7F0400F6
+ public const int passwordToggleContentDescription = 2130968822;
- // aapt resource value: 0x7f01014d
- public const int passwordToggleDrawable = 2130772301;
+ // aapt resource value: 0x7F0400F7
+ public const int passwordToggleDrawable = 2130968823;
- // aapt resource value: 0x7f01014c
- public const int passwordToggleEnabled = 2130772300;
+ // aapt resource value: 0x7F0400F8
+ public const int passwordToggleEnabled = 2130968824;
- // aapt resource value: 0x7f01014f
- public const int passwordToggleTint = 2130772303;
+ // aapt resource value: 0x7F0400F9
+ public const int passwordToggleTint = 2130968825;
- // aapt resource value: 0x7f010150
- public const int passwordToggleTintMode = 2130772304;
+ // aapt resource value: 0x7F0400FA
+ public const int passwordToggleTintMode = 2130968826;
- // aapt resource value: 0x7f010078
- public const int popupMenuStyle = 2130772088;
+ // aapt resource value: 0x7F0400FB
+ public const int popupMenuStyle = 2130968827;
- // aapt resource value: 0x7f010026
- public const int popupTheme = 2130772006;
+ // aapt resource value: 0x7F0400FC
+ public const int popupTheme = 2130968828;
- // aapt resource value: 0x7f010079
- public const int popupWindowStyle = 2130772089;
+ // aapt resource value: 0x7F0400FD
+ public const int popupWindowStyle = 2130968829;
- // aapt resource value: 0x7f0100cb
- public const int preserveIconSpacing = 2130772171;
+ // aapt resource value: 0x7F0400FE
+ public const int preserveIconSpacing = 2130968830;
- // aapt resource value: 0x7f010125
- public const int pressedTranslationZ = 2130772261;
+ // aapt resource value: 0x7F0400FF
+ public const int pressedTranslationZ = 2130968831;
- // aapt resource value: 0x7f01001c
- public const int progressBarPadding = 2130771996;
+ // aapt resource value: 0x7F040100
+ public const int progressBarPadding = 2130968832;
- // aapt resource value: 0x7f01001a
- public const int progressBarStyle = 2130771994;
+ // aapt resource value: 0x7F040101
+ public const int progressBarStyle = 2130968833;
- // aapt resource value: 0x7f0100dc
- public const int queryBackground = 2130772188;
+ // aapt resource value: 0x7F040102
+ public const int queryBackground = 2130968834;
- // aapt resource value: 0x7f0100d3
- public const int queryHint = 2130772179;
+ // aapt resource value: 0x7F040103
+ public const int queryHint = 2130968835;
- // aapt resource value: 0x7f0100a7
- public const int radioButtonStyle = 2130772135;
+ // aapt resource value: 0x7F040104
+ public const int radioButtonStyle = 2130968836;
- // aapt resource value: 0x7f0100a8
- public const int ratingBarStyle = 2130772136;
+ // aapt resource value: 0x7F040105
+ public const int ratingBarStyle = 2130968837;
- // aapt resource value: 0x7f0100a9
- public const int ratingBarStyleIndicator = 2130772137;
+ // aapt resource value: 0x7F040106
+ public const int ratingBarStyleIndicator = 2130968838;
- // aapt resource value: 0x7f0100aa
- public const int ratingBarStyleSmall = 2130772138;
+ // aapt resource value: 0x7F040107
+ public const int ratingBarStyleSmall = 2130968839;
- // aapt resource value: 0x7f010002
- public const int reverseLayout = 2130771970;
+ // aapt resource value: 0x7F040108
+ public const int reverseLayout = 2130968840;
- // aapt resource value: 0x7f010123
- public const int rippleColor = 2130772259;
+ // aapt resource value: 0x7F040109
+ public const int rippleColor = 2130968841;
- // aapt resource value: 0x7f010112
- public const int scrimAnimationDuration = 2130772242;
+ // aapt resource value: 0x7F04010A
+ public const int scrimAnimationDuration = 2130968842;
- // aapt resource value: 0x7f010111
- public const int scrimVisibleHeightTrigger = 2130772241;
+ // aapt resource value: 0x7F04010B
+ public const int scrimVisibleHeightTrigger = 2130968843;
- // aapt resource value: 0x7f0100d8
- public const int searchHintIcon = 2130772184;
+ // aapt resource value: 0x7F04010C
+ public const int searchHintIcon = 2130968844;
- // aapt resource value: 0x7f0100d7
- public const int searchIcon = 2130772183;
+ // aapt resource value: 0x7F04010D
+ public const int searchIcon = 2130968845;
- // aapt resource value: 0x7f010080
- public const int searchViewStyle = 2130772096;
+ // aapt resource value: 0x7F04010E
+ public const int searchViewStyle = 2130968846;
- // aapt resource value: 0x7f0101b1
- public const int second_curtain_bar_color = 2130772401;
+ // aapt resource value: 0x7F04010F
+ public const int second_curtain_bar_color = 2130968847;
- // aapt resource value: 0x7f0101b7
- public const int second_wave_color = 2130772407;
+ // aapt resource value: 0x7F040110
+ public const int second_wave_color = 2130968848;
- // aapt resource value: 0x7f0100ab
- public const int seekBarStyle = 2130772139;
+ // aapt resource value: 0x7F040111
+ public const int seekBarStyle = 2130968849;
- // aapt resource value: 0x7f010070
- public const int selectableItemBackground = 2130772080;
+ // aapt resource value: 0x7F040112
+ public const int selectableItemBackground = 2130968850;
- // aapt resource value: 0x7f010071
- public const int selectableItemBackgroundBorderless = 2130772081;
+ // aapt resource value: 0x7F040113
+ public const int selectableItemBackgroundBorderless = 2130968851;
- // aapt resource value: 0x7f0100c3
- public const int showAsAction = 2130772163;
+ // aapt resource value: 0x7F040114
+ public const int showAsAction = 2130968852;
- // aapt resource value: 0x7f0100bf
- public const int showDividers = 2130772159;
+ // aapt resource value: 0x7F040115
+ public const int showDividers = 2130968853;
- // aapt resource value: 0x7f0100e8
- public const int showText = 2130772200;
+ // aapt resource value: 0x7F040116
+ public const int showText = 2130968854;
- // aapt resource value: 0x7f01002f
- public const int showTitle = 2130772015;
+ // aapt resource value: 0x7F040117
+ public const int showTitle = 2130968855;
- // aapt resource value: 0x7f01002d
- public const int singleChoiceItemLayout = 2130772013;
+ // aapt resource value: 0x7F040118
+ public const int singleChoiceItemLayout = 2130968856;
- // aapt resource value: 0x7f010001
- public const int spanCount = 2130771969;
+ // aapt resource value: 0x7F040119
+ public const int spanCount = 2130968857;
- // aapt resource value: 0x7f0100b7
- public const int spinBars = 2130772151;
+ // aapt resource value: 0x7F04011A
+ public const int spinBars = 2130968858;
- // aapt resource value: 0x7f01006b
- public const int spinnerDropDownItemStyle = 2130772075;
+ // aapt resource value: 0x7F04011B
+ public const int spinnerDropDownItemStyle = 2130968859;
- // aapt resource value: 0x7f0100ac
- public const int spinnerStyle = 2130772140;
+ // aapt resource value: 0x7F04011C
+ public const int spinnerStyle = 2130968860;
- // aapt resource value: 0x7f0100e7
- public const int splitTrack = 2130772199;
+ // aapt resource value: 0x7F04011D
+ public const int splitTrack = 2130968861;
- // aapt resource value: 0x7f010030
- public const int srcCompat = 2130772016;
+ // aapt resource value: 0x7F04011E
+ public const int srcCompat = 2130968862;
- // aapt resource value: 0x7f01015c
- public const int srlAccentColor = 2130772316;
+ // aapt resource value: 0x7F04011F
+ public const int srlAccentColor = 2130968863;
- // aapt resource value: 0x7f010172
- public const int srlAnimatingColor = 2130772338;
+ // aapt resource value: 0x7F040120
+ public const int srlAnimatingColor = 2130968864;
- // aapt resource value: 0x7f01015d
- public const int srlClassicsSpinnerStyle = 2130772317;
+ // aapt resource value: 0x7F040121
+ public const int srlClassicsSpinnerStyle = 2130968865;
- // aapt resource value: 0x7f010194
- public const int srlDisableContentWhenLoading = 2130772372;
+ // aapt resource value: 0x7F040122
+ public const int srlDisableContentWhenLoading = 2130968866;
- // aapt resource value: 0x7f010193
- public const int srlDisableContentWhenRefresh = 2130772371;
+ // aapt resource value: 0x7F040123
+ public const int srlDisableContentWhenRefresh = 2130968867;
- // aapt resource value: 0x7f01017b
- public const int srlDragRate = 2130772347;
+ // aapt resource value: 0x7F040124
+ public const int srlDragRate = 2130968868;
- // aapt resource value: 0x7f01015e
- public const int srlDrawableArrow = 2130772318;
+ // aapt resource value: 0x7F040125
+ public const int srlDrawableArrow = 2130968869;
- // aapt resource value: 0x7f01015f
- public const int srlDrawableArrowSize = 2130772319;
+ // aapt resource value: 0x7F040126
+ public const int srlDrawableArrowSize = 2130968870;
- // aapt resource value: 0x7f010160
- public const int srlDrawableMarginRight = 2130772320;
+ // aapt resource value: 0x7F040127
+ public const int srlDrawableMarginRight = 2130968871;
- // aapt resource value: 0x7f010161
- public const int srlDrawableProgress = 2130772321;
+ // aapt resource value: 0x7F040128
+ public const int srlDrawableProgress = 2130968872;
- // aapt resource value: 0x7f010162
- public const int srlDrawableProgressSize = 2130772322;
+ // aapt resource value: 0x7F040129
+ public const int srlDrawableProgressSize = 2130968873;
- // aapt resource value: 0x7f010163
- public const int srlDrawableSize = 2130772323;
+ // aapt resource value: 0x7F04012A
+ public const int srlDrawableSize = 2130968874;
- // aapt resource value: 0x7f010187
- public const int srlEnableAutoLoadMore = 2130772359;
+ // aapt resource value: 0x7F04012B
+ public const int srlEnableAutoLoadMore = 2130968875;
- // aapt resource value: 0x7f010191
- public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
+ // aapt resource value: 0x7F04012C
+ public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
- // aapt resource value: 0x7f010190
- public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
+ // aapt resource value: 0x7F04012D
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
- // aapt resource value: 0x7f01018e
- public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
+ // aapt resource value: 0x7F04012E
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
- // aapt resource value: 0x7f01018f
- public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
+ // aapt resource value: 0x7F04012F
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
- // aapt resource value: 0x7f010183
- public const int srlEnableFooterTranslationContent = 2130772355;
+ // aapt resource value: 0x7F040130
+ public const int srlEnableFooterTranslationContent = 2130968880;
- // aapt resource value: 0x7f010182
- public const int srlEnableHeaderTranslationContent = 2130772354;
+ // aapt resource value: 0x7F040131
+ public const int srlEnableHeaderTranslationContent = 2130968881;
- // aapt resource value: 0x7f010164
- public const int srlEnableHorizontalDrag = 2130772324;
+ // aapt resource value: 0x7F040132
+ public const int srlEnableHorizontalDrag = 2130968882;
- // aapt resource value: 0x7f010175
- public const int srlEnableLastTime = 2130772341;
+ // aapt resource value: 0x7F040133
+ public const int srlEnableLastTime = 2130968883;
- // aapt resource value: 0x7f010181
- public const int srlEnableLoadMore = 2130772353;
+ // aapt resource value: 0x7F040134
+ public const int srlEnableLoadMore = 2130968884;
- // aapt resource value: 0x7f01018d
- public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
+ // aapt resource value: 0x7F040135
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
- // aapt resource value: 0x7f01018a
- public const int srlEnableNestedScrolling = 2130772362;
+ // aapt resource value: 0x7F040136
+ public const int srlEnableNestedScrolling = 2130968886;
- // aapt resource value: 0x7f010188
- public const int srlEnableOverScrollBounce = 2130772360;
+ // aapt resource value: 0x7F040137
+ public const int srlEnableOverScrollBounce = 2130968887;
- // aapt resource value: 0x7f010192
- public const int srlEnableOverScrollDrag = 2130772370;
+ // aapt resource value: 0x7F040138
+ public const int srlEnableOverScrollDrag = 2130968888;
- // aapt resource value: 0x7f010186
- public const int srlEnablePreviewInEditMode = 2130772358;
+ // aapt resource value: 0x7F040139
+ public const int srlEnablePreviewInEditMode = 2130968889;
- // aapt resource value: 0x7f01019d
- public const int srlEnablePullToCloseTwoLevel = 2130772381;
+ // aapt resource value: 0x7F04013A
+ public const int srlEnablePullToCloseTwoLevel = 2130968890;
- // aapt resource value: 0x7f010189
- public const int srlEnablePureScrollMode = 2130772361;
+ // aapt resource value: 0x7F04013B
+ public const int srlEnablePureScrollMode = 2130968891;
- // aapt resource value: 0x7f010180
- public const int srlEnableRefresh = 2130772352;
+ // aapt resource value: 0x7F04013C
+ public const int srlEnableRefresh = 2130968892;
- // aapt resource value: 0x7f01018b
- public const int srlEnableScrollContentWhenLoaded = 2130772363;
+ // aapt resource value: 0x7F04013D
+ public const int srlEnableScrollContentWhenLoaded = 2130968893;
- // aapt resource value: 0x7f01018c
- public const int srlEnableScrollContentWhenRefreshed = 2130772364;
+ // aapt resource value: 0x7F04013E
+ public const int srlEnableScrollContentWhenRefreshed = 2130968894;
- // aapt resource value: 0x7f01019c
- public const int srlEnableTwoLevel = 2130772380;
+ // aapt resource value: 0x7F04013F
+ public const int srlEnableTwoLevel = 2130968895;
- // aapt resource value: 0x7f010165
- public const int srlFinishDuration = 2130772325;
+ // aapt resource value: 0x7F040140
+ public const int srlFinishDuration = 2130968896;
- // aapt resource value: 0x7f010196
- public const int srlFixedFooterViewId = 2130772374;
+ // aapt resource value: 0x7F040141
+ public const int srlFixedFooterViewId = 2130968897;
- // aapt resource value: 0x7f010195
- public const int srlFixedHeaderViewId = 2130772373;
+ // aapt resource value: 0x7F040142
+ public const int srlFixedHeaderViewId = 2130968898;
- // aapt resource value: 0x7f01019b
- public const int srlFloorDuration = 2130772379;
+ // aapt resource value: 0x7F040143
+ public const int srlFloorDuration = 2130968899;
- // aapt resource value: 0x7f010199
- public const int srlFloorRage = 2130772377;
+ // aapt resource value: 0x7F040144
+ public const int srlFloorRage = 2130968900;
- // aapt resource value: 0x7f010178
- public const int srlFooterHeight = 2130772344;
+ // aapt resource value: 0x7F040145
+ public const int srlFooterHeight = 2130968901;
- // aapt resource value: 0x7f01017a
- public const int srlFooterInsetStart = 2130772346;
+ // aapt resource value: 0x7F040146
+ public const int srlFooterInsetStart = 2130968902;
- // aapt resource value: 0x7f01017d
- public const int srlFooterMaxDragRate = 2130772349;
+ // aapt resource value: 0x7F040147
+ public const int srlFooterMaxDragRate = 2130968903;
- // aapt resource value: 0x7f010185
- public const int srlFooterTranslationViewId = 2130772357;
+ // aapt resource value: 0x7F040148
+ public const int srlFooterTranslationViewId = 2130968904;
- // aapt resource value: 0x7f01017f
- public const int srlFooterTriggerRate = 2130772351;
+ // aapt resource value: 0x7F040149
+ public const int srlFooterTriggerRate = 2130968905;
- // aapt resource value: 0x7f010177
- public const int srlHeaderHeight = 2130772343;
+ // aapt resource value: 0x7F04014A
+ public const int srlHeaderHeight = 2130968906;
- // aapt resource value: 0x7f010179
- public const int srlHeaderInsetStart = 2130772345;
+ // aapt resource value: 0x7F04014B
+ public const int srlHeaderInsetStart = 2130968907;
- // aapt resource value: 0x7f01017c
- public const int srlHeaderMaxDragRate = 2130772348;
+ // aapt resource value: 0x7F04014C
+ public const int srlHeaderMaxDragRate = 2130968908;
- // aapt resource value: 0x7f010184
- public const int srlHeaderTranslationViewId = 2130772356;
+ // aapt resource value: 0x7F04014D
+ public const int srlHeaderTranslationViewId = 2130968909;
- // aapt resource value: 0x7f01017e
- public const int srlHeaderTriggerRate = 2130772350;
+ // aapt resource value: 0x7F04014E
+ public const int srlHeaderTriggerRate = 2130968910;
- // aapt resource value: 0x7f010198
- public const int srlMaxRage = 2130772376;
+ // aapt resource value: 0x7F04014F
+ public const int srlMaxRage = 2130968911;
- // aapt resource value: 0x7f010173
- public const int srlNormalColor = 2130772339;
+ // aapt resource value: 0x7F040150
+ public const int srlNormalColor = 2130968912;
- // aapt resource value: 0x7f010166
- public const int srlPrimaryColor = 2130772326;
+ // aapt resource value: 0x7F040151
+ public const int srlPrimaryColor = 2130968913;
- // aapt resource value: 0x7f010176
- public const int srlReboundDuration = 2130772342;
+ // aapt resource value: 0x7F040152
+ public const int srlReboundDuration = 2130968914;
- // aapt resource value: 0x7f01019a
- public const int srlRefreshRage = 2130772378;
+ // aapt resource value: 0x7F040153
+ public const int srlRefreshRage = 2130968915;
- // aapt resource value: 0x7f010167
- public const int srlTextFailed = 2130772327;
+ // aapt resource value: 0x7F040154
+ public const int srlTextFailed = 2130968916;
- // aapt resource value: 0x7f010168
- public const int srlTextFinish = 2130772328;
+ // aapt resource value: 0x7F040155
+ public const int srlTextFinish = 2130968917;
- // aapt resource value: 0x7f010169
- public const int srlTextLoading = 2130772329;
+ // aapt resource value: 0x7F040156
+ public const int srlTextLoading = 2130968918;
- // aapt resource value: 0x7f01016a
- public const int srlTextNothing = 2130772330;
+ // aapt resource value: 0x7F040157
+ public const int srlTextNothing = 2130968919;
- // aapt resource value: 0x7f01016b
- public const int srlTextPulling = 2130772331;
+ // aapt resource value: 0x7F040158
+ public const int srlTextPulling = 2130968920;
- // aapt resource value: 0x7f01016c
- public const int srlTextRefreshing = 2130772332;
+ // aapt resource value: 0x7F040159
+ public const int srlTextRefreshing = 2130968921;
- // aapt resource value: 0x7f01016d
- public const int srlTextRelease = 2130772333;
+ // aapt resource value: 0x7F04015A
+ public const int srlTextRelease = 2130968922;
- // aapt resource value: 0x7f01016e
- public const int srlTextSecondary = 2130772334;
+ // aapt resource value: 0x7F04015B
+ public const int srlTextSecondary = 2130968923;
- // aapt resource value: 0x7f01016f
- public const int srlTextSizeTime = 2130772335;
+ // aapt resource value: 0x7F04015C
+ public const int srlTextSizeTime = 2130968924;
- // aapt resource value: 0x7f010170
- public const int srlTextSizeTitle = 2130772336;
+ // aapt resource value: 0x7F04015D
+ public const int srlTextSizeTitle = 2130968925;
- // aapt resource value: 0x7f010174
- public const int srlTextTimeMarginTop = 2130772340;
+ // aapt resource value: 0x7F04015E
+ public const int srlTextTimeMarginTop = 2130968926;
- // aapt resource value: 0x7f010171
- public const int srlTextUpdate = 2130772337;
+ // aapt resource value: 0x7F04015F
+ public const int srlTextUpdate = 2130968927;
- // aapt resource value: 0x7f010003
- public const int stackFromEnd = 2130771971;
+ // aapt resource value: 0x7F040160
+ public const int stackFromEnd = 2130968928;
- // aapt resource value: 0x7f0100ce
- public const int state_above_anchor = 2130772174;
+ // aapt resource value: 0x7F040161
+ public const int state_above_anchor = 2130968929;
- // aapt resource value: 0x7f010100
- public const int state_collapsed = 2130772224;
+ // aapt resource value: 0x7F040162
+ public const int state_collapsed = 2130968930;
- // aapt resource value: 0x7f010101
- public const int state_collapsible = 2130772225;
+ // aapt resource value: 0x7F040163
+ public const int state_collapsible = 2130968931;
- // aapt resource value: 0x7f010119
- public const int statusBarBackground = 2130772249;
+ // aapt resource value: 0x7F040164
+ public const int statusBarBackground = 2130968932;
- // aapt resource value: 0x7f01010f
- public const int statusBarScrim = 2130772239;
+ // aapt resource value: 0x7F040165
+ public const int statusBarScrim = 2130968933;
- // aapt resource value: 0x7f0100cc
- public const int subMenuArrow = 2130772172;
+ // aapt resource value: 0x7F040166
+ public const int subMenuArrow = 2130968934;
- // aapt resource value: 0x7f0100dd
- public const int submitBackground = 2130772189;
+ // aapt resource value: 0x7F040167
+ public const int submitBackground = 2130968935;
- // aapt resource value: 0x7f01000f
- public const int subtitle = 2130771983;
+ // aapt resource value: 0x7F040168
+ public const int subtitle = 2130968936;
- // aapt resource value: 0x7f0100ea
- public const int subtitleTextAppearance = 2130772202;
+ // aapt resource value: 0x7F040169
+ public const int subtitleTextAppearance = 2130968937;
- // aapt resource value: 0x7f0100f9
- public const int subtitleTextColor = 2130772217;
+ // aapt resource value: 0x7F04016A
+ public const int subtitleTextColor = 2130968938;
- // aapt resource value: 0x7f010011
- public const int subtitleTextStyle = 2130771985;
+ // aapt resource value: 0x7F04016B
+ public const int subtitleTextStyle = 2130968939;
- // aapt resource value: 0x7f0100db
- public const int suggestionRowLayout = 2130772187;
+ // aapt resource value: 0x7F04016C
+ public const int suggestionRowLayout = 2130968940;
- // aapt resource value: 0x7f0100e5
- public const int switchMinWidth = 2130772197;
+ // aapt resource value: 0x7F04016D
+ public const int switchMinWidth = 2130968941;
- // aapt resource value: 0x7f0100e6
- public const int switchPadding = 2130772198;
+ // aapt resource value: 0x7F04016E
+ public const int switchPadding = 2130968942;
- // aapt resource value: 0x7f0100ad
- public const int switchStyle = 2130772141;
+ // aapt resource value: 0x7F04016F
+ public const int switchStyle = 2130968943;
- // aapt resource value: 0x7f0100e4
- public const int switchTextAppearance = 2130772196;
+ // aapt resource value: 0x7F040170
+ public const int switchTextAppearance = 2130968944;
- // aapt resource value: 0x7f010136
- public const int tabBackground = 2130772278;
+ // aapt resource value: 0x7F040171
+ public const int tabBackground = 2130968945;
- // aapt resource value: 0x7f010135
- public const int tabContentStart = 2130772277;
+ // aapt resource value: 0x7F040172
+ public const int tabContentStart = 2130968946;
- // aapt resource value: 0x7f010138
- public const int tabGravity = 2130772280;
+ // aapt resource value: 0x7F040173
+ public const int tabGravity = 2130968947;
- // aapt resource value: 0x7f010133
- public const int tabIndicatorColor = 2130772275;
+ // aapt resource value: 0x7F040174
+ public const int tabIndicatorColor = 2130968948;
- // aapt resource value: 0x7f010134
- public const int tabIndicatorHeight = 2130772276;
+ // aapt resource value: 0x7F040175
+ public const int tabIndicatorHeight = 2130968949;
- // aapt resource value: 0x7f01013a
- public const int tabMaxWidth = 2130772282;
+ // aapt resource value: 0x7F040176
+ public const int tabMaxWidth = 2130968950;
- // aapt resource value: 0x7f010139
- public const int tabMinWidth = 2130772281;
+ // aapt resource value: 0x7F040177
+ public const int tabMinWidth = 2130968951;
- // aapt resource value: 0x7f010137
- public const int tabMode = 2130772279;
+ // aapt resource value: 0x7F040178
+ public const int tabMode = 2130968952;
- // aapt resource value: 0x7f010142
- public const int tabPadding = 2130772290;
+ // aapt resource value: 0x7F040179
+ public const int tabPadding = 2130968953;
- // aapt resource value: 0x7f010141
- public const int tabPaddingBottom = 2130772289;
+ // aapt resource value: 0x7F04017A
+ public const int tabPaddingBottom = 2130968954;
- // aapt resource value: 0x7f010140
- public const int tabPaddingEnd = 2130772288;
+ // aapt resource value: 0x7F04017B
+ public const int tabPaddingEnd = 2130968955;
- // aapt resource value: 0x7f01013e
- public const int tabPaddingStart = 2130772286;
+ // aapt resource value: 0x7F04017C
+ public const int tabPaddingStart = 2130968956;
- // aapt resource value: 0x7f01013f
- public const int tabPaddingTop = 2130772287;
+ // aapt resource value: 0x7F04017D
+ public const int tabPaddingTop = 2130968957;
- // aapt resource value: 0x7f01013d
- public const int tabSelectedTextColor = 2130772285;
+ // aapt resource value: 0x7F04017E
+ public const int tabSelectedTextColor = 2130968958;
- // aapt resource value: 0x7f01013b
- public const int tabTextAppearance = 2130772283;
+ // aapt resource value: 0x7F04017F
+ public const int tabTextAppearance = 2130968959;
- // aapt resource value: 0x7f01013c
- public const int tabTextColor = 2130772284;
+ // aapt resource value: 0x7F040180
+ public const int tabTextColor = 2130968960;
- // aapt resource value: 0x7f010036
- public const int textAllCaps = 2130772022;
+ // aapt resource value: 0x7F040181
+ public const int textAllCaps = 2130968961;
- // aapt resource value: 0x7f010063
- public const int textAppearanceLargePopupMenu = 2130772067;
+ // aapt resource value: 0x7F040182
+ public const int textAppearanceLargePopupMenu = 2130968962;
- // aapt resource value: 0x7f010088
- public const int textAppearanceListItem = 2130772104;
+ // aapt resource value: 0x7F040183
+ public const int textAppearanceListItem = 2130968963;
- // aapt resource value: 0x7f010089
- public const int textAppearanceListItemSecondary = 2130772105;
+ // aapt resource value: 0x7F040184
+ public const int textAppearanceListItemSecondary = 2130968964;
- // aapt resource value: 0x7f01008a
- public const int textAppearanceListItemSmall = 2130772106;
+ // aapt resource value: 0x7F040185
+ public const int textAppearanceListItemSmall = 2130968965;
- // aapt resource value: 0x7f010065
- public const int textAppearancePopupMenuHeader = 2130772069;
+ // aapt resource value: 0x7F040186
+ public const int textAppearancePopupMenuHeader = 2130968966;
- // aapt resource value: 0x7f01007e
- public const int textAppearanceSearchResultSubtitle = 2130772094;
+ // aapt resource value: 0x7F040187
+ public const int textAppearanceSearchResultSubtitle = 2130968967;
- // aapt resource value: 0x7f01007d
- public const int textAppearanceSearchResultTitle = 2130772093;
+ // aapt resource value: 0x7F040188
+ public const int textAppearanceSearchResultTitle = 2130968968;
- // aapt resource value: 0x7f010064
- public const int textAppearanceSmallPopupMenu = 2130772068;
+ // aapt resource value: 0x7F040189
+ public const int textAppearanceSmallPopupMenu = 2130968969;
- // aapt resource value: 0x7f01009d
- public const int textColorAlertDialogListItem = 2130772125;
+ // aapt resource value: 0x7F04018A
+ public const int textColorAlertDialogListItem = 2130968970;
- // aapt resource value: 0x7f010122
- public const int textColorError = 2130772258;
+ // aapt resource value: 0x7F04018B
+ public const int textColorError = 2130968971;
- // aapt resource value: 0x7f01007f
- public const int textColorSearchUrl = 2130772095;
+ // aapt resource value: 0x7F04018C
+ public const int textColorSearchUrl = 2130968972;
- // aapt resource value: 0x7f0100fc
- public const int theme = 2130772220;
+ // aapt resource value: 0x7F04018D
+ public const int theme = 2130968973;
- // aapt resource value: 0x7f0100bd
- public const int thickness = 2130772157;
+ // aapt resource value: 0x7F04018E
+ public const int thickness = 2130968974;
- // aapt resource value: 0x7f0100e3
- public const int thumbTextPadding = 2130772195;
+ // aapt resource value: 0x7F04018F
+ public const int thumbTextPadding = 2130968975;
- // aapt resource value: 0x7f0100de
- public const int thumbTint = 2130772190;
+ // aapt resource value: 0x7F040190
+ public const int thumbTint = 2130968976;
- // aapt resource value: 0x7f0100df
- public const int thumbTintMode = 2130772191;
+ // aapt resource value: 0x7F040191
+ public const int thumbTintMode = 2130968977;
- // aapt resource value: 0x7f010033
- public const int tickMark = 2130772019;
+ // aapt resource value: 0x7F040192
+ public const int tickMark = 2130968978;
- // aapt resource value: 0x7f010034
- public const int tickMarkTint = 2130772020;
+ // aapt resource value: 0x7F040193
+ public const int tickMarkTint = 2130968979;
- // aapt resource value: 0x7f010035
- public const int tickMarkTintMode = 2130772021;
+ // aapt resource value: 0x7F040194
+ public const int tickMarkTintMode = 2130968980;
- // aapt resource value: 0x7f010031
- public const int tint = 2130772017;
+ // aapt resource value: 0x7F040195
+ public const int tint = 2130968981;
- // aapt resource value: 0x7f010032
- public const int tintMode = 2130772018;
+ // aapt resource value: 0x7F040196
+ public const int tintMode = 2130968982;
- // aapt resource value: 0x7f01000c
- public const int title = 2130771980;
+ // aapt resource value: 0x7F040197
+ public const int title = 2130968983;
- // aapt resource value: 0x7f010115
- public const int titleEnabled = 2130772245;
+ // aapt resource value: 0x7F040198
+ public const int titleEnabled = 2130968984;
- // aapt resource value: 0x7f0100eb
- public const int titleMargin = 2130772203;
+ // aapt resource value: 0x7F040199
+ public const int titleMargin = 2130968985;
- // aapt resource value: 0x7f0100ef
- public const int titleMarginBottom = 2130772207;
+ // aapt resource value: 0x7F04019A
+ public const int titleMarginBottom = 2130968986;
- // aapt resource value: 0x7f0100ed
- public const int titleMarginEnd = 2130772205;
+ // aapt resource value: 0x7F04019B
+ public const int titleMarginEnd = 2130968987;
- // aapt resource value: 0x7f0100ec
- public const int titleMarginStart = 2130772204;
+ // aapt resource value: 0x7F04019E
+ public const int titleMargins = 2130968990;
- // aapt resource value: 0x7f0100ee
- public const int titleMarginTop = 2130772206;
+ // aapt resource value: 0x7F04019C
+ public const int titleMarginStart = 2130968988;
- // aapt resource value: 0x7f0100f0
- public const int titleMargins = 2130772208;
+ // aapt resource value: 0x7F04019D
+ public const int titleMarginTop = 2130968989;
- // aapt resource value: 0x7f0100e9
- public const int titleTextAppearance = 2130772201;
+ // aapt resource value: 0x7F04019F
+ public const int titleTextAppearance = 2130968991;
- // aapt resource value: 0x7f0100f8
- public const int titleTextColor = 2130772216;
+ // aapt resource value: 0x7F0401A0
+ public const int titleTextColor = 2130968992;
- // aapt resource value: 0x7f010010
- public const int titleTextStyle = 2130771984;
+ // aapt resource value: 0x7F0401A1
+ public const int titleTextStyle = 2130968993;
- // aapt resource value: 0x7f010110
- public const int toolbarId = 2130772240;
+ // aapt resource value: 0x7F0401A2
+ public const int toolbarId = 2130968994;
- // aapt resource value: 0x7f010077
- public const int toolbarNavigationButtonStyle = 2130772087;
+ // aapt resource value: 0x7F0401A3
+ public const int toolbarNavigationButtonStyle = 2130968995;
- // aapt resource value: 0x7f010076
- public const int toolbarStyle = 2130772086;
+ // aapt resource value: 0x7F0401A4
+ public const int toolbarStyle = 2130968996;
- // aapt resource value: 0x7f0100b0
- public const int tooltipForegroundColor = 2130772144;
+ // aapt resource value: 0x7F0401A5
+ public const int tooltipForegroundColor = 2130968997;
- // aapt resource value: 0x7f0100af
- public const int tooltipFrameBackground = 2130772143;
+ // aapt resource value: 0x7F0401A6
+ public const int tooltipFrameBackground = 2130968998;
- // aapt resource value: 0x7f0100c8
- public const int tooltipText = 2130772168;
+ // aapt resource value: 0x7F0401A7
+ public const int tooltipText = 2130968999;
- // aapt resource value: 0x7f0100e0
- public const int track = 2130772192;
+ // aapt resource value: 0x7F0401A8
+ public const int track = 2130969000;
- // aapt resource value: 0x7f0100e1
- public const int trackTint = 2130772193;
+ // aapt resource value: 0x7F0401A9
+ public const int trackTint = 2130969001;
- // aapt resource value: 0x7f0100e2
- public const int trackTintMode = 2130772194;
+ // aapt resource value: 0x7F0401AA
+ public const int trackTintMode = 2130969002;
- // aapt resource value: 0x7f010127
- public const int useCompatPadding = 2130772263;
+ // aapt resource value: 0x7F0401AB
+ public const int useCompatPadding = 2130969003;
- // aapt resource value: 0x7f0100d9
- public const int voiceIcon = 2130772185;
+ // aapt resource value: 0x7F0401AC
+ public const int voiceIcon = 2130969004;
- // aapt resource value: 0x7f0101b8
- public const int wave_bg_color = 2130772408;
+ // aapt resource value: 0x7F0401AD
+ public const int wave_bg_color = 2130969005;
- // aapt resource value: 0x7f0101b9
- public const int wave_border_color = 2130772409;
+ // aapt resource value: 0x7F0401AE
+ public const int wave_border_color = 2130969006;
- // aapt resource value: 0x7f0101b6
- public const int wave_color = 2130772406;
+ // aapt resource value: 0x7F0401AF
+ public const int wave_color = 2130969007;
- // aapt resource value: 0x7f0101bb
- public const int wave_height = 2130772411;
+ // aapt resource value: 0x7F0401B0
+ public const int wave_height = 2130969008;
- // aapt resource value: 0x7f0101ba
- public const int wave_width = 2130772410;
+ // aapt resource value: 0x7F0401B1
+ public const int wave_width = 2130969009;
- // aapt resource value: 0x7f0101c0
- public const int wheelview_dividerColor = 2130772416;
+ // aapt resource value: 0x7F0401B2
+ public const int wheelview_dividerColor = 2130969010;
- // aapt resource value: 0x7f0101bc
- public const int wheelview_gravity = 2130772412;
+ // aapt resource value: 0x7F0401B3
+ public const int wheelview_gravity = 2130969011;
- // aapt resource value: 0x7f0101c1
- public const int wheelview_lineSpacingMultiplier = 2130772417;
+ // aapt resource value: 0x7F0401B4
+ public const int wheelview_lineSpacingMultiplier = 2130969012;
- // aapt resource value: 0x7f0101bf
- public const int wheelview_textColorCenter = 2130772415;
+ // aapt resource value: 0x7F0401B5
+ public const int wheelview_textColorCenter = 2130969013;
- // aapt resource value: 0x7f0101be
- public const int wheelview_textColorOut = 2130772414;
+ // aapt resource value: 0x7F0401B6
+ public const int wheelview_textColorOut = 2130969014;
- // aapt resource value: 0x7f0101bd
- public const int wheelview_textSize = 2130772413;
+ // aapt resource value: 0x7F0401B7
+ public const int wheelview_textSize = 2130969015;
- // aapt resource value: 0x7f01003d
- public const int windowActionBar = 2130772029;
+ // aapt resource value: 0x7F0401B8
+ public const int windowActionBar = 2130969016;
- // aapt resource value: 0x7f01003f
- public const int windowActionBarOverlay = 2130772031;
+ // aapt resource value: 0x7F0401B9
+ public const int windowActionBarOverlay = 2130969017;
- // aapt resource value: 0x7f010040
- public const int windowActionModeOverlay = 2130772032;
+ // aapt resource value: 0x7F0401BA
+ public const int windowActionModeOverlay = 2130969018;
- // aapt resource value: 0x7f010044
- public const int windowFixedHeightMajor = 2130772036;
+ // aapt resource value: 0x7F0401BB
+ public const int windowFixedHeightMajor = 2130969019;
- // aapt resource value: 0x7f010042
- public const int windowFixedHeightMinor = 2130772034;
+ // aapt resource value: 0x7F0401BC
+ public const int windowFixedHeightMinor = 2130969020;
- // aapt resource value: 0x7f010041
- public const int windowFixedWidthMajor = 2130772033;
+ // aapt resource value: 0x7F0401BD
+ public const int windowFixedWidthMajor = 2130969021;
- // aapt resource value: 0x7f010043
- public const int windowFixedWidthMinor = 2130772035;
+ // aapt resource value: 0x7F0401BE
+ public const int windowFixedWidthMinor = 2130969022;
- // aapt resource value: 0x7f010045
- public const int windowMinWidthMajor = 2130772037;
+ // aapt resource value: 0x7F0401BF
+ public const int windowMinWidthMajor = 2130969023;
- // aapt resource value: 0x7f010046
- public const int windowMinWidthMinor = 2130772038;
+ // aapt resource value: 0x7F0401C0
+ public const int windowMinWidthMinor = 2130969024;
- // aapt resource value: 0x7f01003e
- public const int windowNoTitle = 2130772030;
+ // aapt resource value: 0x7F0401C1
+ public const int windowNoTitle = 2130969025;
static Attribute()
{
@@ -1670,20 +1670,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7f0c0000
- public const int abc_action_bar_embed_tabs = 2131492864;
+ // aapt resource value: 0x7F050000
+ public const int abc_action_bar_embed_tabs = 2131034112;
- // aapt resource value: 0x7f0c0001
- public const int abc_allow_stacked_button_bar = 2131492865;
+ // aapt resource value: 0x7F050001
+ public const int abc_allow_stacked_button_bar = 2131034113;
- // aapt resource value: 0x7f0c0002
- public const int abc_config_actionMenuItemAllCaps = 2131492866;
+ // aapt resource value: 0x7F050002
+ public const int abc_config_actionMenuItemAllCaps = 2131034114;
- // aapt resource value: 0x7f0c0003
- public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
+ // aapt resource value: 0x7F050003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
- // aapt resource value: 0x7f0c0004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
+ // aapt resource value: 0x7F050004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
static Boolean()
{
@@ -1698,323 +1698,323 @@
public partial class Color
{
- // aapt resource value: 0x7f0d0052
- public const int abc_background_cache_hint_selector_material_dark = 2131558482;
+ // aapt resource value: 0x7F060000
+ public const int abc_background_cache_hint_selector_material_dark = 2131099648;
- // aapt resource value: 0x7f0d0053
- public const int abc_background_cache_hint_selector_material_light = 2131558483;
+ // aapt resource value: 0x7F060001
+ public const int abc_background_cache_hint_selector_material_light = 2131099649;
- // aapt resource value: 0x7f0d0054
- public const int abc_btn_colored_borderless_text_material = 2131558484;
+ // aapt resource value: 0x7F060002
+ public const int abc_btn_colored_borderless_text_material = 2131099650;
- // aapt resource value: 0x7f0d0055
- public const int abc_btn_colored_text_material = 2131558485;
+ // aapt resource value: 0x7F060003
+ public const int abc_btn_colored_text_material = 2131099651;
- // aapt resource value: 0x7f0d0056
- public const int abc_color_highlight_material = 2131558486;
+ // aapt resource value: 0x7F060004
+ public const int abc_color_highlight_material = 2131099652;
- // aapt resource value: 0x7f0d0057
- public const int abc_hint_foreground_material_dark = 2131558487;
+ // aapt resource value: 0x7F060005
+ public const int abc_hint_foreground_material_dark = 2131099653;
- // aapt resource value: 0x7f0d0058
- public const int abc_hint_foreground_material_light = 2131558488;
+ // aapt resource value: 0x7F060006
+ public const int abc_hint_foreground_material_light = 2131099654;
- // aapt resource value: 0x7f0d0000
- public const int abc_input_method_navigation_guard = 2131558400;
+ // aapt resource value: 0x7F060007
+ public const int abc_input_method_navigation_guard = 2131099655;
- // aapt resource value: 0x7f0d0059
- public const int abc_primary_text_disable_only_material_dark = 2131558489;
+ // aapt resource value: 0x7F060008
+ public const int abc_primary_text_disable_only_material_dark = 2131099656;
- // aapt resource value: 0x7f0d005a
- public const int abc_primary_text_disable_only_material_light = 2131558490;
+ // aapt resource value: 0x7F060009
+ public const int abc_primary_text_disable_only_material_light = 2131099657;
- // aapt resource value: 0x7f0d005b
- public const int abc_primary_text_material_dark = 2131558491;
+ // aapt resource value: 0x7F06000A
+ public const int abc_primary_text_material_dark = 2131099658;
- // aapt resource value: 0x7f0d005c
- public const int abc_primary_text_material_light = 2131558492;
+ // aapt resource value: 0x7F06000B
+ public const int abc_primary_text_material_light = 2131099659;
- // aapt resource value: 0x7f0d005d
- public const int abc_search_url_text = 2131558493;
+ // aapt resource value: 0x7F06000C
+ public const int abc_search_url_text = 2131099660;
- // aapt resource value: 0x7f0d0001
- public const int abc_search_url_text_normal = 2131558401;
+ // aapt resource value: 0x7F06000D
+ public const int abc_search_url_text_normal = 2131099661;
- // aapt resource value: 0x7f0d0002
- public const int abc_search_url_text_pressed = 2131558402;
+ // aapt resource value: 0x7F06000E
+ public const int abc_search_url_text_pressed = 2131099662;
- // aapt resource value: 0x7f0d0003
- public const int abc_search_url_text_selected = 2131558403;
+ // aapt resource value: 0x7F06000F
+ public const int abc_search_url_text_selected = 2131099663;
- // aapt resource value: 0x7f0d005e
- public const int abc_secondary_text_material_dark = 2131558494;
+ // aapt resource value: 0x7F060010
+ public const int abc_secondary_text_material_dark = 2131099664;
- // aapt resource value: 0x7f0d005f
- public const int abc_secondary_text_material_light = 2131558495;
+ // aapt resource value: 0x7F060011
+ public const int abc_secondary_text_material_light = 2131099665;
- // aapt resource value: 0x7f0d0060
- public const int abc_tint_btn_checkable = 2131558496;
+ // aapt resource value: 0x7F060012
+ public const int abc_tint_btn_checkable = 2131099666;
- // aapt resource value: 0x7f0d0061
- public const int abc_tint_default = 2131558497;
+ // aapt resource value: 0x7F060013
+ public const int abc_tint_default = 2131099667;
- // aapt resource value: 0x7f0d0062
- public const int abc_tint_edittext = 2131558498;
+ // aapt resource value: 0x7F060014
+ public const int abc_tint_edittext = 2131099668;
- // aapt resource value: 0x7f0d0063
- public const int abc_tint_seek_thumb = 2131558499;
+ // aapt resource value: 0x7F060015
+ public const int abc_tint_seek_thumb = 2131099669;
- // aapt resource value: 0x7f0d0064
- public const int abc_tint_spinner = 2131558500;
+ // aapt resource value: 0x7F060016
+ public const int abc_tint_spinner = 2131099670;
- // aapt resource value: 0x7f0d0065
- public const int abc_tint_switch_track = 2131558501;
+ // aapt resource value: 0x7F060017
+ public const int abc_tint_switch_track = 2131099671;
- // aapt resource value: 0x7f0d0004
- public const int accent_material_dark = 2131558404;
+ // aapt resource value: 0x7F060018
+ public const int accent_material_dark = 2131099672;
- // aapt resource value: 0x7f0d0005
- public const int accent_material_light = 2131558405;
+ // aapt resource value: 0x7F060019
+ public const int accent_material_light = 2131099673;
- // aapt resource value: 0x7f0d0006
- public const int background_floating_material_dark = 2131558406;
+ // aapt resource value: 0x7F06001A
+ public const int background_floating_material_dark = 2131099674;
- // aapt resource value: 0x7f0d0007
- public const int background_floating_material_light = 2131558407;
+ // aapt resource value: 0x7F06001B
+ public const int background_floating_material_light = 2131099675;
- // aapt resource value: 0x7f0d0008
- public const int background_material_dark = 2131558408;
+ // aapt resource value: 0x7F06001C
+ public const int background_material_dark = 2131099676;
- // aapt resource value: 0x7f0d0009
- public const int background_material_light = 2131558409;
+ // aapt resource value: 0x7F06001D
+ public const int background_material_light = 2131099677;
- // aapt resource value: 0x7f0d000a
- public const int bright_foreground_disabled_material_dark = 2131558410;
+ // aapt resource value: 0x7F06001E
+ public const int bright_foreground_disabled_material_dark = 2131099678;
- // aapt resource value: 0x7f0d000b
- public const int bright_foreground_disabled_material_light = 2131558411;
+ // aapt resource value: 0x7F06001F
+ public const int bright_foreground_disabled_material_light = 2131099679;
- // aapt resource value: 0x7f0d000c
- public const int bright_foreground_inverse_material_dark = 2131558412;
+ // aapt resource value: 0x7F060020
+ public const int bright_foreground_inverse_material_dark = 2131099680;
- // aapt resource value: 0x7f0d000d
- public const int bright_foreground_inverse_material_light = 2131558413;
+ // aapt resource value: 0x7F060021
+ public const int bright_foreground_inverse_material_light = 2131099681;
- // aapt resource value: 0x7f0d000e
- public const int bright_foreground_material_dark = 2131558414;
+ // aapt resource value: 0x7F060022
+ public const int bright_foreground_material_dark = 2131099682;
- // aapt resource value: 0x7f0d000f
- public const int bright_foreground_material_light = 2131558415;
+ // aapt resource value: 0x7F060023
+ public const int bright_foreground_material_light = 2131099683;
- // aapt resource value: 0x7f0d0010
- public const int button_material_dark = 2131558416;
+ // aapt resource value: 0x7F060024
+ public const int button_material_dark = 2131099684;
- // aapt resource value: 0x7f0d0011
- public const int button_material_light = 2131558417;
+ // aapt resource value: 0x7F060025
+ public const int button_material_light = 2131099685;
- // aapt resource value: 0x7f0d003c
- public const int design_bottom_navigation_shadow_color = 2131558460;
+ // aapt resource value: 0x7F060026
+ public const int design_bottom_navigation_shadow_color = 2131099686;
- // aapt resource value: 0x7f0d0066
- public const int design_error = 2131558502;
+ // aapt resource value: 0x7F060027
+ public const int design_error = 2131099687;
- // aapt resource value: 0x7f0d003d
- public const int design_fab_shadow_end_color = 2131558461;
+ // aapt resource value: 0x7F060028
+ public const int design_fab_shadow_end_color = 2131099688;
- // aapt resource value: 0x7f0d003e
- public const int design_fab_shadow_mid_color = 2131558462;
+ // aapt resource value: 0x7F060029
+ public const int design_fab_shadow_mid_color = 2131099689;
- // aapt resource value: 0x7f0d003f
- public const int design_fab_shadow_start_color = 2131558463;
+ // aapt resource value: 0x7F06002A
+ public const int design_fab_shadow_start_color = 2131099690;
- // aapt resource value: 0x7f0d0040
- public const int design_fab_stroke_end_inner_color = 2131558464;
+ // aapt resource value: 0x7F06002B
+ public const int design_fab_stroke_end_inner_color = 2131099691;
- // aapt resource value: 0x7f0d0041
- public const int design_fab_stroke_end_outer_color = 2131558465;
+ // aapt resource value: 0x7F06002C
+ public const int design_fab_stroke_end_outer_color = 2131099692;
- // aapt resource value: 0x7f0d0042
- public const int design_fab_stroke_top_inner_color = 2131558466;
+ // aapt resource value: 0x7F06002D
+ public const int design_fab_stroke_top_inner_color = 2131099693;
- // aapt resource value: 0x7f0d0043
- public const int design_fab_stroke_top_outer_color = 2131558467;
+ // aapt resource value: 0x7F06002E
+ public const int design_fab_stroke_top_outer_color = 2131099694;
- // aapt resource value: 0x7f0d0044
- public const int design_snackbar_background_color = 2131558468;
+ // aapt resource value: 0x7F06002F
+ public const int design_snackbar_background_color = 2131099695;
- // aapt resource value: 0x7f0d0067
- public const int design_tint_password_toggle = 2131558503;
+ // aapt resource value: 0x7F060030
+ public const int design_tint_password_toggle = 2131099696;
- // aapt resource value: 0x7f0d0012
- public const int dim_foreground_disabled_material_dark = 2131558418;
+ // aapt resource value: 0x7F060031
+ public const int dim_foreground_disabled_material_dark = 2131099697;
- // aapt resource value: 0x7f0d0013
- public const int dim_foreground_disabled_material_light = 2131558419;
+ // aapt resource value: 0x7F060032
+ public const int dim_foreground_disabled_material_light = 2131099698;
- // aapt resource value: 0x7f0d0014
- public const int dim_foreground_material_dark = 2131558420;
+ // aapt resource value: 0x7F060033
+ public const int dim_foreground_material_dark = 2131099699;
- // aapt resource value: 0x7f0d0015
- public const int dim_foreground_material_light = 2131558421;
+ // aapt resource value: 0x7F060034
+ public const int dim_foreground_material_light = 2131099700;
- // aapt resource value: 0x7f0d0016
- public const int error_color_material = 2131558422;
+ // aapt resource value: 0x7F060035
+ public const int error_color_material = 2131099701;
- // aapt resource value: 0x7f0d0017
- public const int foreground_material_dark = 2131558423;
+ // aapt resource value: 0x7F060036
+ public const int foreground_material_dark = 2131099702;
- // aapt resource value: 0x7f0d0018
- public const int foreground_material_light = 2131558424;
+ // aapt resource value: 0x7F060037
+ public const int foreground_material_light = 2131099703;
- // aapt resource value: 0x7f0d0048
- public const int gd_top_view = 2131558472;
+ // aapt resource value: 0x7F060038
+ public const int gd_top_view = 2131099704;
- // aapt resource value: 0x7f0d0019
- public const int highlighted_text_material_dark = 2131558425;
+ // aapt resource value: 0x7F060039
+ public const int highlighted_text_material_dark = 2131099705;
- // aapt resource value: 0x7f0d001a
- public const int highlighted_text_material_light = 2131558426;
+ // aapt resource value: 0x7F06003A
+ public const int highlighted_text_material_light = 2131099706;
- // aapt resource value: 0x7f0d001b
- public const int material_blue_grey_800 = 2131558427;
+ // aapt resource value: 0x7F06003B
+ public const int material_blue_grey_800 = 2131099707;
- // aapt resource value: 0x7f0d001c
- public const int material_blue_grey_900 = 2131558428;
+ // aapt resource value: 0x7F06003C
+ public const int material_blue_grey_900 = 2131099708;
- // aapt resource value: 0x7f0d001d
- public const int material_blue_grey_950 = 2131558429;
+ // aapt resource value: 0x7F06003D
+ public const int material_blue_grey_950 = 2131099709;
- // aapt resource value: 0x7f0d001e
- public const int material_deep_teal_200 = 2131558430;
+ // aapt resource value: 0x7F06003E
+ public const int material_deep_teal_200 = 2131099710;
- // aapt resource value: 0x7f0d001f
- public const int material_deep_teal_500 = 2131558431;
+ // aapt resource value: 0x7F06003F
+ public const int material_deep_teal_500 = 2131099711;
- // aapt resource value: 0x7f0d0020
- public const int material_grey_100 = 2131558432;
+ // aapt resource value: 0x7F060040
+ public const int material_grey_100 = 2131099712;
- // aapt resource value: 0x7f0d0021
- public const int material_grey_300 = 2131558433;
+ // aapt resource value: 0x7F060041
+ public const int material_grey_300 = 2131099713;
- // aapt resource value: 0x7f0d0022
- public const int material_grey_50 = 2131558434;
+ // aapt resource value: 0x7F060042
+ public const int material_grey_50 = 2131099714;
- // aapt resource value: 0x7f0d0023
- public const int material_grey_600 = 2131558435;
+ // aapt resource value: 0x7F060043
+ public const int material_grey_600 = 2131099715;
- // aapt resource value: 0x7f0d0024
- public const int material_grey_800 = 2131558436;
+ // aapt resource value: 0x7F060044
+ public const int material_grey_800 = 2131099716;
- // aapt resource value: 0x7f0d0025
- public const int material_grey_850 = 2131558437;
+ // aapt resource value: 0x7F060045
+ public const int material_grey_850 = 2131099717;
- // aapt resource value: 0x7f0d0026
- public const int material_grey_900 = 2131558438;
+ // aapt resource value: 0x7F060046
+ public const int material_grey_900 = 2131099718;
- // aapt resource value: 0x7f0d0047
- public const int material_red_500 = 2131558471;
+ // aapt resource value: 0x7F060047
+ public const int material_red_500 = 2131099719;
- // aapt resource value: 0x7f0d0045
- public const int notification_action_color_filter = 2131558469;
+ // aapt resource value: 0x7F060048
+ public const int notification_action_color_filter = 2131099720;
- // aapt resource value: 0x7f0d0046
- public const int notification_icon_bg_color = 2131558470;
+ // aapt resource value: 0x7F060049
+ public const int notification_icon_bg_color = 2131099721;
- // aapt resource value: 0x7f0d003b
- public const int notification_material_background_media_default_color = 2131558459;
+ // aapt resource value: 0x7F06004A
+ public const int notification_material_background_media_default_color = 2131099722;
- // aapt resource value: 0x7f0d0049
- public const int pickerview_bgColor_default = 2131558473;
+ // aapt resource value: 0x7F06004B
+ public const int pickerview_bgColor_default = 2131099723;
- // aapt resource value: 0x7f0d004a
- public const int pickerview_bgColor_overlay = 2131558474;
+ // aapt resource value: 0x7F06004C
+ public const int pickerview_bgColor_overlay = 2131099724;
- // aapt resource value: 0x7f0d004b
- public const int pickerview_bg_topbar = 2131558475;
+ // aapt resource value: 0x7F06004D
+ public const int pickerview_bg_topbar = 2131099725;
- // aapt resource value: 0x7f0d004c
- public const int pickerview_timebtn_nor = 2131558476;
+ // aapt resource value: 0x7F06004E
+ public const int pickerview_timebtn_nor = 2131099726;
- // aapt resource value: 0x7f0d004d
- public const int pickerview_timebtn_pre = 2131558477;
+ // aapt resource value: 0x7F06004F
+ public const int pickerview_timebtn_pre = 2131099727;
- // aapt resource value: 0x7f0d004e
- public const int pickerview_topbar_title = 2131558478;
+ // aapt resource value: 0x7F060050
+ public const int pickerview_topbar_title = 2131099728;
- // aapt resource value: 0x7f0d004f
- public const int pickerview_wheelview_textcolor_center = 2131558479;
+ // aapt resource value: 0x7F060051
+ public const int pickerview_wheelview_textcolor_center = 2131099729;
- // aapt resource value: 0x7f0d0050
- public const int pickerview_wheelview_textcolor_divider = 2131558480;
+ // aapt resource value: 0x7F060052
+ public const int pickerview_wheelview_textcolor_divider = 2131099730;
- // aapt resource value: 0x7f0d0051
- public const int pickerview_wheelview_textcolor_out = 2131558481;
+ // aapt resource value: 0x7F060053
+ public const int pickerview_wheelview_textcolor_out = 2131099731;
- // aapt resource value: 0x7f0d0027
- public const int primary_dark_material_dark = 2131558439;
+ // aapt resource value: 0x7F060054
+ public const int primary_dark_material_dark = 2131099732;
- // aapt resource value: 0x7f0d0028
- public const int primary_dark_material_light = 2131558440;
+ // aapt resource value: 0x7F060055
+ public const int primary_dark_material_light = 2131099733;
- // aapt resource value: 0x7f0d0029
- public const int primary_material_dark = 2131558441;
+ // aapt resource value: 0x7F060056
+ public const int primary_material_dark = 2131099734;
- // aapt resource value: 0x7f0d002a
- public const int primary_material_light = 2131558442;
+ // aapt resource value: 0x7F060057
+ public const int primary_material_light = 2131099735;
- // aapt resource value: 0x7f0d002b
- public const int primary_text_default_material_dark = 2131558443;
+ // aapt resource value: 0x7F060058
+ public const int primary_text_default_material_dark = 2131099736;
- // aapt resource value: 0x7f0d002c
- public const int primary_text_default_material_light = 2131558444;
+ // aapt resource value: 0x7F060059
+ public const int primary_text_default_material_light = 2131099737;
- // aapt resource value: 0x7f0d002d
- public const int primary_text_disabled_material_dark = 2131558445;
+ // aapt resource value: 0x7F06005A
+ public const int primary_text_disabled_material_dark = 2131099738;
- // aapt resource value: 0x7f0d002e
- public const int primary_text_disabled_material_light = 2131558446;
+ // aapt resource value: 0x7F06005B
+ public const int primary_text_disabled_material_light = 2131099739;
- // aapt resource value: 0x7f0d002f
- public const int ripple_material_dark = 2131558447;
+ // aapt resource value: 0x7F06005C
+ public const int ripple_material_dark = 2131099740;
- // aapt resource value: 0x7f0d0030
- public const int ripple_material_light = 2131558448;
+ // aapt resource value: 0x7F06005D
+ public const int ripple_material_light = 2131099741;
- // aapt resource value: 0x7f0d0031
- public const int secondary_text_default_material_dark = 2131558449;
+ // aapt resource value: 0x7F06005E
+ public const int secondary_text_default_material_dark = 2131099742;
- // aapt resource value: 0x7f0d0032
- public const int secondary_text_default_material_light = 2131558450;
+ // aapt resource value: 0x7F06005F
+ public const int secondary_text_default_material_light = 2131099743;
- // aapt resource value: 0x7f0d0033
- public const int secondary_text_disabled_material_dark = 2131558451;
+ // aapt resource value: 0x7F060060
+ public const int secondary_text_disabled_material_dark = 2131099744;
- // aapt resource value: 0x7f0d0034
- public const int secondary_text_disabled_material_light = 2131558452;
+ // aapt resource value: 0x7F060061
+ public const int secondary_text_disabled_material_light = 2131099745;
- // aapt resource value: 0x7f0d0035
- public const int switch_thumb_disabled_material_dark = 2131558453;
+ // aapt resource value: 0x7F060062
+ public const int switch_thumb_disabled_material_dark = 2131099746;
- // aapt resource value: 0x7f0d0036
- public const int switch_thumb_disabled_material_light = 2131558454;
+ // aapt resource value: 0x7F060063
+ public const int switch_thumb_disabled_material_light = 2131099747;
- // aapt resource value: 0x7f0d0068
- public const int switch_thumb_material_dark = 2131558504;
+ // aapt resource value: 0x7F060064
+ public const int switch_thumb_material_dark = 2131099748;
- // aapt resource value: 0x7f0d0069
- public const int switch_thumb_material_light = 2131558505;
+ // aapt resource value: 0x7F060065
+ public const int switch_thumb_material_light = 2131099749;
- // aapt resource value: 0x7f0d0037
- public const int switch_thumb_normal_material_dark = 2131558455;
+ // aapt resource value: 0x7F060066
+ public const int switch_thumb_normal_material_dark = 2131099750;
- // aapt resource value: 0x7f0d0038
- public const int switch_thumb_normal_material_light = 2131558456;
+ // aapt resource value: 0x7F060067
+ public const int switch_thumb_normal_material_light = 2131099751;
- // aapt resource value: 0x7f0d0039
- public const int tooltip_background_dark = 2131558457;
+ // aapt resource value: 0x7F060068
+ public const int tooltip_background_dark = 2131099752;
- // aapt resource value: 0x7f0d003a
- public const int tooltip_background_light = 2131558458;
+ // aapt resource value: 0x7F060069
+ public const int tooltip_background_light = 2131099753;
static Color()
{
@@ -2029,491 +2029,491 @@
public partial class Dimension
{
- // aapt resource value: 0x7f080012
- public const int abc_action_bar_content_inset_material = 2131230738;
+ // aapt resource value: 0x7F070000
+ public const int abc_action_bar_content_inset_material = 2131165184;
- // aapt resource value: 0x7f080013
- public const int abc_action_bar_content_inset_with_nav = 2131230739;
+ // aapt resource value: 0x7F070001
+ public const int abc_action_bar_content_inset_with_nav = 2131165185;
- // aapt resource value: 0x7f080007
- public const int abc_action_bar_default_height_material = 2131230727;
+ // aapt resource value: 0x7F070002
+ public const int abc_action_bar_default_height_material = 2131165186;
- // aapt resource value: 0x7f080014
- public const int abc_action_bar_default_padding_end_material = 2131230740;
+ // aapt resource value: 0x7F070003
+ public const int abc_action_bar_default_padding_end_material = 2131165187;
- // aapt resource value: 0x7f080015
- public const int abc_action_bar_default_padding_start_material = 2131230741;
+ // aapt resource value: 0x7F070004
+ public const int abc_action_bar_default_padding_start_material = 2131165188;
- // aapt resource value: 0x7f080017
- public const int abc_action_bar_elevation_material = 2131230743;
+ // aapt resource value: 0x7F070005
+ public const int abc_action_bar_elevation_material = 2131165189;
- // aapt resource value: 0x7f080018
- public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
+ // aapt resource value: 0x7F070006
+ public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
- // aapt resource value: 0x7f080019
- public const int abc_action_bar_overflow_padding_end_material = 2131230745;
+ // aapt resource value: 0x7F070007
+ public const int abc_action_bar_overflow_padding_end_material = 2131165191;
- // aapt resource value: 0x7f08001a
- public const int abc_action_bar_overflow_padding_start_material = 2131230746;
+ // aapt resource value: 0x7F070008
+ public const int abc_action_bar_overflow_padding_start_material = 2131165192;
- // aapt resource value: 0x7f080008
- public const int abc_action_bar_progress_bar_size = 2131230728;
+ // aapt resource value: 0x7F070009
+ public const int abc_action_bar_progress_bar_size = 2131165193;
- // aapt resource value: 0x7f08001b
- public const int abc_action_bar_stacked_max_height = 2131230747;
+ // aapt resource value: 0x7F07000A
+ public const int abc_action_bar_stacked_max_height = 2131165194;
- // aapt resource value: 0x7f08001c
- public const int abc_action_bar_stacked_tab_max_width = 2131230748;
+ // aapt resource value: 0x7F07000B
+ public const int abc_action_bar_stacked_tab_max_width = 2131165195;
- // aapt resource value: 0x7f08001d
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
+ // aapt resource value: 0x7F07000C
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
- // aapt resource value: 0x7f08001e
- public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
+ // aapt resource value: 0x7F07000D
+ public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
- // aapt resource value: 0x7f08001f
- public const int abc_action_button_min_height_material = 2131230751;
+ // aapt resource value: 0x7F07000E
+ public const int abc_action_button_min_height_material = 2131165198;
- // aapt resource value: 0x7f080020
- public const int abc_action_button_min_width_material = 2131230752;
+ // aapt resource value: 0x7F07000F
+ public const int abc_action_button_min_width_material = 2131165199;
- // aapt resource value: 0x7f080021
- public const int abc_action_button_min_width_overflow_material = 2131230753;
+ // aapt resource value: 0x7F070010
+ public const int abc_action_button_min_width_overflow_material = 2131165200;
- // aapt resource value: 0x7f080006
- public const int abc_alert_dialog_button_bar_height = 2131230726;
+ // aapt resource value: 0x7F070011
+ public const int abc_alert_dialog_button_bar_height = 2131165201;
- // aapt resource value: 0x7f080022
- public const int abc_button_inset_horizontal_material = 2131230754;
+ // aapt resource value: 0x7F070012
+ public const int abc_button_inset_horizontal_material = 2131165202;
- // aapt resource value: 0x7f080023
- public const int abc_button_inset_vertical_material = 2131230755;
+ // aapt resource value: 0x7F070013
+ public const int abc_button_inset_vertical_material = 2131165203;
- // aapt resource value: 0x7f080024
- public const int abc_button_padding_horizontal_material = 2131230756;
+ // aapt resource value: 0x7F070014
+ public const int abc_button_padding_horizontal_material = 2131165204;
- // aapt resource value: 0x7f080025
- public const int abc_button_padding_vertical_material = 2131230757;
+ // aapt resource value: 0x7F070015
+ public const int abc_button_padding_vertical_material = 2131165205;
- // aapt resource value: 0x7f080026
- public const int abc_cascading_menus_min_smallest_width = 2131230758;
+ // aapt resource value: 0x7F070016
+ public const int abc_cascading_menus_min_smallest_width = 2131165206;
- // aapt resource value: 0x7f08000b
- public const int abc_config_prefDialogWidth = 2131230731;
+ // aapt resource value: 0x7F070017
+ public const int abc_config_prefDialogWidth = 2131165207;
- // aapt resource value: 0x7f080027
- public const int abc_control_corner_material = 2131230759;
+ // aapt resource value: 0x7F070018
+ public const int abc_control_corner_material = 2131165208;
- // aapt resource value: 0x7f080028
- public const int abc_control_inset_material = 2131230760;
+ // aapt resource value: 0x7F070019
+ public const int abc_control_inset_material = 2131165209;
- // aapt resource value: 0x7f080029
- public const int abc_control_padding_material = 2131230761;
+ // aapt resource value: 0x7F07001A
+ public const int abc_control_padding_material = 2131165210;
- // aapt resource value: 0x7f08000c
- public const int abc_dialog_fixed_height_major = 2131230732;
+ // aapt resource value: 0x7F07001B
+ public const int abc_dialog_fixed_height_major = 2131165211;
- // aapt resource value: 0x7f08000d
- public const int abc_dialog_fixed_height_minor = 2131230733;
+ // aapt resource value: 0x7F07001C
+ public const int abc_dialog_fixed_height_minor = 2131165212;
- // aapt resource value: 0x7f08000e
- public const int abc_dialog_fixed_width_major = 2131230734;
+ // aapt resource value: 0x7F07001D
+ public const int abc_dialog_fixed_width_major = 2131165213;
- // aapt resource value: 0x7f08000f
- public const int abc_dialog_fixed_width_minor = 2131230735;
+ // aapt resource value: 0x7F07001E
+ public const int abc_dialog_fixed_width_minor = 2131165214;
- // aapt resource value: 0x7f08002a
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
+ // aapt resource value: 0x7F07001F
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
- // aapt resource value: 0x7f08002b
- public const int abc_dialog_list_padding_top_no_title = 2131230763;
+ // aapt resource value: 0x7F070020
+ public const int abc_dialog_list_padding_top_no_title = 2131165216;
- // aapt resource value: 0x7f080010
- public const int abc_dialog_min_width_major = 2131230736;
+ // aapt resource value: 0x7F070021
+ public const int abc_dialog_min_width_major = 2131165217;
- // aapt resource value: 0x7f080011
- public const int abc_dialog_min_width_minor = 2131230737;
+ // aapt resource value: 0x7F070022
+ public const int abc_dialog_min_width_minor = 2131165218;
- // aapt resource value: 0x7f08002c
- public const int abc_dialog_padding_material = 2131230764;
+ // aapt resource value: 0x7F070023
+ public const int abc_dialog_padding_material = 2131165219;
- // aapt resource value: 0x7f08002d
- public const int abc_dialog_padding_top_material = 2131230765;
+ // aapt resource value: 0x7F070024
+ public const int abc_dialog_padding_top_material = 2131165220;
- // aapt resource value: 0x7f08002e
- public const int abc_dialog_title_divider_material = 2131230766;
+ // aapt resource value: 0x7F070025
+ public const int abc_dialog_title_divider_material = 2131165221;
- // aapt resource value: 0x7f08002f
- public const int abc_disabled_alpha_material_dark = 2131230767;
+ // aapt resource value: 0x7F070026
+ public const int abc_disabled_alpha_material_dark = 2131165222;
- // aapt resource value: 0x7f080030
- public const int abc_disabled_alpha_material_light = 2131230768;
+ // aapt resource value: 0x7F070027
+ public const int abc_disabled_alpha_material_light = 2131165223;
- // aapt resource value: 0x7f080031
- public const int abc_dropdownitem_icon_width = 2131230769;
+ // aapt resource value: 0x7F070028
+ public const int abc_dropdownitem_icon_width = 2131165224;
- // aapt resource value: 0x7f080032
- public const int abc_dropdownitem_text_padding_left = 2131230770;
+ // aapt resource value: 0x7F070029
+ public const int abc_dropdownitem_text_padding_left = 2131165225;
- // aapt resource value: 0x7f080033
- public const int abc_dropdownitem_text_padding_right = 2131230771;
+ // aapt resource value: 0x7F07002A
+ public const int abc_dropdownitem_text_padding_right = 2131165226;
- // aapt resource value: 0x7f080034
- public const int abc_edit_text_inset_bottom_material = 2131230772;
+ // aapt resource value: 0x7F07002B
+ public const int abc_edit_text_inset_bottom_material = 2131165227;
- // aapt resource value: 0x7f080035
- public const int abc_edit_text_inset_horizontal_material = 2131230773;
+ // aapt resource value: 0x7F07002C
+ public const int abc_edit_text_inset_horizontal_material = 2131165228;
- // aapt resource value: 0x7f080036
- public const int abc_edit_text_inset_top_material = 2131230774;
+ // aapt resource value: 0x7F07002D
+ public const int abc_edit_text_inset_top_material = 2131165229;
- // aapt resource value: 0x7f080037
- public const int abc_floating_window_z = 2131230775;
+ // aapt resource value: 0x7F07002E
+ public const int abc_floating_window_z = 2131165230;
- // aapt resource value: 0x7f080038
- public const int abc_list_item_padding_horizontal_material = 2131230776;
+ // aapt resource value: 0x7F07002F
+ public const int abc_list_item_padding_horizontal_material = 2131165231;
- // aapt resource value: 0x7f080039
- public const int abc_panel_menu_list_width = 2131230777;
+ // aapt resource value: 0x7F070030
+ public const int abc_panel_menu_list_width = 2131165232;
- // aapt resource value: 0x7f08003a
- public const int abc_progress_bar_height_material = 2131230778;
+ // aapt resource value: 0x7F070031
+ public const int abc_progress_bar_height_material = 2131165233;
- // aapt resource value: 0x7f08003b
- public const int abc_search_view_preferred_height = 2131230779;
+ // aapt resource value: 0x7F070032
+ public const int abc_search_view_preferred_height = 2131165234;
- // aapt resource value: 0x7f08003c
- public const int abc_search_view_preferred_width = 2131230780;
+ // aapt resource value: 0x7F070033
+ public const int abc_search_view_preferred_width = 2131165235;
- // aapt resource value: 0x7f08003d
- public const int abc_seekbar_track_background_height_material = 2131230781;
+ // aapt resource value: 0x7F070034
+ public const int abc_seekbar_track_background_height_material = 2131165236;
- // aapt resource value: 0x7f08003e
- public const int abc_seekbar_track_progress_height_material = 2131230782;
+ // aapt resource value: 0x7F070035
+ public const int abc_seekbar_track_progress_height_material = 2131165237;
- // aapt resource value: 0x7f08003f
- public const int abc_select_dialog_padding_start_material = 2131230783;
+ // aapt resource value: 0x7F070036
+ public const int abc_select_dialog_padding_start_material = 2131165238;
- // aapt resource value: 0x7f080016
- public const int abc_switch_padding = 2131230742;
+ // aapt resource value: 0x7F070037
+ public const int abc_switch_padding = 2131165239;
- // aapt resource value: 0x7f080040
- public const int abc_text_size_body_1_material = 2131230784;
+ // aapt resource value: 0x7F070038
+ public const int abc_text_size_body_1_material = 2131165240;
- // aapt resource value: 0x7f080041
- public const int abc_text_size_body_2_material = 2131230785;
+ // aapt resource value: 0x7F070039
+ public const int abc_text_size_body_2_material = 2131165241;
- // aapt resource value: 0x7f080042
- public const int abc_text_size_button_material = 2131230786;
+ // aapt resource value: 0x7F07003A
+ public const int abc_text_size_button_material = 2131165242;
- // aapt resource value: 0x7f080043
- public const int abc_text_size_caption_material = 2131230787;
+ // aapt resource value: 0x7F07003B
+ public const int abc_text_size_caption_material = 2131165243;
- // aapt resource value: 0x7f080044
- public const int abc_text_size_display_1_material = 2131230788;
+ // aapt resource value: 0x7F07003C
+ public const int abc_text_size_display_1_material = 2131165244;
- // aapt resource value: 0x7f080045
- public const int abc_text_size_display_2_material = 2131230789;
+ // aapt resource value: 0x7F07003D
+ public const int abc_text_size_display_2_material = 2131165245;
- // aapt resource value: 0x7f080046
- public const int abc_text_size_display_3_material = 2131230790;
+ // aapt resource value: 0x7F07003E
+ public const int abc_text_size_display_3_material = 2131165246;
- // aapt resource value: 0x7f080047
- public const int abc_text_size_display_4_material = 2131230791;
+ // aapt resource value: 0x7F07003F
+ public const int abc_text_size_display_4_material = 2131165247;
- // aapt resource value: 0x7f080048
- public const int abc_text_size_headline_material = 2131230792;
+ // aapt resource value: 0x7F070040
+ public const int abc_text_size_headline_material = 2131165248;
- // aapt resource value: 0x7f080049
- public const int abc_text_size_large_material = 2131230793;
+ // aapt resource value: 0x7F070041
+ public const int abc_text_size_large_material = 2131165249;
- // aapt resource value: 0x7f08004a
- public const int abc_text_size_medium_material = 2131230794;
+ // aapt resource value: 0x7F070042
+ public const int abc_text_size_medium_material = 2131165250;
- // aapt resource value: 0x7f08004b
- public const int abc_text_size_menu_header_material = 2131230795;
+ // aapt resource value: 0x7F070043
+ public const int abc_text_size_menu_header_material = 2131165251;
- // aapt resource value: 0x7f08004c
- public const int abc_text_size_menu_material = 2131230796;
+ // aapt resource value: 0x7F070044
+ public const int abc_text_size_menu_material = 2131165252;
- // aapt resource value: 0x7f08004d
- public const int abc_text_size_small_material = 2131230797;
+ // aapt resource value: 0x7F070045
+ public const int abc_text_size_small_material = 2131165253;
- // aapt resource value: 0x7f08004e
- public const int abc_text_size_subhead_material = 2131230798;
+ // aapt resource value: 0x7F070046
+ public const int abc_text_size_subhead_material = 2131165254;
- // aapt resource value: 0x7f080009
- public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+ // aapt resource value: 0x7F070047
+ public const int abc_text_size_subtitle_material_toolbar = 2131165255;
- // aapt resource value: 0x7f08004f
- public const int abc_text_size_title_material = 2131230799;
+ // aapt resource value: 0x7F070048
+ public const int abc_text_size_title_material = 2131165256;
- // aapt resource value: 0x7f08000a
- public const int abc_text_size_title_material_toolbar = 2131230730;
+ // aapt resource value: 0x7F070049
+ public const int abc_text_size_title_material_toolbar = 2131165257;
- // aapt resource value: 0x7f08008b
- public const int compat_button_inset_horizontal_material = 2131230859;
+ // aapt resource value: 0x7F07004A
+ public const int compat_button_inset_horizontal_material = 2131165258;
- // aapt resource value: 0x7f08008c
- public const int compat_button_inset_vertical_material = 2131230860;
+ // aapt resource value: 0x7F07004B
+ public const int compat_button_inset_vertical_material = 2131165259;
- // aapt resource value: 0x7f08008d
- public const int compat_button_padding_horizontal_material = 2131230861;
+ // aapt resource value: 0x7F07004C
+ public const int compat_button_padding_horizontal_material = 2131165260;
- // aapt resource value: 0x7f08008e
- public const int compat_button_padding_vertical_material = 2131230862;
+ // aapt resource value: 0x7F07004D
+ public const int compat_button_padding_vertical_material = 2131165261;
- // aapt resource value: 0x7f08008f
- public const int compat_control_corner_material = 2131230863;
+ // aapt resource value: 0x7F07004E
+ public const int compat_control_corner_material = 2131165262;
- // aapt resource value: 0x7f080069
- public const int design_appbar_elevation = 2131230825;
+ // aapt resource value: 0x7F07004F
+ public const int design_appbar_elevation = 2131165263;
- // aapt resource value: 0x7f08006a
- public const int design_bottom_navigation_active_item_max_width = 2131230826;
+ // aapt resource value: 0x7F070050
+ public const int design_bottom_navigation_active_item_max_width = 2131165264;
- // aapt resource value: 0x7f08006b
- public const int design_bottom_navigation_active_text_size = 2131230827;
+ // aapt resource value: 0x7F070051
+ public const int design_bottom_navigation_active_text_size = 2131165265;
- // aapt resource value: 0x7f08006c
- public const int design_bottom_navigation_elevation = 2131230828;
+ // aapt resource value: 0x7F070052
+ public const int design_bottom_navigation_elevation = 2131165266;
- // aapt resource value: 0x7f08006d
- public const int design_bottom_navigation_height = 2131230829;
+ // aapt resource value: 0x7F070053
+ public const int design_bottom_navigation_height = 2131165267;
- // aapt resource value: 0x7f08006e
- public const int design_bottom_navigation_item_max_width = 2131230830;
+ // aapt resource value: 0x7F070054
+ public const int design_bottom_navigation_item_max_width = 2131165268;
- // aapt resource value: 0x7f08006f
- public const int design_bottom_navigation_item_min_width = 2131230831;
+ // aapt resource value: 0x7F070055
+ public const int design_bottom_navigation_item_min_width = 2131165269;
- // aapt resource value: 0x7f080070
- public const int design_bottom_navigation_margin = 2131230832;
+ // aapt resource value: 0x7F070056
+ public const int design_bottom_navigation_margin = 2131165270;
- // aapt resource value: 0x7f080071
- public const int design_bottom_navigation_shadow_height = 2131230833;
+ // aapt resource value: 0x7F070057
+ public const int design_bottom_navigation_shadow_height = 2131165271;
- // aapt resource value: 0x7f080072
- public const int design_bottom_navigation_text_size = 2131230834;
+ // aapt resource value: 0x7F070058
+ public const int design_bottom_navigation_text_size = 2131165272;
- // aapt resource value: 0x7f080073
- public const int design_bottom_sheet_modal_elevation = 2131230835;
+ // aapt resource value: 0x7F070059
+ public const int design_bottom_sheet_modal_elevation = 2131165273;
- // aapt resource value: 0x7f080074
- public const int design_bottom_sheet_peek_height_min = 2131230836;
+ // aapt resource value: 0x7F07005A
+ public const int design_bottom_sheet_peek_height_min = 2131165274;
- // aapt resource value: 0x7f080075
- public const int design_fab_border_width = 2131230837;
+ // aapt resource value: 0x7F07005B
+ public const int design_fab_border_width = 2131165275;
- // aapt resource value: 0x7f080076
- public const int design_fab_elevation = 2131230838;
+ // aapt resource value: 0x7F07005C
+ public const int design_fab_elevation = 2131165276;
- // aapt resource value: 0x7f080077
- public const int design_fab_image_size = 2131230839;
+ // aapt resource value: 0x7F07005D
+ public const int design_fab_image_size = 2131165277;
- // aapt resource value: 0x7f080078
- public const int design_fab_size_mini = 2131230840;
+ // aapt resource value: 0x7F07005E
+ public const int design_fab_size_mini = 2131165278;
- // aapt resource value: 0x7f080079
- public const int design_fab_size_normal = 2131230841;
+ // aapt resource value: 0x7F07005F
+ public const int design_fab_size_normal = 2131165279;
- // aapt resource value: 0x7f08007a
- public const int design_fab_translation_z_pressed = 2131230842;
+ // aapt resource value: 0x7F070060
+ public const int design_fab_translation_z_pressed = 2131165280;
- // aapt resource value: 0x7f08007b
- public const int design_navigation_elevation = 2131230843;
+ // aapt resource value: 0x7F070061
+ public const int design_navigation_elevation = 2131165281;
- // aapt resource value: 0x7f08007c
- public const int design_navigation_icon_padding = 2131230844;
+ // aapt resource value: 0x7F070062
+ public const int design_navigation_icon_padding = 2131165282;
- // aapt resource value: 0x7f08007d
- public const int design_navigation_icon_size = 2131230845;
+ // aapt resource value: 0x7F070063
+ public const int design_navigation_icon_size = 2131165283;
- // aapt resource value: 0x7f080061
- public const int design_navigation_max_width = 2131230817;
+ // aapt resource value: 0x7F070064
+ public const int design_navigation_max_width = 2131165284;
- // aapt resource value: 0x7f08007e
- public const int design_navigation_padding_bottom = 2131230846;
+ // aapt resource value: 0x7F070065
+ public const int design_navigation_padding_bottom = 2131165285;
- // aapt resource value: 0x7f08007f
- public const int design_navigation_separator_vertical_padding = 2131230847;
+ // aapt resource value: 0x7F070066
+ public const int design_navigation_separator_vertical_padding = 2131165286;
- // aapt resource value: 0x7f080062
- public const int design_snackbar_action_inline_max_width = 2131230818;
+ // aapt resource value: 0x7F070067
+ public const int design_snackbar_action_inline_max_width = 2131165287;
- // aapt resource value: 0x7f080063
- public const int design_snackbar_background_corner_radius = 2131230819;
+ // aapt resource value: 0x7F070068
+ public const int design_snackbar_background_corner_radius = 2131165288;
- // aapt resource value: 0x7f080080
- public const int design_snackbar_elevation = 2131230848;
+ // aapt resource value: 0x7F070069
+ public const int design_snackbar_elevation = 2131165289;
- // aapt resource value: 0x7f080064
- public const int design_snackbar_extra_spacing_horizontal = 2131230820;
+ // aapt resource value: 0x7F07006A
+ public const int design_snackbar_extra_spacing_horizontal = 2131165290;
- // aapt resource value: 0x7f080065
- public const int design_snackbar_max_width = 2131230821;
+ // aapt resource value: 0x7F07006B
+ public const int design_snackbar_max_width = 2131165291;
- // aapt resource value: 0x7f080066
- public const int design_snackbar_min_width = 2131230822;
+ // aapt resource value: 0x7F07006C
+ public const int design_snackbar_min_width = 2131165292;
- // aapt resource value: 0x7f080081
- public const int design_snackbar_padding_horizontal = 2131230849;
+ // aapt resource value: 0x7F07006D
+ public const int design_snackbar_padding_horizontal = 2131165293;
- // aapt resource value: 0x7f080082
- public const int design_snackbar_padding_vertical = 2131230850;
+ // aapt resource value: 0x7F07006E
+ public const int design_snackbar_padding_vertical = 2131165294;
- // aapt resource value: 0x7f080067
- public const int design_snackbar_padding_vertical_2lines = 2131230823;
+ // aapt resource value: 0x7F07006F
+ public const int design_snackbar_padding_vertical_2lines = 2131165295;
- // aapt resource value: 0x7f080083
- public const int design_snackbar_text_size = 2131230851;
+ // aapt resource value: 0x7F070070
+ public const int design_snackbar_text_size = 2131165296;
- // aapt resource value: 0x7f080084
- public const int design_tab_max_width = 2131230852;
+ // aapt resource value: 0x7F070071
+ public const int design_tab_max_width = 2131165297;
- // aapt resource value: 0x7f080068
- public const int design_tab_scrollable_min_width = 2131230824;
+ // aapt resource value: 0x7F070072
+ public const int design_tab_scrollable_min_width = 2131165298;
- // aapt resource value: 0x7f080085
- public const int design_tab_text_size = 2131230853;
+ // aapt resource value: 0x7F070073
+ public const int design_tab_text_size = 2131165299;
- // aapt resource value: 0x7f080086
- public const int design_tab_text_size_2line = 2131230854;
+ // aapt resource value: 0x7F070074
+ public const int design_tab_text_size_2line = 2131165300;
- // aapt resource value: 0x7f080050
- public const int disabled_alpha_material_dark = 2131230800;
+ // aapt resource value: 0x7F070075
+ public const int disabled_alpha_material_dark = 2131165301;
- // aapt resource value: 0x7f080051
- public const int disabled_alpha_material_light = 2131230801;
+ // aapt resource value: 0x7F070076
+ public const int disabled_alpha_material_light = 2131165302;
- // aapt resource value: 0x7f080000
- public const int fastscroll_default_thickness = 2131230720;
+ // aapt resource value: 0x7F070077
+ public const int fastscroll_default_thickness = 2131165303;
- // aapt resource value: 0x7f080001
- public const int fastscroll_margin = 2131230721;
+ // aapt resource value: 0x7F070078
+ public const int fastscroll_margin = 2131165304;
- // aapt resource value: 0x7f080002
- public const int fastscroll_minimum_range = 2131230722;
+ // aapt resource value: 0x7F070079
+ public const int fastscroll_minimum_range = 2131165305;
- // aapt resource value: 0x7f08009c
- public const int fingerprint_icon_size = 2131230876;
+ // aapt resource value: 0x7F07007A
+ public const int fingerprint_icon_size = 2131165306;
- // aapt resource value: 0x7f08009b
- public const int fingerprint_status_layout_margin_vertical = 2131230875;
+ // aapt resource value: 0x7F07007B
+ public const int fingerprint_status_layout_margin_vertical = 2131165307;
- // aapt resource value: 0x7f080052
- public const int highlight_alpha_material_colored = 2131230802;
+ // aapt resource value: 0x7F07007C
+ public const int highlight_alpha_material_colored = 2131165308;
- // aapt resource value: 0x7f080053
- public const int highlight_alpha_material_dark = 2131230803;
+ // aapt resource value: 0x7F07007D
+ public const int highlight_alpha_material_dark = 2131165309;
- // aapt resource value: 0x7f080054
- public const int highlight_alpha_material_light = 2131230804;
+ // aapt resource value: 0x7F07007E
+ public const int highlight_alpha_material_light = 2131165310;
- // aapt resource value: 0x7f080055
- public const int hint_alpha_material_dark = 2131230805;
+ // aapt resource value: 0x7F07007F
+ public const int hint_alpha_material_dark = 2131165311;
- // aapt resource value: 0x7f080056
- public const int hint_alpha_material_light = 2131230806;
+ // aapt resource value: 0x7F070080
+ public const int hint_alpha_material_light = 2131165312;
- // aapt resource value: 0x7f080057
- public const int hint_pressed_alpha_material_dark = 2131230807;
+ // aapt resource value: 0x7F070081
+ public const int hint_pressed_alpha_material_dark = 2131165313;
- // aapt resource value: 0x7f080058
- public const int hint_pressed_alpha_material_light = 2131230808;
+ // aapt resource value: 0x7F070082
+ public const int hint_pressed_alpha_material_light = 2131165314;
- // aapt resource value: 0x7f080003
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+ // aapt resource value: 0x7F070083
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
- // aapt resource value: 0x7f080004
- public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+ // aapt resource value: 0x7F070084
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
- // aapt resource value: 0x7f080005
- public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+ // aapt resource value: 0x7F070085
+ public const int item_touch_helper_swipe_escape_velocity = 2131165317;
- // aapt resource value: 0x7f080090
- public const int notification_action_icon_size = 2131230864;
+ // aapt resource value: 0x7F070086
+ public const int notification_action_icon_size = 2131165318;
- // aapt resource value: 0x7f080091
- public const int notification_action_text_size = 2131230865;
+ // aapt resource value: 0x7F070087
+ public const int notification_action_text_size = 2131165319;
- // aapt resource value: 0x7f080092
- public const int notification_big_circle_margin = 2131230866;
+ // aapt resource value: 0x7F070088
+ public const int notification_big_circle_margin = 2131165320;
- // aapt resource value: 0x7f080088
- public const int notification_content_margin_start = 2131230856;
+ // aapt resource value: 0x7F070089
+ public const int notification_content_margin_start = 2131165321;
- // aapt resource value: 0x7f080093
- public const int notification_large_icon_height = 2131230867;
+ // aapt resource value: 0x7F07008A
+ public const int notification_large_icon_height = 2131165322;
- // aapt resource value: 0x7f080094
- public const int notification_large_icon_width = 2131230868;
+ // aapt resource value: 0x7F07008B
+ public const int notification_large_icon_width = 2131165323;
- // aapt resource value: 0x7f080089
- public const int notification_main_column_padding_top = 2131230857;
+ // aapt resource value: 0x7F07008C
+ public const int notification_main_column_padding_top = 2131165324;
- // aapt resource value: 0x7f08008a
- public const int notification_media_narrow_margin = 2131230858;
+ // aapt resource value: 0x7F07008D
+ public const int notification_media_narrow_margin = 2131165325;
- // aapt resource value: 0x7f080095
- public const int notification_right_icon_size = 2131230869;
+ // aapt resource value: 0x7F07008E
+ public const int notification_right_icon_size = 2131165326;
- // aapt resource value: 0x7f080087
- public const int notification_right_side_padding_top = 2131230855;
+ // aapt resource value: 0x7F07008F
+ public const int notification_right_side_padding_top = 2131165327;
- // aapt resource value: 0x7f080096
- public const int notification_small_icon_background_padding = 2131230870;
+ // aapt resource value: 0x7F070090
+ public const int notification_small_icon_background_padding = 2131165328;
- // aapt resource value: 0x7f080097
- public const int notification_small_icon_size_as_large = 2131230871;
+ // aapt resource value: 0x7F070091
+ public const int notification_small_icon_size_as_large = 2131165329;
- // aapt resource value: 0x7f080098
- public const int notification_subtext_size = 2131230872;
+ // aapt resource value: 0x7F070092
+ public const int notification_subtext_size = 2131165330;
- // aapt resource value: 0x7f080099
- public const int notification_top_pad = 2131230873;
+ // aapt resource value: 0x7F070093
+ public const int notification_top_pad = 2131165331;
- // aapt resource value: 0x7f08009a
- public const int notification_top_pad_large_text = 2131230874;
+ // aapt resource value: 0x7F070094
+ public const int notification_top_pad_large_text = 2131165332;
- // aapt resource value: 0x7f08009d
- public const int pickerview_textsize = 2131230877;
+ // aapt resource value: 0x7F070095
+ public const int pickerview_textsize = 2131165333;
- // aapt resource value: 0x7f08009e
- public const int pickerview_topbar_btn_textsize = 2131230878;
+ // aapt resource value: 0x7F070096
+ public const int pickerview_topbar_btn_textsize = 2131165334;
- // aapt resource value: 0x7f08009f
- public const int pickerview_topbar_height = 2131230879;
+ // aapt resource value: 0x7F070097
+ public const int pickerview_topbar_height = 2131165335;
- // aapt resource value: 0x7f0800a0
- public const int pickerview_topbar_padding = 2131230880;
+ // aapt resource value: 0x7F070098
+ public const int pickerview_topbar_padding = 2131165336;
- // aapt resource value: 0x7f0800a1
- public const int pickerview_topbar_title_textsize = 2131230881;
+ // aapt resource value: 0x7F070099
+ public const int pickerview_topbar_title_textsize = 2131165337;
- // aapt resource value: 0x7f080059
- public const int tooltip_corner_radius = 2131230809;
+ // aapt resource value: 0x7F07009A
+ public const int tooltip_corner_radius = 2131165338;
- // aapt resource value: 0x7f08005a
- public const int tooltip_horizontal_padding = 2131230810;
+ // aapt resource value: 0x7F07009B
+ public const int tooltip_horizontal_padding = 2131165339;
- // aapt resource value: 0x7f08005b
- public const int tooltip_margin = 2131230811;
+ // aapt resource value: 0x7F07009C
+ public const int tooltip_margin = 2131165340;
- // aapt resource value: 0x7f08005c
- public const int tooltip_precise_anchor_extra_offset = 2131230812;
+ // aapt resource value: 0x7F07009D
+ public const int tooltip_precise_anchor_extra_offset = 2131165341;
- // aapt resource value: 0x7f08005d
- public const int tooltip_precise_anchor_threshold = 2131230813;
+ // aapt resource value: 0x7F07009E
+ public const int tooltip_precise_anchor_threshold = 2131165342;
- // aapt resource value: 0x7f08005e
- public const int tooltip_vertical_padding = 2131230814;
+ // aapt resource value: 0x7F07009F
+ public const int tooltip_vertical_padding = 2131165343;
- // aapt resource value: 0x7f08005f
- public const int tooltip_y_offset_non_touch = 2131230815;
+ // aapt resource value: 0x7F0700A0
+ public const int tooltip_y_offset_non_touch = 2131165344;
- // aapt resource value: 0x7f080060
- public const int tooltip_y_offset_touch = 2131230816;
+ // aapt resource value: 0x7F0700A1
+ public const int tooltip_y_offset_touch = 2131165345;
static Dimension()
{
@@ -2528,461 +2528,443 @@
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+ // aapt resource value: 0x7F080006
+ public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
- // aapt resource value: 0x7f020001
- public const int abc_action_bar_item_background_material = 2130837505;
+ // aapt resource value: 0x7F080007
+ public const int abc_action_bar_item_background_material = 2131230727;
- // aapt resource value: 0x7f020002
- public const int abc_btn_borderless_material = 2130837506;
+ // aapt resource value: 0x7F080008
+ public const int abc_btn_borderless_material = 2131230728;
- // aapt resource value: 0x7f020003
- public const int abc_btn_check_material = 2130837507;
+ // aapt resource value: 0x7F080009
+ public const int abc_btn_check_material = 2131230729;
- // aapt resource value: 0x7f020004
- public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+ // aapt resource value: 0x7F08000A
+ public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
- // aapt resource value: 0x7f020005
- public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+ // aapt resource value: 0x7F08000B
+ public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
- // aapt resource value: 0x7f020006
- public const int abc_btn_colored_material = 2130837510;
+ // aapt resource value: 0x7F08000C
+ public const int abc_btn_colored_material = 2131230732;
- // aapt resource value: 0x7f020007
- public const int abc_btn_default_mtrl_shape = 2130837511;
+ // aapt resource value: 0x7F08000D
+ public const int abc_btn_default_mtrl_shape = 2131230733;
- // aapt resource value: 0x7f020008
- public const int abc_btn_radio_material = 2130837512;
+ // aapt resource value: 0x7F08000E
+ public const int abc_btn_radio_material = 2131230734;
- // aapt resource value: 0x7f020009
- public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+ // aapt resource value: 0x7F08000F
+ public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
- // aapt resource value: 0x7f02000a
- public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+ // aapt resource value: 0x7F080010
+ public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
- // aapt resource value: 0x7f02000b
- public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+ // aapt resource value: 0x7F080011
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
- // aapt resource value: 0x7f02000c
- public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+ // aapt resource value: 0x7F080012
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
- // aapt resource value: 0x7f02000d
- public const int abc_cab_background_internal_bg = 2130837517;
+ // aapt resource value: 0x7F080013
+ public const int abc_cab_background_internal_bg = 2131230739;
- // aapt resource value: 0x7f02000e
- public const int abc_cab_background_top_material = 2130837518;
+ // aapt resource value: 0x7F080014
+ public const int abc_cab_background_top_material = 2131230740;
- // aapt resource value: 0x7f02000f
- public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+ // aapt resource value: 0x7F080015
+ public const int abc_cab_background_top_mtrl_alpha = 2131230741;
- // aapt resource value: 0x7f020010
- public const int abc_control_background_material = 2130837520;
+ // aapt resource value: 0x7F080016
+ public const int abc_control_background_material = 2131230742;
- // aapt resource value: 0x7f020011
- public const int abc_dialog_material_background = 2130837521;
+ // aapt resource value: 0x7F080017
+ public const int abc_dialog_material_background = 2131230743;
- // aapt resource value: 0x7f020012
- public const int abc_edit_text_material = 2130837522;
+ // aapt resource value: 0x7F080018
+ public const int abc_edit_text_material = 2131230744;
- // aapt resource value: 0x7f020013
- public const int abc_ic_ab_back_material = 2130837523;
+ // aapt resource value: 0x7F080019
+ public const int abc_ic_ab_back_material = 2131230745;
- // aapt resource value: 0x7f020014
- public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+ // aapt resource value: 0x7F08001A
+ public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
- // aapt resource value: 0x7f020015
- public const int abc_ic_clear_material = 2130837525;
+ // aapt resource value: 0x7F08001B
+ public const int abc_ic_clear_material = 2131230747;
- // aapt resource value: 0x7f020016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+ // aapt resource value: 0x7F08001C
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
- // aapt resource value: 0x7f020017
- public const int abc_ic_go_search_api_material = 2130837527;
+ // aapt resource value: 0x7F08001D
+ public const int abc_ic_go_search_api_material = 2131230749;
- // aapt resource value: 0x7f020018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+ // aapt resource value: 0x7F08001E
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
- // aapt resource value: 0x7f020019
- public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+ // aapt resource value: 0x7F08001F
+ public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
- // aapt resource value: 0x7f02001a
- public const int abc_ic_menu_overflow_material = 2130837530;
+ // aapt resource value: 0x7F080020
+ public const int abc_ic_menu_overflow_material = 2131230752;
- // aapt resource value: 0x7f02001b
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+ // aapt resource value: 0x7F080021
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
- // aapt resource value: 0x7f02001c
- public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+ // aapt resource value: 0x7F080022
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
- // aapt resource value: 0x7f02001d
- public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+ // aapt resource value: 0x7F080023
+ public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
- // aapt resource value: 0x7f02001e
- public const int abc_ic_search_api_material = 2130837534;
+ // aapt resource value: 0x7F080024
+ public const int abc_ic_search_api_material = 2131230756;
- // aapt resource value: 0x7f02001f
- public const int abc_ic_star_black_16dp = 2130837535;
+ // aapt resource value: 0x7F080025
+ public const int abc_ic_star_black_16dp = 2131230757;
- // aapt resource value: 0x7f020020
- public const int abc_ic_star_black_36dp = 2130837536;
+ // aapt resource value: 0x7F080026
+ public const int abc_ic_star_black_36dp = 2131230758;
- // aapt resource value: 0x7f020021
- public const int abc_ic_star_black_48dp = 2130837537;
+ // aapt resource value: 0x7F080027
+ public const int abc_ic_star_black_48dp = 2131230759;
- // aapt resource value: 0x7f020022
- public const int abc_ic_star_half_black_16dp = 2130837538;
+ // aapt resource value: 0x7F080028
+ public const int abc_ic_star_half_black_16dp = 2131230760;
- // aapt resource value: 0x7f020023
- public const int abc_ic_star_half_black_36dp = 2130837539;
+ // aapt resource value: 0x7F080029
+ public const int abc_ic_star_half_black_36dp = 2131230761;
- // aapt resource value: 0x7f020024
- public const int abc_ic_star_half_black_48dp = 2130837540;
+ // aapt resource value: 0x7F08002A
+ public const int abc_ic_star_half_black_48dp = 2131230762;
- // aapt resource value: 0x7f020025
- public const int abc_ic_voice_search_api_material = 2130837541;
+ // aapt resource value: 0x7F08002B
+ public const int abc_ic_voice_search_api_material = 2131230763;
- // aapt resource value: 0x7f020026
- public const int abc_item_background_holo_dark = 2130837542;
+ // aapt resource value: 0x7F08002C
+ public const int abc_item_background_holo_dark = 2131230764;
- // aapt resource value: 0x7f020027
- public const int abc_item_background_holo_light = 2130837543;
+ // aapt resource value: 0x7F08002D
+ public const int abc_item_background_holo_light = 2131230765;
- // aapt resource value: 0x7f020028
- public const int abc_list_divider_mtrl_alpha = 2130837544;
+ // aapt resource value: 0x7F08002E
+ public const int abc_list_divider_mtrl_alpha = 2131230766;
- // aapt resource value: 0x7f020029
- public const int abc_list_focused_holo = 2130837545;
+ // aapt resource value: 0x7F08002F
+ public const int abc_list_focused_holo = 2131230767;
- // aapt resource value: 0x7f02002a
- public const int abc_list_longpressed_holo = 2130837546;
+ // aapt resource value: 0x7F080030
+ public const int abc_list_longpressed_holo = 2131230768;
- // aapt resource value: 0x7f02002b
- public const int abc_list_pressed_holo_dark = 2130837547;
+ // aapt resource value: 0x7F080031
+ public const int abc_list_pressed_holo_dark = 2131230769;
- // aapt resource value: 0x7f02002c
- public const int abc_list_pressed_holo_light = 2130837548;
+ // aapt resource value: 0x7F080032
+ public const int abc_list_pressed_holo_light = 2131230770;
- // aapt resource value: 0x7f02002d
- public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+ // aapt resource value: 0x7F080033
+ public const int abc_list_selector_background_transition_holo_dark = 2131230771;
- // aapt resource value: 0x7f02002e
- public const int abc_list_selector_background_transition_holo_light = 2130837550;
+ // aapt resource value: 0x7F080034
+ public const int abc_list_selector_background_transition_holo_light = 2131230772;
- // aapt resource value: 0x7f02002f
- public const int abc_list_selector_disabled_holo_dark = 2130837551;
+ // aapt resource value: 0x7F080035
+ public const int abc_list_selector_disabled_holo_dark = 2131230773;
- // aapt resource value: 0x7f020030
- public const int abc_list_selector_disabled_holo_light = 2130837552;
+ // aapt resource value: 0x7F080036
+ public const int abc_list_selector_disabled_holo_light = 2131230774;
- // aapt resource value: 0x7f020031
- public const int abc_list_selector_holo_dark = 2130837553;
+ // aapt resource value: 0x7F080037
+ public const int abc_list_selector_holo_dark = 2131230775;
- // aapt resource value: 0x7f020032
- public const int abc_list_selector_holo_light = 2130837554;
+ // aapt resource value: 0x7F080038
+ public const int abc_list_selector_holo_light = 2131230776;
- // aapt resource value: 0x7f020033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+ // aapt resource value: 0x7F080039
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
- // aapt resource value: 0x7f020034
- public const int abc_popup_background_mtrl_mult = 2130837556;
+ // aapt resource value: 0x7F08003A
+ public const int abc_popup_background_mtrl_mult = 2131230778;
- // aapt resource value: 0x7f020035
- public const int abc_ratingbar_indicator_material = 2130837557;
+ // aapt resource value: 0x7F08003B
+ public const int abc_ratingbar_indicator_material = 2131230779;
- // aapt resource value: 0x7f020036
- public const int abc_ratingbar_material = 2130837558;
+ // aapt resource value: 0x7F08003C
+ public const int abc_ratingbar_material = 2131230780;
- // aapt resource value: 0x7f020037
- public const int abc_ratingbar_small_material = 2130837559;
+ // aapt resource value: 0x7F08003D
+ public const int abc_ratingbar_small_material = 2131230781;
- // aapt resource value: 0x7f020038
- public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+ // aapt resource value: 0x7F08003E
+ public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
- // aapt resource value: 0x7f020039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+ // aapt resource value: 0x7F08003F
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
- // aapt resource value: 0x7f02003a
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+ // aapt resource value: 0x7F080040
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
- // aapt resource value: 0x7f02003b
- public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+ // aapt resource value: 0x7F080041
+ public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
- // aapt resource value: 0x7f02003c
- public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+ // aapt resource value: 0x7F080042
+ public const int abc_scrubber_track_mtrl_alpha = 2131230786;
- // aapt resource value: 0x7f02003d
- public const int abc_seekbar_thumb_material = 2130837565;
+ // aapt resource value: 0x7F080043
+ public const int abc_seekbar_thumb_material = 2131230787;
- // aapt resource value: 0x7f02003e
- public const int abc_seekbar_tick_mark_material = 2130837566;
+ // aapt resource value: 0x7F080044
+ public const int abc_seekbar_tick_mark_material = 2131230788;
- // aapt resource value: 0x7f02003f
- public const int abc_seekbar_track_material = 2130837567;
+ // aapt resource value: 0x7F080045
+ public const int abc_seekbar_track_material = 2131230789;
- // aapt resource value: 0x7f020040
- public const int abc_spinner_mtrl_am_alpha = 2130837568;
+ // aapt resource value: 0x7F080046
+ public const int abc_spinner_mtrl_am_alpha = 2131230790;
- // aapt resource value: 0x7f020041
- public const int abc_spinner_textfield_background_material = 2130837569;
+ // aapt resource value: 0x7F080047
+ public const int abc_spinner_textfield_background_material = 2131230791;
- // aapt resource value: 0x7f020042
- public const int abc_switch_thumb_material = 2130837570;
+ // aapt resource value: 0x7F080048
+ public const int abc_switch_thumb_material = 2131230792;
- // aapt resource value: 0x7f020043
- public const int abc_switch_track_mtrl_alpha = 2130837571;
+ // aapt resource value: 0x7F080049
+ public const int abc_switch_track_mtrl_alpha = 2131230793;
- // aapt resource value: 0x7f020044
- public const int abc_tab_indicator_material = 2130837572;
+ // aapt resource value: 0x7F08004A
+ public const int abc_tab_indicator_material = 2131230794;
- // aapt resource value: 0x7f020045
- public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+ // aapt resource value: 0x7F08004B
+ public const int abc_tab_indicator_mtrl_alpha = 2131230795;
- // aapt resource value: 0x7f020046
- public const int abc_text_cursor_material = 2130837574;
+ // aapt resource value: 0x7F080053
+ public const int abc_textfield_activated_mtrl_alpha = 2131230803;
- // aapt resource value: 0x7f020047
- public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+ // aapt resource value: 0x7F080054
+ public const int abc_textfield_default_mtrl_alpha = 2131230804;
- // aapt resource value: 0x7f020048
- public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+ // aapt resource value: 0x7F080055
+ public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
- // aapt resource value: 0x7f020049
- public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+ // aapt resource value: 0x7F080056
+ public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
- // aapt resource value: 0x7f02004a
- public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+ // aapt resource value: 0x7F080057
+ public const int abc_textfield_search_material = 2131230807;
- // aapt resource value: 0x7f02004b
- public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
-
- // aapt resource value: 0x7f02004c
- public const int abc_text_select_handle_right_mtrl_light = 2130837580;
-
- // aapt resource value: 0x7f02004d
- public const int abc_textfield_activated_mtrl_alpha = 2130837581;
-
- // aapt resource value: 0x7f02004e
- public const int abc_textfield_default_mtrl_alpha = 2130837582;
-
- // aapt resource value: 0x7f02004f
- public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
-
- // aapt resource value: 0x7f020050
- public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
-
- // aapt resource value: 0x7f020051
- public const int abc_textfield_search_material = 2130837585;
+ // aapt resource value: 0x7F08004C
+ public const int abc_text_cursor_material = 2131230796;
- // aapt resource value: 0x7f020052
- public const int abc_vector_test = 2130837586;
+ // aapt resource value: 0x7F08004D
+ public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
- // aapt resource value: 0x7f020053
- public const int avd_hide_password = 2130837587;
+ // aapt resource value: 0x7F08004E
+ public const int abc_text_select_handle_left_mtrl_light = 2131230798;
- // aapt resource value: 0x7f020092
- public const int avd_hide_password_1 = 2130837650;
+ // aapt resource value: 0x7F08004F
+ public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
- // aapt resource value: 0x7f020093
- public const int avd_hide_password_2 = 2130837651;
+ // aapt resource value: 0x7F080050
+ public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
- // aapt resource value: 0x7f020094
- public const int avd_hide_password_3 = 2130837652;
+ // aapt resource value: 0x7F080051
+ public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
- // aapt resource value: 0x7f020054
- public const int avd_show_password = 2130837588;
+ // aapt resource value: 0x7F080052
+ public const int abc_text_select_handle_right_mtrl_light = 2131230802;
- // aapt resource value: 0x7f020095
- public const int avd_show_password_1 = 2130837653;
+ // aapt resource value: 0x7F080058
+ public const int abc_vector_test = 2131230808;
- // aapt resource value: 0x7f020096
- public const int avd_show_password_2 = 2130837654;
+ // aapt resource value: 0x7F080059
+ public const int avd_hide_password = 2131230809;
- // aapt resource value: 0x7f020097
- public const int avd_show_password_3 = 2130837655;
+ // aapt resource value: 0x7F08005A
+ public const int avd_show_password = 2131230810;
- // aapt resource value: 0x7f020055
- public const int design_bottom_navigation_item_background = 2130837589;
+ // aapt resource value: 0x7F08005B
+ public const int design_bottom_navigation_item_background = 2131230811;
- // aapt resource value: 0x7f020056
- public const int design_fab_background = 2130837590;
+ // aapt resource value: 0x7F08005C
+ public const int design_fab_background = 2131230812;
- // aapt resource value: 0x7f020057
- public const int design_ic_visibility = 2130837591;
+ // aapt resource value: 0x7F08005D
+ public const int design_ic_visibility = 2131230813;
- // aapt resource value: 0x7f020058
- public const int design_ic_visibility_off = 2130837592;
+ // aapt resource value: 0x7F08005E
+ public const int design_ic_visibility_off = 2131230814;
- // aapt resource value: 0x7f020059
- public const int design_password_eye = 2130837593;
+ // aapt resource value: 0x7F08005F
+ public const int design_password_eye = 2131230815;
- // aapt resource value: 0x7f02005a
- public const int design_snackbar_background = 2130837594;
+ // aapt resource value: 0x7F080060
+ public const int design_snackbar_background = 2131230816;
- // aapt resource value: 0x7f02005b
- public const int fingerprint_draw_off = 2130837595;
+ // aapt resource value: 0x7F080061
+ public const int fingerprint_draw_off = 2131230817;
- // aapt resource value: 0x7f02005c
- public const int fingerprint_draw_off_animation = 2130837596;
+ // aapt resource value: 0x7F080062
+ public const int fingerprint_draw_off_animation = 2131230818;
- // aapt resource value: 0x7f02005d
- public const int fingerprint_draw_on = 2130837597;
+ // aapt resource value: 0x7F080063
+ public const int fingerprint_draw_on = 2131230819;
- // aapt resource value: 0x7f02005e
- public const int fingerprint_draw_on_animation = 2130837598;
+ // aapt resource value: 0x7F080064
+ public const int fingerprint_draw_on_animation = 2131230820;
- // aapt resource value: 0x7f02005f
- public const int fingerprint_error = 2130837599;
+ // aapt resource value: 0x7F080065
+ public const int fingerprint_error = 2131230821;
- // aapt resource value: 0x7f020060
- public const int fingerprint_error_off = 2130837600;
+ // aapt resource value: 0x7F080066
+ public const int fingerprint_error_off = 2131230822;
- // aapt resource value: 0x7f020061
- public const int fingerprint_error_off_animation = 2130837601;
+ // aapt resource value: 0x7F080067
+ public const int fingerprint_error_off_animation = 2131230823;
- // aapt resource value: 0x7f020062
- public const int fingerprint_error_on = 2130837602;
+ // aapt resource value: 0x7F080068
+ public const int fingerprint_error_on = 2131230824;
- // aapt resource value: 0x7f020063
- public const int fingerprint_error_on_animation = 2130837603;
+ // aapt resource value: 0x7F080069
+ public const int fingerprint_error_on_animation = 2131230825;
- // aapt resource value: 0x7f020064
- public const int fingerprint_error_state_to_fp = 2130837604;
+ // aapt resource value: 0x7F08006A
+ public const int fingerprint_error_state_to_fp = 2131230826;
- // aapt resource value: 0x7f020065
- public const int fingerprint_error_state_to_fp_animation = 2130837605;
+ // aapt resource value: 0x7F08006B
+ public const int fingerprint_error_state_to_fp_animation = 2131230827;
- // aapt resource value: 0x7f020066
- public const int fingerprint_fingerprint = 2130837606;
+ // aapt resource value: 0x7F08006C
+ public const int fingerprint_fingerprint = 2131230828;
- // aapt resource value: 0x7f020067
- public const int fingerprint_fp_to_error_state = 2130837607;
+ // aapt resource value: 0x7F08006D
+ public const int fingerprint_fp_to_error_state = 2131230829;
- // aapt resource value: 0x7f020068
- public const int fingerprint_fp_to_error_state_animation = 2130837608;
+ // aapt resource value: 0x7F08006E
+ public const int fingerprint_fp_to_error_state_animation = 2131230830;
- // aapt resource value: 0x7f020069
- public const int gd_btn_shape_app_b = 2130837609;
+ // aapt resource value: 0x7F08006F
+ public const int gd_btn_shape_app_b = 2131230831;
- // aapt resource value: 0x7f02006a
- public const int gd_btn_shape_app_g = 2130837610;
+ // aapt resource value: 0x7F080070
+ public const int gd_btn_shape_app_g = 2131230832;
- // aapt resource value: 0x7f02006b
- public const int gd_btn_shape_app_w = 2130837611;
+ // aapt resource value: 0x7F080071
+ public const int gd_btn_shape_app_w = 2131230833;
- // aapt resource value: 0x7f02006c
- public const int gd_btn_shape_shadow_w = 2130837612;
+ // aapt resource value: 0x7F080072
+ public const int gd_btn_shape_shadow_w = 2131230834;
- // aapt resource value: 0x7f02006d
- public const int gd_click_effect_select = 2130837613;
+ // aapt resource value: 0x7F080073
+ public const int gd_click_effect_select = 2131230835;
- // aapt resource value: 0x7f02006e
- public const int ic_gdmap_add = 2130837614;
+ // aapt resource value: 0x7F080086
+ public const int Icon = 2131230854;
- // aapt resource value: 0x7f02006f
- public const int ic_gdmap_back = 2130837615;
+ // aapt resource value: 0x7F080074
+ public const int ic_gdmap_add = 2131230836;
- // aapt resource value: 0x7f020070
- public const int ic_gdmap_delete = 2130837616;
+ // aapt resource value: 0x7F080075
+ public const int ic_gdmap_back = 2131230837;
- // aapt resource value: 0x7f020071
- public const int ic_gdmap_home = 2130837617;
+ // aapt resource value: 0x7F080076
+ public const int ic_gdmap_delete = 2131230838;
- // aapt resource value: 0x7f020072
- public const int ic_gdmap_mylocation = 2130837618;
+ // aapt resource value: 0x7F080077
+ public const int ic_gdmap_home = 2131230839;
- // aapt resource value: 0x7f020073
- public const int ic_gdmap_now = 2130837619;
+ // aapt resource value: 0x7F080078
+ public const int ic_gdmap_mylocation = 2131230840;
- // aapt resource value: 0x7f020074
- public const int ic_gdmap_search = 2130837620;
+ // aapt resource value: 0x7F080079
+ public const int ic_gdmap_now = 2131230841;
- // aapt resource value: 0x7f020075
- public const int ic_gdmap_zoom_out = 2130837621;
+ // aapt resource value: 0x7F08007A
+ public const int ic_gdmap_search = 2131230842;
- // aapt resource value: 0x7f020076
- public const int ic_gps_point = 2130837622;
+ // aapt resource value: 0x7F08007B
+ public const int ic_gdmap_zoom_out = 2131230843;
- // aapt resource value: 0x7f020077
- public const int ic_wd_arc_scale_bg = 2130837623;
+ // aapt resource value: 0x7F08007C
+ public const int ic_gps_point = 2131230844;
- // aapt resource value: 0x7f020078
- public const int ic_wd_curtain_bg_top = 2130837624;
+ // aapt resource value: 0x7F08007D
+ public const int ic_wd_arc_scale_bg = 2131230845;
- // aapt resource value: 0x7f020079
- public const int ic_wd_curtain_h_bg = 2130837625;
+ // aapt resource value: 0x7F08007E
+ public const int ic_wd_curtain_bg_top = 2131230846;
- // aapt resource value: 0x7f02007a
- public const int ic_wd_curtain_h_open = 2130837626;
+ // aapt resource value: 0x7F08007F
+ public const int ic_wd_curtain_h_bg = 2131230847;
- // aapt resource value: 0x7f02007b
- public const int ic_wd_curtain_h_progress = 2130837627;
+ // aapt resource value: 0x7F080080
+ public const int ic_wd_curtain_h_open = 2131230848;
- // aapt resource value: 0x7f02007c
- public const int ic_wd_curtain_h_top = 2130837628;
+ // aapt resource value: 0x7F080081
+ public const int ic_wd_curtain_h_progress = 2131230849;
- // aapt resource value: 0x7f02007d
- public const int ic_wd_curtain_open = 2130837629;
+ // aapt resource value: 0x7F080082
+ public const int ic_wd_curtain_h_top = 2131230850;
- // aapt resource value: 0x7f02007e
- public const int ic_wd_curtain_roll_bg = 2130837630;
+ // aapt resource value: 0x7F080083
+ public const int ic_wd_curtain_open = 2131230851;
- // aapt resource value: 0x7f02007f
- public const int ic_wd_curtain_roll_progress = 2130837631;
+ // aapt resource value: 0x7F080084
+ public const int ic_wd_curtain_roll_bg = 2131230852;
- // aapt resource value: 0x7f020080
- public const int Icon = 2130837632;
+ // aapt resource value: 0x7F080085
+ public const int ic_wd_curtain_roll_progress = 2131230853;
- // aapt resource value: 0x7f020081
- public const int Loading = 2130837633;
+ // aapt resource value: 0x7F080087
+ public const int Loading = 2131230855;
- // aapt resource value: 0x7f020082
- public const int navigation_empty_icon = 2130837634;
+ // aapt resource value: 0x7F080088
+ public const int navigation_empty_icon = 2131230856;
- // aapt resource value: 0x7f020083
- public const int notification_action_background = 2130837635;
+ // aapt resource value: 0x7F080089
+ public const int notification_action_background = 2131230857;
- // aapt resource value: 0x7f020084
- public const int notification_bg = 2130837636;
+ // aapt resource value: 0x7F08008A
+ public const int notification_bg = 2131230858;
- // aapt resource value: 0x7f020085
- public const int notification_bg_low = 2130837637;
+ // aapt resource value: 0x7F08008B
+ public const int notification_bg_low = 2131230859;
- // aapt resource value: 0x7f020086
- public const int notification_bg_low_normal = 2130837638;
+ // aapt resource value: 0x7F08008C
+ public const int notification_bg_low_normal = 2131230860;
- // aapt resource value: 0x7f020087
- public const int notification_bg_low_pressed = 2130837639;
+ // aapt resource value: 0x7F08008D
+ public const int notification_bg_low_pressed = 2131230861;
- // aapt resource value: 0x7f020088
- public const int notification_bg_normal = 2130837640;
+ // aapt resource value: 0x7F08008E
+ public const int notification_bg_normal = 2131230862;
- // aapt resource value: 0x7f020089
- public const int notification_bg_normal_pressed = 2130837641;
+ // aapt resource value: 0x7F08008F
+ public const int notification_bg_normal_pressed = 2131230863;
- // aapt resource value: 0x7f02008a
- public const int notification_icon_background = 2130837642;
+ // aapt resource value: 0x7F080090
+ public const int notification_icon_background = 2131230864;
- // aapt resource value: 0x7f020090
- public const int notification_template_icon_bg = 2130837648;
+ // aapt resource value: 0x7F080091
+ public const int notification_template_icon_bg = 2131230865;
- // aapt resource value: 0x7f020091
- public const int notification_template_icon_low_bg = 2130837649;
+ // aapt resource value: 0x7F080092
+ public const int notification_template_icon_low_bg = 2131230866;
- // aapt resource value: 0x7f02008b
- public const int notification_tile_bg = 2130837643;
+ // aapt resource value: 0x7F080093
+ public const int notification_tile_bg = 2131230867;
- // aapt resource value: 0x7f02008c
- public const int notify_panel_notification_icon_bg = 2130837644;
+ // aapt resource value: 0x7F080094
+ public const int notify_panel_notification_icon_bg = 2131230868;
- // aapt resource value: 0x7f02008d
- public const int selector_pickerview_btn = 2130837645;
+ // aapt resource value: 0x7F080095
+ public const int selector_pickerview_btn = 2131230869;
- // aapt resource value: 0x7f02008e
- public const int tooltip_frame_dark = 2130837646;
+ // aapt resource value: 0x7F080096
+ public const int tooltip_frame_dark = 2131230870;
- // aapt resource value: 0x7f02008f
- public const int tooltip_frame_light = 2130837647;
+ // aapt resource value: 0x7F080097
+ public const int tooltip_frame_light = 2131230871;
static Drawable()
{
@@ -2997,665 +2979,665 @@
public partial class Id
{
- // aapt resource value: 0x7f090027
- public const int ALT = 2131296295;
+ // aapt resource value: 0x7F09000E
+ public const int action0 = 2131296270;
- // aapt resource value: 0x7f090028
- public const int CTRL = 2131296296;
+ // aapt resource value: 0x7F090020
+ public const int actions = 2131296288;
- // aapt resource value: 0x7f090054
- public const int FILL = 2131296340;
+ // aapt resource value: 0x7F09000F
+ public const int action_bar = 2131296271;
- // aapt resource value: 0x7f090055
- public const int FILL_STROKE = 2131296341;
+ // aapt resource value: 0x7F090010
+ public const int action_bar_activity_content = 2131296272;
- // aapt resource value: 0x7f090029
- public const int FUNCTION = 2131296297;
+ // aapt resource value: 0x7F090011
+ public const int action_bar_container = 2131296273;
- // aapt resource value: 0x7f09004f
- public const int FixedBehind = 2131296335;
+ // aapt resource value: 0x7F090012
+ public const int action_bar_root = 2131296274;
- // aapt resource value: 0x7f090050
- public const int FixedFront = 2131296336;
+ // aapt resource value: 0x7F090013
+ public const int action_bar_spinner = 2131296275;
- // aapt resource value: 0x7f09002a
- public const int META = 2131296298;
+ // aapt resource value: 0x7F090014
+ public const int action_bar_subtitle = 2131296276;
- // aapt resource value: 0x7f090051
- public const int MatchLayout = 2131296337;
+ // aapt resource value: 0x7F090015
+ public const int action_bar_title = 2131296277;
- // aapt resource value: 0x7f09002b
- public const int SHIFT = 2131296299;
+ // aapt resource value: 0x7F090016
+ public const int action_container = 2131296278;
- // aapt resource value: 0x7f090056
- public const int STROKE = 2131296342;
+ // aapt resource value: 0x7F090017
+ public const int action_context_bar = 2131296279;
- // aapt resource value: 0x7f09002c
- public const int SYM = 2131296300;
+ // aapt resource value: 0x7F090018
+ public const int action_divider = 2131296280;
- // aapt resource value: 0x7f090052
- public const int Scale = 2131296338;
+ // aapt resource value: 0x7F090019
+ public const int action_image = 2131296281;
- // aapt resource value: 0x7f090053
- public const int Translate = 2131296339;
+ // aapt resource value: 0x7F09001A
+ public const int action_menu_divider = 2131296282;
- // aapt resource value: 0x7f0900c0
- public const int action0 = 2131296448;
+ // aapt resource value: 0x7F09001B
+ public const int action_menu_presenter = 2131296283;
- // aapt resource value: 0x7f090079
- public const int action_bar = 2131296377;
+ // aapt resource value: 0x7F09001C
+ public const int action_mode_bar = 2131296284;
- // aapt resource value: 0x7f090001
- public const int action_bar_activity_content = 2131296257;
+ // aapt resource value: 0x7F09001D
+ public const int action_mode_bar_stub = 2131296285;
- // aapt resource value: 0x7f090078
- public const int action_bar_container = 2131296376;
+ // aapt resource value: 0x7F09001E
+ public const int action_mode_close_button = 2131296286;
- // aapt resource value: 0x7f090074
- public const int action_bar_root = 2131296372;
+ // aapt resource value: 0x7F09001F
+ public const int action_text = 2131296287;
- // aapt resource value: 0x7f090002
- public const int action_bar_spinner = 2131296258;
+ // aapt resource value: 0x7F090021
+ public const int activity_chooser_view_content = 2131296289;
- // aapt resource value: 0x7f090058
- public const int action_bar_subtitle = 2131296344;
+ // aapt resource value: 0x7F090022
+ public const int add = 2131296290;
- // aapt resource value: 0x7f090057
- public const int action_bar_title = 2131296343;
+ // aapt resource value: 0x7F090023
+ public const int alertTitle = 2131296291;
- // aapt resource value: 0x7f0900bd
- public const int action_container = 2131296445;
+ // aapt resource value: 0x7F090024
+ public const int all = 2131296292;
- // aapt resource value: 0x7f09007a
- public const int action_context_bar = 2131296378;
+ // aapt resource value: 0x7F090000
+ public const int ALT = 2131296256;
- // aapt resource value: 0x7f0900c4
- public const int action_divider = 2131296452;
+ // aapt resource value: 0x7F090025
+ public const int always = 2131296293;
- // aapt resource value: 0x7f0900be
- public const int action_image = 2131296446;
+ // aapt resource value: 0x7F090026
+ public const int async = 2131296294;
- // aapt resource value: 0x7f090003
- public const int action_menu_divider = 2131296259;
+ // aapt resource value: 0x7F090027
+ public const int auto = 2131296295;
- // aapt resource value: 0x7f090004
- public const int action_menu_presenter = 2131296260;
+ // aapt resource value: 0x7F090028
+ public const int beginning = 2131296296;
- // aapt resource value: 0x7f090076
- public const int action_mode_bar = 2131296374;
+ // aapt resource value: 0x7F090029
+ public const int blocking = 2131296297;
- // aapt resource value: 0x7f090075
- public const int action_mode_bar_stub = 2131296373;
+ // aapt resource value: 0x7F09002A
+ public const int bottom = 2131296298;
- // aapt resource value: 0x7f090059
- public const int action_mode_close_button = 2131296345;
+ // aapt resource value: 0x7F09002B
+ public const int btnCancel = 2131296299;
- // aapt resource value: 0x7f0900bf
- public const int action_text = 2131296447;
+ // aapt resource value: 0x7F09002C
+ public const int btnSubmit = 2131296300;
- // aapt resource value: 0x7f0900cd
- public const int actions = 2131296461;
+ // aapt resource value: 0x7F09002D
+ public const int buttonPanel = 2131296301;
- // aapt resource value: 0x7f09005a
- public const int activity_chooser_view_content = 2131296346;
+ // aapt resource value: 0x7F09002E
+ public const int cancel_action = 2131296302;
- // aapt resource value: 0x7f090021
- public const int add = 2131296289;
+ // aapt resource value: 0x7F09002F
+ public const int center = 2131296303;
- // aapt resource value: 0x7f09006d
- public const int alertTitle = 2131296365;
+ // aapt resource value: 0x7F090030
+ public const int center_horizontal = 2131296304;
- // aapt resource value: 0x7f090047
- public const int all = 2131296327;
+ // aapt resource value: 0x7F090031
+ public const int center_vertical = 2131296305;
- // aapt resource value: 0x7f09002d
- public const int always = 2131296301;
+ // aapt resource value: 0x7F090032
+ public const int checkbox = 2131296306;
- // aapt resource value: 0x7f09004b
- public const int async = 2131296331;
+ // aapt resource value: 0x7F090033
+ public const int chronometer = 2131296307;
- // aapt resource value: 0x7f090039
- public const int auto = 2131296313;
+ // aapt resource value: 0x7F090034
+ public const int clip_horizontal = 2131296308;
- // aapt resource value: 0x7f090024
- public const int beginning = 2131296292;
+ // aapt resource value: 0x7F090035
+ public const int clip_vertical = 2131296309;
- // aapt resource value: 0x7f09004c
- public const int blocking = 2131296332;
+ // aapt resource value: 0x7F090036
+ public const int collapseActionView = 2131296310;
- // aapt resource value: 0x7f090032
- public const int bottom = 2131296306;
+ // aapt resource value: 0x7F090037
+ public const int container = 2131296311;
- // aapt resource value: 0x7f0900a8
- public const int btnCancel = 2131296424;
+ // aapt resource value: 0x7F090038
+ public const int contentFrame = 2131296312;
- // aapt resource value: 0x7f0900aa
- public const int btnSubmit = 2131296426;
+ // aapt resource value: 0x7F090039
+ public const int contentPanel = 2131296313;
- // aapt resource value: 0x7f090060
- public const int buttonPanel = 2131296352;
+ // aapt resource value: 0x7F09003A
+ public const int content_container = 2131296314;
- // aapt resource value: 0x7f0900c1
- public const int cancel_action = 2131296449;
+ // aapt resource value: 0x7F09003B
+ public const int coordinator = 2131296315;
- // aapt resource value: 0x7f09003a
- public const int center = 2131296314;
+ // aapt resource value: 0x7F090001
+ public const int CTRL = 2131296257;
- // aapt resource value: 0x7f09003b
- public const int center_horizontal = 2131296315;
+ // aapt resource value: 0x7F09003C
+ public const int custom = 2131296316;
- // aapt resource value: 0x7f09003c
- public const int center_vertical = 2131296316;
+ // aapt resource value: 0x7F09003D
+ public const int customPanel = 2131296317;
- // aapt resource value: 0x7f090070
- public const int checkbox = 2131296368;
+ // aapt resource value: 0x7F09003E
+ public const int day = 2131296318;
- // aapt resource value: 0x7f0900c9
- public const int chronometer = 2131296457;
+ // aapt resource value: 0x7F09003F
+ public const int decor_content_parent = 2131296319;
- // aapt resource value: 0x7f090043
- public const int clip_horizontal = 2131296323;
+ // aapt resource value: 0x7F090040
+ public const int default_activity_button = 2131296320;
- // aapt resource value: 0x7f090044
- public const int clip_vertical = 2131296324;
+ // aapt resource value: 0x7F090041
+ public const int description = 2131296321;
- // aapt resource value: 0x7f09002e
- public const int collapseActionView = 2131296302;
+ // aapt resource value: 0x7F090042
+ public const int design_bottom_sheet = 2131296322;
- // aapt resource value: 0x7f09008e
- public const int container = 2131296398;
+ // aapt resource value: 0x7F090043
+ public const int design_menu_item_action_area = 2131296323;
- // aapt resource value: 0x7f0900d9
- public const int contentFrame = 2131296473;
+ // aapt resource value: 0x7F090044
+ public const int design_menu_item_action_area_stub = 2131296324;
- // aapt resource value: 0x7f090063
- public const int contentPanel = 2131296355;
+ // aapt resource value: 0x7F090045
+ public const int design_menu_item_text = 2131296325;
- // aapt resource value: 0x7f0900ac
- public const int content_container = 2131296428;
+ // aapt resource value: 0x7F090046
+ public const int design_navigation_view = 2131296326;
- // aapt resource value: 0x7f09008f
- public const int coordinator = 2131296399;
+ // aapt resource value: 0x7F090047
+ public const int disableHome = 2131296327;
- // aapt resource value: 0x7f09006a
- public const int custom = 2131296362;
+ // aapt resource value: 0x7F090048
+ public const int edit_query = 2131296328;
- // aapt resource value: 0x7f090069
- public const int customPanel = 2131296361;
+ // aapt resource value: 0x7F090049
+ public const int end = 2131296329;
- // aapt resource value: 0x7f0900b8
- public const int day = 2131296440;
+ // aapt resource value: 0x7F09004A
+ public const int end_padder = 2131296330;
- // aapt resource value: 0x7f090077
- public const int decor_content_parent = 2131296375;
+ // aapt resource value: 0x7F09004B
+ public const int enterAlways = 2131296331;
- // aapt resource value: 0x7f09005d
- public const int default_activity_button = 2131296349;
+ // aapt resource value: 0x7F09004C
+ public const int enterAlwaysCollapsed = 2131296332;
- // aapt resource value: 0x7f090089
- public const int description = 2131296393;
+ // aapt resource value: 0x7F09004D
+ public const int exitUntilCollapsed = 2131296333;
- // aapt resource value: 0x7f090091
- public const int design_bottom_sheet = 2131296401;
+ // aapt resource value: 0x7F09004F
+ public const int expanded_menu = 2131296335;
- // aapt resource value: 0x7f090098
- public const int design_menu_item_action_area = 2131296408;
+ // aapt resource value: 0x7F09004E
+ public const int expand_activities_button = 2131296334;
- // aapt resource value: 0x7f090097
- public const int design_menu_item_action_area_stub = 2131296407;
+ // aapt resource value: 0x7F090050
+ public const int fill = 2131296336;
- // aapt resource value: 0x7f090096
- public const int design_menu_item_text = 2131296406;
+ // aapt resource value: 0x7F090002
+ public const int FILL = 2131296258;
- // aapt resource value: 0x7f090095
- public const int design_navigation_view = 2131296405;
+ // aapt resource value: 0x7F090051
+ public const int fill_horizontal = 2131296337;
- // aapt resource value: 0x7f090015
- public const int disableHome = 2131296277;
+ // aapt resource value: 0x7F090003
+ public const int FILL_STROKE = 2131296259;
- // aapt resource value: 0x7f09007b
- public const int edit_query = 2131296379;
+ // aapt resource value: 0x7F090052
+ public const int fill_vertical = 2131296338;
- // aapt resource value: 0x7f090025
- public const int end = 2131296293;
+ // aapt resource value: 0x7F090053
+ public const int fingerprint_icon = 2131296339;
- // aapt resource value: 0x7f0900cf
- public const int end_padder = 2131296463;
+ // aapt resource value: 0x7F090054
+ public const int @fixed = 2131296340;
- // aapt resource value: 0x7f090034
- public const int enterAlways = 2131296308;
+ // aapt resource value: 0x7F090005
+ public const int FixedBehind = 2131296261;
- // aapt resource value: 0x7f090035
- public const int enterAlwaysCollapsed = 2131296309;
+ // aapt resource value: 0x7F090006
+ public const int FixedFront = 2131296262;
- // aapt resource value: 0x7f090036
- public const int exitUntilCollapsed = 2131296310;
+ // aapt resource value: 0x7F090055
+ public const int forever = 2131296341;
- // aapt resource value: 0x7f09005b
- public const int expand_activities_button = 2131296347;
+ // aapt resource value: 0x7F090004
+ public const int FUNCTION = 2131296260;
- // aapt resource value: 0x7f09006f
- public const int expanded_menu = 2131296367;
+ // aapt resource value: 0x7F090056
+ public const int gd_btn_back = 2131296342;
- // aapt resource value: 0x7f090045
- public const int fill = 2131296325;
+ // aapt resource value: 0x7F090057
+ public const int gd_btn_myLocation = 2131296343;
- // aapt resource value: 0x7f090046
- public const int fill_horizontal = 2131296326;
+ // aapt resource value: 0x7F090058
+ public const int gd_btn_save = 2131296344;
- // aapt resource value: 0x7f09003d
- public const int fill_vertical = 2131296317;
+ // aapt resource value: 0x7F090059
+ public const int gd_img_search_delete = 2131296345;
- // aapt resource value: 0x7f09008a
- public const int fingerprint_icon = 2131296394;
+ // aapt resource value: 0x7F09005A
+ public const int gd_ll_myhome = 2131296346;
- // aapt resource value: 0x7f090049
- public const int @fixed = 2131296329;
+ // aapt resource value: 0x7F09005B
+ public const int gd_ll_search = 2131296347;
- // aapt resource value: 0x7f09004d
- public const int forever = 2131296333;
+ // aapt resource value: 0x7F09005C
+ public const int gd_mapView = 2131296348;
- // aapt resource value: 0x7f09009d
- public const int gd_btn_back = 2131296413;
+ // aapt resource value: 0x7F09005D
+ public const int gd_rl_topview = 2131296349;
- // aapt resource value: 0x7f0900a6
- public const int gd_btn_myLocation = 2131296422;
+ // aapt resource value: 0x7F09005E
+ public const int gd_tv_activity_title = 2131296350;
- // aapt resource value: 0x7f0900a5
- public const int gd_btn_save = 2131296421;
+ // aapt resource value: 0x7F09005F
+ public const int gd_tv_radius = 2131296351;
- // aapt resource value: 0x7f0900a2
- public const int gd_img_search_delete = 2131296418;
+ // aapt resource value: 0x7F090060
+ public const int gd_tv_search_title = 2131296352;
- // aapt resource value: 0x7f0900a4
- public const int gd_ll_myhome = 2131296420;
+ // aapt resource value: 0x7F090061
+ public const int hdl_gallery_rootView = 2131296353;
- // aapt resource value: 0x7f0900a0
- public const int gd_ll_search = 2131296416;
+ // aapt resource value: 0x7F090062
+ public const int hdl_gallery_viewPager = 2131296354;
- // aapt resource value: 0x7f09009f
- public const int gd_mapView = 2131296415;
+ // aapt resource value: 0x7F090063
+ public const int hdl_options1 = 2131296355;
- // aapt resource value: 0x7f09009c
- public const int gd_rl_topview = 2131296412;
+ // aapt resource value: 0x7F090064
+ public const int hdl_options2 = 2131296356;
- // aapt resource value: 0x7f09009e
- public const int gd_tv_activity_title = 2131296414;
+ // aapt resource value: 0x7F090065
+ public const int hdl_options3 = 2131296357;
- // aapt resource value: 0x7f0900a3
- public const int gd_tv_radius = 2131296419;
+ // aapt resource value: 0x7F090066
+ public const int hdl_pickerview_ll = 2131296358;
- // aapt resource value: 0x7f0900a1
- public const int gd_tv_search_title = 2131296417;
+ // aapt resource value: 0x7F090067
+ public const int home = 2131296359;
- // aapt resource value: 0x7f09009a
- public const int hdl_gallery_rootView = 2131296410;
+ // aapt resource value: 0x7F090068
+ public const int homeAsUp = 2131296360;
- // aapt resource value: 0x7f09009b
- public const int hdl_gallery_viewPager = 2131296411;
+ // aapt resource value: 0x7F090069
+ public const int hour = 2131296361;
- // aapt resource value: 0x7f0900ae
- public const int hdl_options1 = 2131296430;
+ // aapt resource value: 0x7F09006A
+ public const int icon = 2131296362;
- // aapt resource value: 0x7f0900af
- public const int hdl_options2 = 2131296431;
-
- // aapt resource value: 0x7f0900b0
- public const int hdl_options3 = 2131296432;
+ // aapt resource value: 0x7F09006B
+ public const int icon_group = 2131296363;
- // aapt resource value: 0x7f0900ad
- public const int hdl_pickerview_ll = 2131296429;
+ // aapt resource value: 0x7F09006C
+ public const int ifRoom = 2131296364;
- // aapt resource value: 0x7f090005
- public const int home = 2131296261;
+ // aapt resource value: 0x7F09006D
+ public const int image = 2131296365;
- // aapt resource value: 0x7f090016
- public const int homeAsUp = 2131296278;
+ // aapt resource value: 0x7F09006E
+ public const int info = 2131296366;
- // aapt resource value: 0x7f0900b9
- public const int hour = 2131296441;
+ // aapt resource value: 0x7F09006F
+ public const int italic = 2131296367;
- // aapt resource value: 0x7f09005f
- public const int icon = 2131296351;
+ // aapt resource value: 0x7F090070
+ public const int item_touch_helper_previous_elevation = 2131296368;
- // aapt resource value: 0x7f0900ce
- public const int icon_group = 2131296462;
+ // aapt resource value: 0x7F090071
+ public const int largeLabel = 2131296369;
- // aapt resource value: 0x7f09002f
- public const int ifRoom = 2131296303;
+ // aapt resource value: 0x7F090072
+ public const int left = 2131296370;
- // aapt resource value: 0x7f09005c
- public const int image = 2131296348;
+ // aapt resource value: 0x7F090073
+ public const int line1 = 2131296371;
- // aapt resource value: 0x7f0900ca
- public const int info = 2131296458;
+ // aapt resource value: 0x7F090074
+ public const int line3 = 2131296372;
- // aapt resource value: 0x7f09004e
- public const int italic = 2131296334;
+ // aapt resource value: 0x7F090075
+ public const int listMode = 2131296373;
- // aapt resource value: 0x7f090000
- public const int item_touch_helper_previous_elevation = 2131296256;
+ // aapt resource value: 0x7F090076
+ public const int list_item = 2131296374;
- // aapt resource value: 0x7f09008d
- public const int largeLabel = 2131296397;
+ // aapt resource value: 0x7F090077
+ public const int masked = 2131296375;
- // aapt resource value: 0x7f09003e
- public const int left = 2131296318;
+ // aapt resource value: 0x7F090008
+ public const int MatchLayout = 2131296264;
- // aapt resource value: 0x7f09000d
- public const int line1 = 2131296269;
+ // aapt resource value: 0x7F090078
+ public const int media_actions = 2131296376;
- // aapt resource value: 0x7f09000e
- public const int line3 = 2131296270;
+ // aapt resource value: 0x7F090079
+ public const int message = 2131296377;
- // aapt resource value: 0x7f090012
- public const int listMode = 2131296274;
+ // aapt resource value: 0x7F090007
+ public const int META = 2131296263;
- // aapt resource value: 0x7f09005e
- public const int list_item = 2131296350;
+ // aapt resource value: 0x7F09007A
+ public const int middle = 2131296378;
- // aapt resource value: 0x7f0900db
- public const int masked = 2131296475;
+ // aapt resource value: 0x7F09007B
+ public const int min = 2131296379;
- // aapt resource value: 0x7f0900c3
- public const int media_actions = 2131296451;
+ // aapt resource value: 0x7F09007C
+ public const int mini = 2131296380;
- // aapt resource value: 0x7f0900d5
- public const int message = 2131296469;
+ // aapt resource value: 0x7F09007D
+ public const int month = 2131296381;
- // aapt resource value: 0x7f090026
- public const int middle = 2131296294;
+ // aapt resource value: 0x7F09007E
+ public const int multiply = 2131296382;
- // aapt resource value: 0x7f0900ba
- public const int min = 2131296442;
+ // aapt resource value: 0x7F09007F
+ public const int myButton = 2131296383;
- // aapt resource value: 0x7f090048
- public const int mini = 2131296328;
+ // aapt resource value: 0x7F090080
+ public const int navigation_header_container = 2131296384;
- // aapt resource value: 0x7f0900b7
- public const int month = 2131296439;
+ // aapt resource value: 0x7F090081
+ public const int never = 2131296385;
- // aapt resource value: 0x7f09001c
- public const int multiply = 2131296284;
+ // aapt resource value: 0x7F090082
+ public const int none = 2131296386;
- // aapt resource value: 0x7f0900bc
- public const int myButton = 2131296444;
+ // aapt resource value: 0x7F090083
+ public const int normal = 2131296387;
- // aapt resource value: 0x7f090094
- public const int navigation_header_container = 2131296404;
+ // aapt resource value: 0x7F090084
+ public const int notification_background = 2131296388;
- // aapt resource value: 0x7f090030
- public const int never = 2131296304;
+ // aapt resource value: 0x7F090085
+ public const int notification_main_column = 2131296389;
- // aapt resource value: 0x7f090017
- public const int none = 2131296279;
+ // aapt resource value: 0x7F090086
+ public const int notification_main_column_container = 2131296390;
- // aapt resource value: 0x7f090013
- public const int normal = 2131296275;
+ // aapt resource value: 0x7F090087
+ public const int options1 = 2131296391;
- // aapt resource value: 0x7f0900cc
- public const int notification_background = 2131296460;
+ // aapt resource value: 0x7F090088
+ public const int options2 = 2131296392;
- // aapt resource value: 0x7f0900c6
- public const int notification_main_column = 2131296454;
+ // aapt resource value: 0x7F090089
+ public const int options3 = 2131296393;
- // aapt resource value: 0x7f0900c5
- public const int notification_main_column_container = 2131296453;
+ // aapt resource value: 0x7F09008A
+ public const int optionspicker = 2131296394;
- // aapt resource value: 0x7f0900b2
- public const int options1 = 2131296434;
+ // aapt resource value: 0x7F09008B
+ public const int outmost_container = 2131296395;
- // aapt resource value: 0x7f0900b3
- public const int options2 = 2131296435;
+ // aapt resource value: 0x7F09008C
+ public const int parallax = 2131296396;
- // aapt resource value: 0x7f0900b4
- public const int options3 = 2131296436;
+ // aapt resource value: 0x7F09008D
+ public const int parentPanel = 2131296397;
- // aapt resource value: 0x7f0900b1
- public const int optionspicker = 2131296433;
+ // aapt resource value: 0x7F09008E
+ public const int pin = 2131296398;
- // aapt resource value: 0x7f0900ab
- public const int outmost_container = 2131296427;
+ // aapt resource value: 0x7F09008F
+ public const int progress_circular = 2131296399;
- // aapt resource value: 0x7f090041
- public const int parallax = 2131296321;
+ // aapt resource value: 0x7F090090
+ public const int progress_horizontal = 2131296400;
- // aapt resource value: 0x7f090062
- public const int parentPanel = 2131296354;
+ // aapt resource value: 0x7F090091
+ public const int radio = 2131296401;
- // aapt resource value: 0x7f090042
- public const int pin = 2131296322;
+ // aapt resource value: 0x7F090092
+ public const int right = 2131296402;
- // aapt resource value: 0x7f090006
- public const int progress_circular = 2131296262;
+ // aapt resource value: 0x7F090093
+ public const int right_icon = 2131296403;
- // aapt resource value: 0x7f090007
- public const int progress_horizontal = 2131296263;
+ // aapt resource value: 0x7F090094
+ public const int right_side = 2131296404;
- // aapt resource value: 0x7f090072
- public const int radio = 2131296370;
+ // aapt resource value: 0x7F090095
+ public const int rv_topbar = 2131296405;
- // aapt resource value: 0x7f09003f
- public const int right = 2131296319;
+ // aapt resource value: 0x7F09000C
+ public const int Scale = 2131296268;
- // aapt resource value: 0x7f0900cb
- public const int right_icon = 2131296459;
+ // aapt resource value: 0x7F090096
+ public const int screen = 2131296406;
- // aapt resource value: 0x7f0900c7
- public const int right_side = 2131296455;
+ // aapt resource value: 0x7F090097
+ public const int scroll = 2131296407;
- // aapt resource value: 0x7f0900a7
- public const int rv_topbar = 2131296423;
+ // aapt resource value: 0x7F09009B
+ public const int scrollable = 2131296411;
- // aapt resource value: 0x7f09001d
- public const int screen = 2131296285;
+ // aapt resource value: 0x7F090098
+ public const int scrollIndicatorDown = 2131296408;
- // aapt resource value: 0x7f090037
- public const int scroll = 2131296311;
+ // aapt resource value: 0x7F090099
+ public const int scrollIndicatorUp = 2131296409;
- // aapt resource value: 0x7f090068
- public const int scrollIndicatorDown = 2131296360;
+ // aapt resource value: 0x7F09009A
+ public const int scrollView = 2131296410;
- // aapt resource value: 0x7f090064
- public const int scrollIndicatorUp = 2131296356;
+ // aapt resource value: 0x7F09009C
+ public const int search_badge = 2131296412;
- // aapt resource value: 0x7f090065
- public const int scrollView = 2131296357;
+ // aapt resource value: 0x7F09009D
+ public const int search_bar = 2131296413;
- // aapt resource value: 0x7f09004a
- public const int scrollable = 2131296330;
+ // aapt resource value: 0x7F09009E
+ public const int search_button = 2131296414;
- // aapt resource value: 0x7f09007d
- public const int search_badge = 2131296381;
+ // aapt resource value: 0x7F09009F
+ public const int search_close_btn = 2131296415;
- // aapt resource value: 0x7f09007c
- public const int search_bar = 2131296380;
+ // aapt resource value: 0x7F0900A0
+ public const int search_edit_frame = 2131296416;
- // aapt resource value: 0x7f09007e
- public const int search_button = 2131296382;
+ // aapt resource value: 0x7F0900A1
+ public const int search_go_btn = 2131296417;
- // aapt resource value: 0x7f090083
- public const int search_close_btn = 2131296387;
+ // aapt resource value: 0x7F0900A2
+ public const int search_mag_icon = 2131296418;
- // aapt resource value: 0x7f09007f
- public const int search_edit_frame = 2131296383;
+ // aapt resource value: 0x7F0900A3
+ public const int search_plate = 2131296419;
- // aapt resource value: 0x7f090085
- public const int search_go_btn = 2131296389;
+ // aapt resource value: 0x7F0900A4
+ public const int search_src_text = 2131296420;
- // aapt resource value: 0x7f090080
- public const int search_mag_icon = 2131296384;
+ // aapt resource value: 0x7F0900A5
+ public const int search_voice_btn = 2131296421;
- // aapt resource value: 0x7f090081
- public const int search_plate = 2131296385;
+ // aapt resource value: 0x7F0900A6
+ public const int second = 2131296422;
- // aapt resource value: 0x7f090082
- public const int search_src_text = 2131296386;
+ // aapt resource value: 0x7F0900A7
+ public const int select_dialog_listview = 2131296423;
- // aapt resource value: 0x7f090086
- public const int search_voice_btn = 2131296390;
+ // aapt resource value: 0x7F090009
+ public const int SHIFT = 2131296265;
- // aapt resource value: 0x7f0900bb
- public const int second = 2131296443;
+ // aapt resource value: 0x7F0900A8
+ public const int shortcut = 2131296424;
- // aapt resource value: 0x7f090087
- public const int select_dialog_listview = 2131296391;
+ // aapt resource value: 0x7F0900A9
+ public const int showCustom = 2131296425;
- // aapt resource value: 0x7f090071
- public const int shortcut = 2131296369;
+ // aapt resource value: 0x7F0900AA
+ public const int showHome = 2131296426;
- // aapt resource value: 0x7f090018
- public const int showCustom = 2131296280;
+ // aapt resource value: 0x7F0900AB
+ public const int showTitle = 2131296427;
- // aapt resource value: 0x7f090019
- public const int showHome = 2131296281;
+ // aapt resource value: 0x7F0900AC
+ public const int smallLabel = 2131296428;
- // aapt resource value: 0x7f09001a
- public const int showTitle = 2131296282;
+ // aapt resource value: 0x7F0900AD
+ public const int snackbar_action = 2131296429;
- // aapt resource value: 0x7f09008c
- public const int smallLabel = 2131296396;
+ // aapt resource value: 0x7F0900AE
+ public const int snackbar_text = 2131296430;
- // aapt resource value: 0x7f090093
- public const int snackbar_action = 2131296403;
+ // aapt resource value: 0x7F0900AF
+ public const int snap = 2131296431;
- // aapt resource value: 0x7f090092
- public const int snackbar_text = 2131296402;
+ // aapt resource value: 0x7F0900B0
+ public const int spacer = 2131296432;
- // aapt resource value: 0x7f090038
- public const int snap = 2131296312;
+ // aapt resource value: 0x7F0900B1
+ public const int split_action_bar = 2131296433;
- // aapt resource value: 0x7f090061
- public const int spacer = 2131296353;
+ // aapt resource value: 0x7F0900B2
+ public const int src_atop = 2131296434;
- // aapt resource value: 0x7f090008
- public const int split_action_bar = 2131296264;
+ // aapt resource value: 0x7F0900B3
+ public const int src_in = 2131296435;
- // aapt resource value: 0x7f09001e
- public const int src_atop = 2131296286;
+ // aapt resource value: 0x7F0900B4
+ public const int src_over = 2131296436;
- // aapt resource value: 0x7f09001f
- public const int src_in = 2131296287;
+ // aapt resource value: 0x7F0900B5
+ public const int srl_classics_arrow = 2131296437;
- // aapt resource value: 0x7f090020
- public const int src_over = 2131296288;
+ // aapt resource value: 0x7F0900B6
+ public const int srl_classics_center = 2131296438;
- // aapt resource value: 0x7f0900d0
- public const int srl_classics_arrow = 2131296464;
+ // aapt resource value: 0x7F0900B7
+ public const int srl_classics_progress = 2131296439;
- // aapt resource value: 0x7f0900d3
- public const int srl_classics_center = 2131296467;
+ // aapt resource value: 0x7F0900B8
+ public const int srl_classics_title = 2131296440;
- // aapt resource value: 0x7f0900d2
- public const int srl_classics_progress = 2131296466;
+ // aapt resource value: 0x7F0900B9
+ public const int srl_classics_update = 2131296441;
- // aapt resource value: 0x7f0900d1
- public const int srl_classics_title = 2131296465;
+ // aapt resource value: 0x7F0900BA
+ public const int start = 2131296442;
- // aapt resource value: 0x7f0900d4
- public const int srl_classics_update = 2131296468;
+ // aapt resource value: 0x7F0900BB
+ public const int status = 2131296443;
- // aapt resource value: 0x7f090040
- public const int start = 2131296320;
+ // aapt resource value: 0x7F0900BC
+ public const int status_bar_latest_event_content = 2131296444;
- // aapt resource value: 0x7f09008b
- public const int status = 2131296395;
+ // aapt resource value: 0x7F09000A
+ public const int STROKE = 2131296266;
- // aapt resource value: 0x7f0900c2
- public const int status_bar_latest_event_content = 2131296450;
+ // aapt resource value: 0x7F0900BD
+ public const int submenuarrow = 2131296445;
- // aapt resource value: 0x7f090073
- public const int submenuarrow = 2131296371;
+ // aapt resource value: 0x7F0900BE
+ public const int submit_area = 2131296446;
- // aapt resource value: 0x7f090084
- public const int submit_area = 2131296388;
+ // aapt resource value: 0x7F0900BF
+ public const int subtitle = 2131296447;
- // aapt resource value: 0x7f090088
- public const int subtitle = 2131296392;
+ // aapt resource value: 0x7F09000B
+ public const int SYM = 2131296267;
- // aapt resource value: 0x7f090014
- public const int tabMode = 2131296276;
+ // aapt resource value: 0x7F0900C0
+ public const int tabMode = 2131296448;
- // aapt resource value: 0x7f09000f
- public const int text = 2131296271;
+ // aapt resource value: 0x7F0900C1
+ public const int text = 2131296449;
- // aapt resource value: 0x7f090010
- public const int text2 = 2131296272;
+ // aapt resource value: 0x7F0900C2
+ public const int text2 = 2131296450;
- // aapt resource value: 0x7f090067
- public const int textSpacerNoButtons = 2131296359;
+ // aapt resource value: 0x7F0900C6
+ public const int textinput_counter = 2131296454;
- // aapt resource value: 0x7f090066
- public const int textSpacerNoTitle = 2131296358;
+ // aapt resource value: 0x7F0900C7
+ public const int textinput_error = 2131296455;
- // aapt resource value: 0x7f090099
- public const int text_input_password_toggle = 2131296409;
+ // aapt resource value: 0x7F0900C3
+ public const int textSpacerNoButtons = 2131296451;
- // aapt resource value: 0x7f09000a
- public const int textinput_counter = 2131296266;
+ // aapt resource value: 0x7F0900C4
+ public const int textSpacerNoTitle = 2131296452;
- // aapt resource value: 0x7f09000b
- public const int textinput_error = 2131296267;
+ // aapt resource value: 0x7F0900C5
+ public const int text_input_password_toggle = 2131296453;
- // aapt resource value: 0x7f0900c8
+ // aapt resource value: 0x7F0900C8
public const int time = 2131296456;
- // aapt resource value: 0x7f0900b5
- public const int timepicker = 2131296437;
+ // aapt resource value: 0x7F0900C9
+ public const int timepicker = 2131296457;
- // aapt resource value: 0x7f090011
- public const int title = 2131296273;
+ // aapt resource value: 0x7F0900CA
+ public const int title = 2131296458;
- // aapt resource value: 0x7f09006e
- public const int titleDividerNoCustom = 2131296366;
+ // aapt resource value: 0x7F0900CB
+ public const int titleDividerNoCustom = 2131296459;
- // aapt resource value: 0x7f09006c
- public const int title_template = 2131296364;
+ // aapt resource value: 0x7F0900CC
+ public const int title_template = 2131296460;
- // aapt resource value: 0x7f090033
- public const int top = 2131296307;
+ // aapt resource value: 0x7F0900CD
+ public const int top = 2131296461;
- // aapt resource value: 0x7f09006b
- public const int topPanel = 2131296363;
+ // aapt resource value: 0x7F0900CE
+ public const int topPanel = 2131296462;
- // aapt resource value: 0x7f090090
- public const int touch_outside = 2131296400;
+ // aapt resource value: 0x7F0900CF
+ public const int touch_outside = 2131296463;
- // aapt resource value: 0x7f0900a9
- public const int tvTitle = 2131296425;
+ // aapt resource value: 0x7F09000D
+ public const int Translate = 2131296269;
- // aapt resource value: 0x7f0900d7
- public const int tv_zxing_back = 2131296471;
+ // aapt resource value: 0x7F0900D0
+ public const int tvTitle = 2131296464;
- // aapt resource value: 0x7f0900d8
- public const int tv_zxing_flash = 2131296472;
+ // aapt resource value: 0x7F0900D1
+ public const int tv_zxing_back = 2131296465;
- // aapt resource value: 0x7f0900d6
- public const int tv_zxing_scan = 2131296470;
+ // aapt resource value: 0x7F0900D2
+ public const int tv_zxing_flash = 2131296466;
- // aapt resource value: 0x7f090022
- public const int uniform = 2131296290;
+ // aapt resource value: 0x7F0900D3
+ public const int tv_zxing_scan = 2131296467;
- // aapt resource value: 0x7f090009
- public const int up = 2131296265;
+ // aapt resource value: 0x7F0900D4
+ public const int uniform = 2131296468;
- // aapt resource value: 0x7f09001b
- public const int useLogo = 2131296283;
+ // aapt resource value: 0x7F0900D5
+ public const int up = 2131296469;
- // aapt resource value: 0x7f09000c
- public const int view_offset_helper = 2131296268;
+ // aapt resource value: 0x7F0900D6
+ public const int useLogo = 2131296470;
- // aapt resource value: 0x7f0900da
- public const int visible = 2131296474;
+ // aapt resource value: 0x7F0900D7
+ public const int view_offset_helper = 2131296471;
- // aapt resource value: 0x7f090031
- public const int withText = 2131296305;
+ // aapt resource value: 0x7F0900D8
+ public const int visible = 2131296472;
- // aapt resource value: 0x7f090023
- public const int wrap_content = 2131296291;
+ // aapt resource value: 0x7F0900D9
+ public const int withText = 2131296473;
- // aapt resource value: 0x7f0900b6
- public const int year = 2131296438;
+ // aapt resource value: 0x7F0900DA
+ public const int wrap_content = 2131296474;
+
+ // aapt resource value: 0x7F0900DB
+ public const int year = 2131296475;
static Id()
{
@@ -3670,38 +3652,38 @@
public partial class Integer
{
- // aapt resource value: 0x7f0e0000
- public const int abc_config_activityDefaultDur = 2131623936;
+ // aapt resource value: 0x7F0A0000
+ public const int abc_config_activityDefaultDur = 2131361792;
- // aapt resource value: 0x7f0e0001
- public const int abc_config_activityShortDur = 2131623937;
+ // aapt resource value: 0x7F0A0001
+ public const int abc_config_activityShortDur = 2131361793;
- // aapt resource value: 0x7f0e000a
- public const int animation_default_duration = 2131623946;
+ // aapt resource value: 0x7F0A0002
+ public const int animation_default_duration = 2131361794;
- // aapt resource value: 0x7f0e0005
- public const int app_bar_elevation_anim_duration = 2131623941;
+ // aapt resource value: 0x7F0A0003
+ public const int app_bar_elevation_anim_duration = 2131361795;
- // aapt resource value: 0x7f0e0006
- public const int bottom_sheet_slide_duration = 2131623942;
+ // aapt resource value: 0x7F0A0004
+ public const int bottom_sheet_slide_duration = 2131361796;
- // aapt resource value: 0x7f0e0002
- public const int cancel_button_image_alpha = 2131623938;
+ // aapt resource value: 0x7F0A0005
+ public const int cancel_button_image_alpha = 2131361797;
- // aapt resource value: 0x7f0e0003
- public const int config_tooltipAnimTime = 2131623939;
+ // aapt resource value: 0x7F0A0006
+ public const int config_tooltipAnimTime = 2131361798;
- // aapt resource value: 0x7f0e0004
- public const int design_snackbar_text_max_lines = 2131623940;
+ // aapt resource value: 0x7F0A0007
+ public const int design_snackbar_text_max_lines = 2131361799;
- // aapt resource value: 0x7f0e0007
- public const int hide_password_duration = 2131623943;
+ // aapt resource value: 0x7F0A0008
+ public const int hide_password_duration = 2131361800;
- // aapt resource value: 0x7f0e0008
- public const int show_password_duration = 2131623944;
+ // aapt resource value: 0x7F0A0009
+ public const int show_password_duration = 2131361801;
- // aapt resource value: 0x7f0e0009
- public const int status_bar_notification_info_maxnum = 2131623945;
+ // aapt resource value: 0x7F0A000A
+ public const int status_bar_notification_info_maxnum = 2131361802;
static Integer()
{
@@ -3716,236 +3698,236 @@
public partial class Layout
{
- // aapt resource value: 0x7f040000
- public const int abc_action_bar_title_item = 2130968576;
+ // aapt resource value: 0x7F0B0000
+ public const int abc_action_bar_title_item = 2131427328;
- // aapt resource value: 0x7f040001
- public const int abc_action_bar_up_container = 2130968577;
+ // aapt resource value: 0x7F0B0001
+ public const int abc_action_bar_up_container = 2131427329;
- // aapt resource value: 0x7f040002
- public const int abc_action_bar_view_list_nav_layout = 2130968578;
+ // aapt resource value: 0x7F0B0002
+ public const int abc_action_bar_view_list_nav_layout = 2131427330;
- // aapt resource value: 0x7f040003
- public const int abc_action_menu_item_layout = 2130968579;
+ // aapt resource value: 0x7F0B0003
+ public const int abc_action_menu_item_layout = 2131427331;
- // aapt resource value: 0x7f040004
- public const int abc_action_menu_layout = 2130968580;
+ // aapt resource value: 0x7F0B0004
+ public const int abc_action_menu_layout = 2131427332;
- // aapt resource value: 0x7f040005
- public const int abc_action_mode_bar = 2130968581;
+ // aapt resource value: 0x7F0B0005
+ public const int abc_action_mode_bar = 2131427333;
- // aapt resource value: 0x7f040006
- public const int abc_action_mode_close_item_material = 2130968582;
+ // aapt resource value: 0x7F0B0006
+ public const int abc_action_mode_close_item_material = 2131427334;
- // aapt resource value: 0x7f040007
- public const int abc_activity_chooser_view = 2130968583;
+ // aapt resource value: 0x7F0B0007
+ public const int abc_activity_chooser_view = 2131427335;
- // aapt resource value: 0x7f040008
- public const int abc_activity_chooser_view_list_item = 2130968584;
+ // aapt resource value: 0x7F0B0008
+ public const int abc_activity_chooser_view_list_item = 2131427336;
- // aapt resource value: 0x7f040009
- public const int abc_alert_dialog_button_bar_material = 2130968585;
+ // aapt resource value: 0x7F0B0009
+ public const int abc_alert_dialog_button_bar_material = 2131427337;
- // aapt resource value: 0x7f04000a
- public const int abc_alert_dialog_material = 2130968586;
+ // aapt resource value: 0x7F0B000A
+ public const int abc_alert_dialog_material = 2131427338;
- // aapt resource value: 0x7f04000b
- public const int abc_alert_dialog_title_material = 2130968587;
+ // aapt resource value: 0x7F0B000B
+ public const int abc_alert_dialog_title_material = 2131427339;
- // aapt resource value: 0x7f04000c
- public const int abc_dialog_title_material = 2130968588;
+ // aapt resource value: 0x7F0B000C
+ public const int abc_dialog_title_material = 2131427340;
- // aapt resource value: 0x7f04000d
- public const int abc_expanded_menu_layout = 2130968589;
+ // aapt resource value: 0x7F0B000D
+ public const int abc_expanded_menu_layout = 2131427341;
- // aapt resource value: 0x7f04000e
- public const int abc_list_menu_item_checkbox = 2130968590;
+ // aapt resource value: 0x7F0B000E
+ public const int abc_list_menu_item_checkbox = 2131427342;
- // aapt resource value: 0x7f04000f
- public const int abc_list_menu_item_icon = 2130968591;
+ // aapt resource value: 0x7F0B000F
+ public const int abc_list_menu_item_icon = 2131427343;
- // aapt resource value: 0x7f040010
- public const int abc_list_menu_item_layout = 2130968592;
+ // aapt resource value: 0x7F0B0010
+ public const int abc_list_menu_item_layout = 2131427344;
- // aapt resource value: 0x7f040011
- public const int abc_list_menu_item_radio = 2130968593;
+ // aapt resource value: 0x7F0B0011
+ public const int abc_list_menu_item_radio = 2131427345;
- // aapt resource value: 0x7f040012
- public const int abc_popup_menu_header_item_layout = 2130968594;
+ // aapt resource value: 0x7F0B0012
+ public const int abc_popup_menu_header_item_layout = 2131427346;
- // aapt resource value: 0x7f040013
- public const int abc_popup_menu_item_layout = 2130968595;
+ // aapt resource value: 0x7F0B0013
+ public const int abc_popup_menu_item_layout = 2131427347;
- // aapt resource value: 0x7f040014
- public const int abc_screen_content_include = 2130968596;
+ // aapt resource value: 0x7F0B0014
+ public const int abc_screen_content_include = 2131427348;
- // aapt resource value: 0x7f040015
- public const int abc_screen_simple = 2130968597;
+ // aapt resource value: 0x7F0B0015
+ public const int abc_screen_simple = 2131427349;
- // aapt resource value: 0x7f040016
- public const int abc_screen_simple_overlay_action_mode = 2130968598;
+ // aapt resource value: 0x7F0B0016
+ public const int abc_screen_simple_overlay_action_mode = 2131427350;
- // aapt resource value: 0x7f040017
- public const int abc_screen_toolbar = 2130968599;
+ // aapt resource value: 0x7F0B0017
+ public const int abc_screen_toolbar = 2131427351;
- // aapt resource value: 0x7f040018
- public const int abc_search_dropdown_item_icons_2line = 2130968600;
+ // aapt resource value: 0x7F0B0018
+ public const int abc_search_dropdown_item_icons_2line = 2131427352;
- // aapt resource value: 0x7f040019
- public const int abc_search_view = 2130968601;
+ // aapt resource value: 0x7F0B0019
+ public const int abc_search_view = 2131427353;
- // aapt resource value: 0x7f04001a
- public const int abc_select_dialog_material = 2130968602;
+ // aapt resource value: 0x7F0B001A
+ public const int abc_select_dialog_material = 2131427354;
- // aapt resource value: 0x7f04001b
- public const int biometric_prompt_dialog_content = 2130968603;
+ // aapt resource value: 0x7F0B001B
+ public const int biometric_prompt_dialog_content = 2131427355;
- // aapt resource value: 0x7f04001c
- public const int design_bottom_navigation_item = 2130968604;
+ // aapt resource value: 0x7F0B001C
+ public const int design_bottom_navigation_item = 2131427356;
- // aapt resource value: 0x7f04001d
- public const int design_bottom_sheet_dialog = 2130968605;
+ // aapt resource value: 0x7F0B001D
+ public const int design_bottom_sheet_dialog = 2131427357;
- // aapt resource value: 0x7f04001e
- public const int design_layout_snackbar = 2130968606;
+ // aapt resource value: 0x7F0B001E
+ public const int design_layout_snackbar = 2131427358;
- // aapt resource value: 0x7f04001f
- public const int design_layout_snackbar_include = 2130968607;
+ // aapt resource value: 0x7F0B001F
+ public const int design_layout_snackbar_include = 2131427359;
- // aapt resource value: 0x7f040020
- public const int design_layout_tab_icon = 2130968608;
+ // aapt resource value: 0x7F0B0020
+ public const int design_layout_tab_icon = 2131427360;
- // aapt resource value: 0x7f040021
- public const int design_layout_tab_text = 2130968609;
+ // aapt resource value: 0x7F0B0021
+ public const int design_layout_tab_text = 2131427361;
- // aapt resource value: 0x7f040022
- public const int design_menu_item_action_area = 2130968610;
+ // aapt resource value: 0x7F0B0022
+ public const int design_menu_item_action_area = 2131427362;
- // aapt resource value: 0x7f040023
- public const int design_navigation_item = 2130968611;
+ // aapt resource value: 0x7F0B0023
+ public const int design_navigation_item = 2131427363;
- // aapt resource value: 0x7f040024
- public const int design_navigation_item_header = 2130968612;
+ // aapt resource value: 0x7F0B0024
+ public const int design_navigation_item_header = 2131427364;
- // aapt resource value: 0x7f040025
- public const int design_navigation_item_separator = 2130968613;
+ // aapt resource value: 0x7F0B0025
+ public const int design_navigation_item_separator = 2131427365;
- // aapt resource value: 0x7f040026
- public const int design_navigation_item_subheader = 2130968614;
+ // aapt resource value: 0x7F0B0026
+ public const int design_navigation_item_subheader = 2131427366;
- // aapt resource value: 0x7f040027
- public const int design_navigation_menu = 2130968615;
+ // aapt resource value: 0x7F0B0027
+ public const int design_navigation_menu = 2131427367;
- // aapt resource value: 0x7f040028
- public const int design_navigation_menu_item = 2130968616;
+ // aapt resource value: 0x7F0B0028
+ public const int design_navigation_menu_item = 2131427368;
- // aapt resource value: 0x7f040029
- public const int design_text_input_password_icon = 2130968617;
+ // aapt resource value: 0x7F0B0029
+ public const int design_text_input_password_icon = 2131427369;
- // aapt resource value: 0x7f04002a
- public const int hdl_gallery_banner_view_layout = 2130968618;
+ // aapt resource value: 0x7F0B002A
+ public const int hdl_gallery_banner_view_layout = 2131427370;
- // aapt resource value: 0x7f04002b
- public const int hdl_widget_activity_crop_image = 2130968619;
+ // aapt resource value: 0x7F0B002B
+ public const int hdl_widget_activity_crop_image = 2131427371;
- // aapt resource value: 0x7f04002c
- public const int hdl_widget_activity_geofence_round = 2130968620;
+ // aapt resource value: 0x7F0B002C
+ public const int hdl_widget_activity_geofence_round = 2131427372;
- // aapt resource value: 0x7f04002d
- public const int hdl_widget_air_button = 2130968621;
+ // aapt resource value: 0x7F0B002D
+ public const int hdl_widget_air_button = 2131427373;
- // aapt resource value: 0x7f04002e
- public const int hdl_widget_include_pickerview_topbar = 2130968622;
+ // aapt resource value: 0x7F0B002E
+ public const int hdl_widget_include_pickerview_topbar = 2131427374;
- // aapt resource value: 0x7f04002f
- public const int hdl_widget_layout_basepickerview = 2130968623;
+ // aapt resource value: 0x7F0B002F
+ public const int hdl_widget_layout_basepickerview = 2131427375;
- // aapt resource value: 0x7f040030
- public const int hdl_widget_pickerview = 2130968624;
+ // aapt resource value: 0x7F0B0030
+ public const int hdl_widget_pickerview = 2131427376;
- // aapt resource value: 0x7f040031
- public const int hdl_widget_pickerview_options = 2130968625;
+ // aapt resource value: 0x7F0B0031
+ public const int hdl_widget_pickerview_options = 2131427377;
- // aapt resource value: 0x7f040032
- public const int hdl_widget_pickerview_time = 2130968626;
+ // aapt resource value: 0x7F0B0032
+ public const int hdl_widget_pickerview_time = 2131427378;
- // aapt resource value: 0x7f040033
- public const int Main = 2130968627;
+ // aapt resource value: 0x7F0B0033
+ public const int Main = 2131427379;
- // aapt resource value: 0x7f040034
- public const int notification_action = 2130968628;
+ // aapt resource value: 0x7F0B0034
+ public const int notification_action = 2131427380;
- // aapt resource value: 0x7f040035
- public const int notification_action_tombstone = 2130968629;
+ // aapt resource value: 0x7F0B0035
+ public const int notification_action_tombstone = 2131427381;
- // aapt resource value: 0x7f040036
- public const int notification_media_action = 2130968630;
+ // aapt resource value: 0x7F0B0036
+ public const int notification_media_action = 2131427382;
- // aapt resource value: 0x7f040037
- public const int notification_media_cancel_action = 2130968631;
+ // aapt resource value: 0x7F0B0037
+ public const int notification_media_cancel_action = 2131427383;
- // aapt resource value: 0x7f040038
- public const int notification_template_big_media = 2130968632;
+ // aapt resource value: 0x7F0B0038
+ public const int notification_template_big_media = 2131427384;
- // aapt resource value: 0x7f040039
- public const int notification_template_big_media_custom = 2130968633;
+ // aapt resource value: 0x7F0B0039
+ public const int notification_template_big_media_custom = 2131427385;
- // aapt resource value: 0x7f04003a
- public const int notification_template_big_media_narrow = 2130968634;
+ // aapt resource value: 0x7F0B003A
+ public const int notification_template_big_media_narrow = 2131427386;
- // aapt resource value: 0x7f04003b
- public const int notification_template_big_media_narrow_custom = 2130968635;
+ // aapt resource value: 0x7F0B003B
+ public const int notification_template_big_media_narrow_custom = 2131427387;
- // aapt resource value: 0x7f04003c
- public const int notification_template_custom_big = 2130968636;
+ // aapt resource value: 0x7F0B003C
+ public const int notification_template_custom_big = 2131427388;
- // aapt resource value: 0x7f04003d
- public const int notification_template_icon_group = 2130968637;
+ // aapt resource value: 0x7F0B003D
+ public const int notification_template_icon_group = 2131427389;
- // aapt resource value: 0x7f04003e
- public const int notification_template_lines_media = 2130968638;
+ // aapt resource value: 0x7F0B003E
+ public const int notification_template_lines_media = 2131427390;
- // aapt resource value: 0x7f04003f
- public const int notification_template_media = 2130968639;
+ // aapt resource value: 0x7F0B003F
+ public const int notification_template_media = 2131427391;
- // aapt resource value: 0x7f040040
- public const int notification_template_media_custom = 2130968640;
+ // aapt resource value: 0x7F0B0040
+ public const int notification_template_media_custom = 2131427392;
- // aapt resource value: 0x7f040041
- public const int notification_template_part_chronometer = 2130968641;
+ // aapt resource value: 0x7F0B0041
+ public const int notification_template_part_chronometer = 2131427393;
- // aapt resource value: 0x7f040042
- public const int notification_template_part_time = 2130968642;
+ // aapt resource value: 0x7F0B0042
+ public const int notification_template_part_time = 2131427394;
- // aapt resource value: 0x7f040043
- public const int select_dialog_item_material = 2130968643;
+ // aapt resource value: 0x7F0B0043
+ public const int select_dialog_item_material = 2131427395;
- // aapt resource value: 0x7f040044
- public const int select_dialog_multichoice_material = 2130968644;
+ // aapt resource value: 0x7F0B0044
+ public const int select_dialog_multichoice_material = 2131427396;
- // aapt resource value: 0x7f040045
- public const int select_dialog_singlechoice_material = 2130968645;
+ // aapt resource value: 0x7F0B0045
+ public const int select_dialog_singlechoice_material = 2131427397;
- // aapt resource value: 0x7f040046
- public const int srl_classics_footer = 2130968646;
+ // aapt resource value: 0x7F0B0046
+ public const int srl_classics_footer = 2131427398;
- // aapt resource value: 0x7f040047
- public const int srl_classics_header = 2130968647;
+ // aapt resource value: 0x7F0B0047
+ public const int srl_classics_header = 2131427399;
- // aapt resource value: 0x7f040048
- public const int support_simple_spinner_dropdown_item = 2130968648;
+ // aapt resource value: 0x7F0B0048
+ public const int support_simple_spinner_dropdown_item = 2131427400;
- // aapt resource value: 0x7f040049
- public const int tooltip = 2130968649;
+ // aapt resource value: 0x7F0B0049
+ public const int tooltip = 2131427401;
- // aapt resource value: 0x7f04004a
- public const int zxing_layout = 2130968650;
+ // aapt resource value: 0x7F0B004B
+ public const int zxingscanneractivitylayout = 2131427403;
- // aapt resource value: 0x7f04004b
- public const int zxingscanneractivitylayout = 2130968651;
+ // aapt resource value: 0x7F0B004C
+ public const int zxingscannerfragmentlayout = 2131427404;
- // aapt resource value: 0x7f04004c
- public const int zxingscannerfragmentlayout = 2130968652;
+ // aapt resource value: 0x7F0B004A
+ public const int zxing_layout = 2131427402;
static Layout()
{
@@ -3960,8 +3942,8 @@
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int Icon = 2130903040;
+ // aapt resource value: 0x7F0C0000
+ public const int Icon = 2131492864;
static Mipmap()
{
@@ -3976,242 +3958,242 @@
public partial class String
{
- // aapt resource value: 0x7f0a0000
- public const int abc_action_bar_home_description = 2131361792;
+ // aapt resource value: 0x7F0D0000
+ public const int abc_action_bar_home_description = 2131558400;
- // aapt resource value: 0x7f0a0001
- public const int abc_action_bar_home_description_format = 2131361793;
+ // aapt resource value: 0x7F0D0001
+ public const int abc_action_bar_home_description_format = 2131558401;
- // aapt resource value: 0x7f0a0002
- public const int abc_action_bar_home_subtitle_description_format = 2131361794;
+ // aapt resource value: 0x7F0D0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131558402;
- // aapt resource value: 0x7f0a0003
- public const int abc_action_bar_up_description = 2131361795;
+ // aapt resource value: 0x7F0D0003
+ public const int abc_action_bar_up_description = 2131558403;
- // aapt resource value: 0x7f0a0004
- public const int abc_action_menu_overflow_description = 2131361796;
+ // aapt resource value: 0x7F0D0004
+ public const int abc_action_menu_overflow_description = 2131558404;
- // aapt resource value: 0x7f0a0005
- public const int abc_action_mode_done = 2131361797;
+ // aapt resource value: 0x7F0D0005
+ public const int abc_action_mode_done = 2131558405;
- // aapt resource value: 0x7f0a0006
- public const int abc_activity_chooser_view_see_all = 2131361798;
+ // aapt resource value: 0x7F0D0007
+ public const int abc_activitychooserview_choose_application = 2131558407;
- // aapt resource value: 0x7f0a0007
- public const int abc_activitychooserview_choose_application = 2131361799;
+ // aapt resource value: 0x7F0D0006
+ public const int abc_activity_chooser_view_see_all = 2131558406;
- // aapt resource value: 0x7f0a0008
- public const int abc_capital_off = 2131361800;
+ // aapt resource value: 0x7F0D0008
+ public const int abc_capital_off = 2131558408;
- // aapt resource value: 0x7f0a0009
- public const int abc_capital_on = 2131361801;
+ // aapt resource value: 0x7F0D0009
+ public const int abc_capital_on = 2131558409;
- // aapt resource value: 0x7f0a0015
- public const int abc_font_family_body_1_material = 2131361813;
+ // aapt resource value: 0x7F0D000A
+ public const int abc_font_family_body_1_material = 2131558410;
- // aapt resource value: 0x7f0a0016
- public const int abc_font_family_body_2_material = 2131361814;
+ // aapt resource value: 0x7F0D000B
+ public const int abc_font_family_body_2_material = 2131558411;
- // aapt resource value: 0x7f0a0017
- public const int abc_font_family_button_material = 2131361815;
+ // aapt resource value: 0x7F0D000C
+ public const int abc_font_family_button_material = 2131558412;
- // aapt resource value: 0x7f0a0018
- public const int abc_font_family_caption_material = 2131361816;
+ // aapt resource value: 0x7F0D000D
+ public const int abc_font_family_caption_material = 2131558413;
- // aapt resource value: 0x7f0a0019
- public const int abc_font_family_display_1_material = 2131361817;
+ // aapt resource value: 0x7F0D000E
+ public const int abc_font_family_display_1_material = 2131558414;
- // aapt resource value: 0x7f0a001a
- public const int abc_font_family_display_2_material = 2131361818;
+ // aapt resource value: 0x7F0D000F
+ public const int abc_font_family_display_2_material = 2131558415;
- // aapt resource value: 0x7f0a001b
- public const int abc_font_family_display_3_material = 2131361819;
+ // aapt resource value: 0x7F0D0010
+ public const int abc_font_family_display_3_material = 2131558416;
- // aapt resource value: 0x7f0a001c
- public const int abc_font_family_display_4_material = 2131361820;
+ // aapt resource value: 0x7F0D0011
+ public const int abc_font_family_display_4_material = 2131558417;
- // aapt resource value: 0x7f0a001d
- public const int abc_font_family_headline_material = 2131361821;
+ // aapt resource value: 0x7F0D0012
+ public const int abc_font_family_headline_material = 2131558418;
- // aapt resource value: 0x7f0a001e
- public const int abc_font_family_menu_material = 2131361822;
+ // aapt resource value: 0x7F0D0013
+ public const int abc_font_family_menu_material = 2131558419;
- // aapt resource value: 0x7f0a001f
- public const int abc_font_family_subhead_material = 2131361823;
+ // aapt resource value: 0x7F0D0014
+ public const int abc_font_family_subhead_material = 2131558420;
- // aapt resource value: 0x7f0a0020
- public const int abc_font_family_title_material = 2131361824;
+ // aapt resource value: 0x7F0D0015
+ public const int abc_font_family_title_material = 2131558421;
- // aapt resource value: 0x7f0a000a
- public const int abc_search_hint = 2131361802;
+ // aapt resource value: 0x7F0D0017
+ public const int abc_searchview_description_clear = 2131558423;
- // aapt resource value: 0x7f0a000b
- public const int abc_searchview_description_clear = 2131361803;
+ // aapt resource value: 0x7F0D0018
+ public const int abc_searchview_description_query = 2131558424;
- // aapt resource value: 0x7f0a000c
- public const int abc_searchview_description_query = 2131361804;
+ // aapt resource value: 0x7F0D0019
+ public const int abc_searchview_description_search = 2131558425;
- // aapt resource value: 0x7f0a000d
- public const int abc_searchview_description_search = 2131361805;
+ // aapt resource value: 0x7F0D001A
+ public const int abc_searchview_description_submit = 2131558426;
- // aapt resource value: 0x7f0a000e
- public const int abc_searchview_description_submit = 2131361806;
+ // aapt resource value: 0x7F0D001B
+ public const int abc_searchview_description_voice = 2131558427;
- // aapt resource value: 0x7f0a000f
- public const int abc_searchview_description_voice = 2131361807;
+ // aapt resource value: 0x7F0D0016
+ public const int abc_search_hint = 2131558422;
- // aapt resource value: 0x7f0a0010
- public const int abc_shareactionprovider_share_with = 2131361808;
+ // aapt resource value: 0x7F0D001C
+ public const int abc_shareactionprovider_share_with = 2131558428;
- // aapt resource value: 0x7f0a0011
- public const int abc_shareactionprovider_share_with_application = 2131361809;
+ // aapt resource value: 0x7F0D001D
+ public const int abc_shareactionprovider_share_with_application = 2131558429;
- // aapt resource value: 0x7f0a0012
- public const int abc_toolbar_collapse_description = 2131361810;
+ // aapt resource value: 0x7F0D001E
+ public const int abc_toolbar_collapse_description = 2131558430;
- // aapt resource value: 0x7f0a003c
- public const int app_name = 2131361852;
+ // aapt resource value: 0x7F0D0020
+ public const int appbar_scrolling_view_behavior = 2131558432;
- // aapt resource value: 0x7f0a0021
- public const int appbar_scrolling_view_behavior = 2131361825;
+ // aapt resource value: 0x7F0D001F
+ public const int app_name = 2131558431;
- // aapt resource value: 0x7f0a0022
- public const int bottom_sheet_behavior = 2131361826;
+ // aapt resource value: 0x7F0D0021
+ public const int bottom_sheet_behavior = 2131558433;
- // aapt resource value: 0x7f0a0023
- public const int character_counter_pattern = 2131361827;
+ // aapt resource value: 0x7F0D0022
+ public const int character_counter_pattern = 2131558434;
- // aapt resource value: 0x7f0a003d
- public const int gd_activity_title = 2131361853;
+ // aapt resource value: 0x7F0D0023
+ public const int gd_activity_title = 2131558435;
- // aapt resource value: 0x7f0a003e
- public const int gd_cancel = 2131361854;
+ // aapt resource value: 0x7F0D0024
+ public const int gd_cancel = 2131558436;
- // aapt resource value: 0x7f0a003f
- public const int gd_myhome = 2131361855;
+ // aapt resource value: 0x7F0D0025
+ public const int gd_myhome = 2131558437;
- // aapt resource value: 0x7f0a0040
- public const int gd_notifyMsg = 2131361856;
+ // aapt resource value: 0x7F0D0026
+ public const int gd_notifyMsg = 2131558438;
- // aapt resource value: 0x7f0a0041
- public const int gd_notifyTitle = 2131361857;
+ // aapt resource value: 0x7F0D0027
+ public const int gd_notifyTitle = 2131558439;
- // aapt resource value: 0x7f0a0042
- public const int gd_save = 2131361858;
+ // aapt resource value: 0x7F0D0028
+ public const int gd_save = 2131558440;
- // aapt resource value: 0x7f0a0043
- public const int gd_search_tip = 2131361859;
+ // aapt resource value: 0x7F0D0029
+ public const int gd_search_tip = 2131558441;
- // aapt resource value: 0x7f0a0044
- public const int gd_select_distance = 2131361860;
+ // aapt resource value: 0x7F0D002A
+ public const int gd_select_distance = 2131558442;
- // aapt resource value: 0x7f0a0045
- public const int gd_setting = 2131361861;
+ // aapt resource value: 0x7F0D002B
+ public const int gd_setting = 2131558443;
- // aapt resource value: 0x7f0a004e
- public const int hello = 2131361870;
+ // aapt resource value: 0x7F0D002C
+ public const int hello = 2131558444;
- // aapt resource value: 0x7f0a0029
- public const int not_recognized_fingerprint_hint = 2131361833;
+ // aapt resource value: 0x7F0D002D
+ public const int not_recognized_fingerprint_hint = 2131558445;
- // aapt resource value: 0x7f0a0024
- public const int password_toggle_content_description = 2131361828;
+ // aapt resource value: 0x7F0D002E
+ public const int password_toggle_content_description = 2131558446;
- // aapt resource value: 0x7f0a0025
- public const int path_password_eye = 2131361829;
+ // aapt resource value: 0x7F0D002F
+ public const int path_password_eye = 2131558447;
- // aapt resource value: 0x7f0a0026
- public const int path_password_eye_mask_strike_through = 2131361830;
+ // aapt resource value: 0x7F0D0030
+ public const int path_password_eye_mask_strike_through = 2131558448;
- // aapt resource value: 0x7f0a0027
- public const int path_password_eye_mask_visible = 2131361831;
+ // aapt resource value: 0x7F0D0031
+ public const int path_password_eye_mask_visible = 2131558449;
- // aapt resource value: 0x7f0a0028
- public const int path_password_strike_through = 2131361832;
+ // aapt resource value: 0x7F0D0032
+ public const int path_password_strike_through = 2131558450;
- // aapt resource value: 0x7f0a0046
- public const int pickerview_cancel = 2131361862;
+ // aapt resource value: 0x7F0D0033
+ public const int pickerview_cancel = 2131558451;
- // aapt resource value: 0x7f0a0047
- public const int pickerview_day = 2131361863;
+ // aapt resource value: 0x7F0D0034
+ public const int pickerview_day = 2131558452;
- // aapt resource value: 0x7f0a0048
- public const int pickerview_hours = 2131361864;
+ // aapt resource value: 0x7F0D0035
+ public const int pickerview_hours = 2131558453;
- // aapt resource value: 0x7f0a0049
- public const int pickerview_minutes = 2131361865;
+ // aapt resource value: 0x7F0D0036
+ public const int pickerview_minutes = 2131558454;
- // aapt resource value: 0x7f0a004a
- public const int pickerview_month = 2131361866;
+ // aapt resource value: 0x7F0D0037
+ public const int pickerview_month = 2131558455;
- // aapt resource value: 0x7f0a004b
- public const int pickerview_seconds = 2131361867;
+ // aapt resource value: 0x7F0D0038
+ public const int pickerview_seconds = 2131558456;
- // aapt resource value: 0x7f0a004c
- public const int pickerview_submit = 2131361868;
+ // aapt resource value: 0x7F0D0039
+ public const int pickerview_submit = 2131558457;
- // aapt resource value: 0x7f0a004d
- public const int pickerview_year = 2131361869;
+ // aapt resource value: 0x7F0D003A
+ public const int pickerview_year = 2131558458;
- // aapt resource value: 0x7f0a0013
- public const int search_menu_title = 2131361811;
+ // aapt resource value: 0x7F0D003B
+ public const int search_menu_title = 2131558459;
- // aapt resource value: 0x7f0a002b
- public const int srl_component_falsify = 2131361835;
+ // aapt resource value: 0x7F0D003C
+ public const int srl_component_falsify = 2131558460;
- // aapt resource value: 0x7f0a002c
- public const int srl_content_empty = 2131361836;
+ // aapt resource value: 0x7F0D003D
+ public const int srl_content_empty = 2131558461;
- // aapt resource value: 0x7f0a002d
- public const int srl_footer_failed = 2131361837;
+ // aapt resource value: 0x7F0D003E
+ public const int srl_footer_failed = 2131558462;
- // aapt resource value: 0x7f0a002e
- public const int srl_footer_finish = 2131361838;
+ // aapt resource value: 0x7F0D003F
+ public const int srl_footer_finish = 2131558463;
- // aapt resource value: 0x7f0a002f
- public const int srl_footer_loading = 2131361839;
+ // aapt resource value: 0x7F0D0040
+ public const int srl_footer_loading = 2131558464;
- // aapt resource value: 0x7f0a0030
- public const int srl_footer_nothing = 2131361840;
+ // aapt resource value: 0x7F0D0041
+ public const int srl_footer_nothing = 2131558465;
- // aapt resource value: 0x7f0a0031
- public const int srl_footer_pulling = 2131361841;
+ // aapt resource value: 0x7F0D0042
+ public const int srl_footer_pulling = 2131558466;
- // aapt resource value: 0x7f0a0032
- public const int srl_footer_refreshing = 2131361842;
+ // aapt resource value: 0x7F0D0043
+ public const int srl_footer_refreshing = 2131558467;
- // aapt resource value: 0x7f0a0033
- public const int srl_footer_release = 2131361843;
+ // aapt resource value: 0x7F0D0044
+ public const int srl_footer_release = 2131558468;
- // aapt resource value: 0x7f0a0034
- public const int srl_header_failed = 2131361844;
+ // aapt resource value: 0x7F0D0045
+ public const int srl_header_failed = 2131558469;
- // aapt resource value: 0x7f0a0035
- public const int srl_header_finish = 2131361845;
+ // aapt resource value: 0x7F0D0046
+ public const int srl_header_finish = 2131558470;
- // aapt resource value: 0x7f0a0036
- public const int srl_header_loading = 2131361846;
+ // aapt resource value: 0x7F0D0047
+ public const int srl_header_loading = 2131558471;
- // aapt resource value: 0x7f0a0037
- public const int srl_header_pulling = 2131361847;
+ // aapt resource value: 0x7F0D0048
+ public const int srl_header_pulling = 2131558472;
- // aapt resource value: 0x7f0a0038
- public const int srl_header_refreshing = 2131361848;
+ // aapt resource value: 0x7F0D0049
+ public const int srl_header_refreshing = 2131558473;
- // aapt resource value: 0x7f0a0039
- public const int srl_header_release = 2131361849;
+ // aapt resource value: 0x7F0D004A
+ public const int srl_header_release = 2131558474;
- // aapt resource value: 0x7f0a003a
- public const int srl_header_secondary = 2131361850;
+ // aapt resource value: 0x7F0D004B
+ public const int srl_header_secondary = 2131558475;
- // aapt resource value: 0x7f0a003b
- public const int srl_header_update = 2131361851;
+ // aapt resource value: 0x7F0D004C
+ public const int srl_header_update = 2131558476;
- // aapt resource value: 0x7f0a0014
- public const int status_bar_notification_info_overflow = 2131361812;
+ // aapt resource value: 0x7F0D004D
+ public const int status_bar_notification_info_overflow = 2131558477;
- // aapt resource value: 0x7f0a002a
- public const int touch_fingerprint_sensor_hint = 2131361834;
+ // aapt resource value: 0x7F0D004E
+ public const int touch_fingerprint_sensor_hint = 2131558478;
static String()
{
@@ -4226,1205 +4208,1205 @@
public partial class Style
{
- // aapt resource value: 0x7f0b009d
- public const int AlertDialog_AppCompat = 2131427485;
+ // aapt resource value: 0x7F0E0000
+ public const int AlertDialog_AppCompat = 2131623936;
- // aapt resource value: 0x7f0b009e
- public const int AlertDialog_AppCompat_Light = 2131427486;
+ // aapt resource value: 0x7F0E0001
+ public const int AlertDialog_AppCompat_Light = 2131623937;
- // aapt resource value: 0x7f0b009f
- public const int Animation_AppCompat_Dialog = 2131427487;
+ // aapt resource value: 0x7F0E0002
+ public const int Animation_AppCompat_Dialog = 2131623938;
- // aapt resource value: 0x7f0b00a0
- public const int Animation_AppCompat_DropDownUp = 2131427488;
+ // aapt resource value: 0x7F0E0003
+ public const int Animation_AppCompat_DropDownUp = 2131623939;
- // aapt resource value: 0x7f0b00a1
- public const int Animation_AppCompat_Tooltip = 2131427489;
+ // aapt resource value: 0x7F0E0004
+ public const int Animation_AppCompat_Tooltip = 2131623940;
- // aapt resource value: 0x7f0b0169
- public const int Animation_Design_BottomSheetDialog = 2131427689;
+ // aapt resource value: 0x7F0E0005
+ public const int Animation_Design_BottomSheetDialog = 2131623941;
- // aapt resource value: 0x7f0b00a2
- public const int Base_AlertDialog_AppCompat = 2131427490;
+ // aapt resource value: 0x7F0E0006
+ public const int Base_AlertDialog_AppCompat = 2131623942;
- // aapt resource value: 0x7f0b00a3
- public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+ // aapt resource value: 0x7F0E0007
+ public const int Base_AlertDialog_AppCompat_Light = 2131623943;
- // aapt resource value: 0x7f0b00a4
- public const int Base_Animation_AppCompat_Dialog = 2131427492;
+ // aapt resource value: 0x7F0E0008
+ public const int Base_Animation_AppCompat_Dialog = 2131623944;
- // aapt resource value: 0x7f0b00a5
- public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+ // aapt resource value: 0x7F0E0009
+ public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
- // aapt resource value: 0x7f0b00a6
- public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+ // aapt resource value: 0x7F0E000A
+ public const int Base_Animation_AppCompat_Tooltip = 2131623946;
- // aapt resource value: 0x7f0b00a7
- public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+ // aapt resource value: 0x7F0E000C
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
- // aapt resource value: 0x7f0b00a8
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+ // aapt resource value: 0x7F0E000B
+ public const int Base_DialogWindowTitle_AppCompat = 2131623947;
- // aapt resource value: 0x7f0b0039
- public const int Base_TextAppearance_AppCompat = 2131427385;
+ // aapt resource value: 0x7F0E000D
+ public const int Base_TextAppearance_AppCompat = 2131623949;
- // aapt resource value: 0x7f0b003a
- public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+ // aapt resource value: 0x7F0E000E
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
- // aapt resource value: 0x7f0b003b
- public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+ // aapt resource value: 0x7F0E000F
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
- // aapt resource value: 0x7f0b0027
- public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+ // aapt resource value: 0x7F0E0010
+ public const int Base_TextAppearance_AppCompat_Button = 2131623952;
- // aapt resource value: 0x7f0b003c
- public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+ // aapt resource value: 0x7F0E0011
+ public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
- // aapt resource value: 0x7f0b003d
- public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+ // aapt resource value: 0x7F0E0012
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
- // aapt resource value: 0x7f0b003e
- public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+ // aapt resource value: 0x7F0E0013
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
- // aapt resource value: 0x7f0b003f
- public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+ // aapt resource value: 0x7F0E0014
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
- // aapt resource value: 0x7f0b0040
- public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+ // aapt resource value: 0x7F0E0015
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
- // aapt resource value: 0x7f0b0041
- public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+ // aapt resource value: 0x7F0E0016
+ public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
- // aapt resource value: 0x7f0b000b
- public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+ // aapt resource value: 0x7F0E0017
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
- // aapt resource value: 0x7f0b0042
- public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+ // aapt resource value: 0x7F0E0018
+ public const int Base_TextAppearance_AppCompat_Large = 2131623960;
- // aapt resource value: 0x7f0b000c
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+ // aapt resource value: 0x7F0E0019
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
- // aapt resource value: 0x7f0b0043
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+ // aapt resource value: 0x7F0E001A
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
- // aapt resource value: 0x7f0b0044
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+ // aapt resource value: 0x7F0E001B
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
- // aapt resource value: 0x7f0b0045
- public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+ // aapt resource value: 0x7F0E001C
+ public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
- // aapt resource value: 0x7f0b000d
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+ // aapt resource value: 0x7F0E001D
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
- // aapt resource value: 0x7f0b0046
- public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+ // aapt resource value: 0x7F0E001E
+ public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
- // aapt resource value: 0x7f0b00a9
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+ // aapt resource value: 0x7F0E001F
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
- // aapt resource value: 0x7f0b0047
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+ // aapt resource value: 0x7F0E0020
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
- // aapt resource value: 0x7f0b0048
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+ // aapt resource value: 0x7F0E0021
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
- // aapt resource value: 0x7f0b0049
- public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+ // aapt resource value: 0x7F0E0022
+ public const int Base_TextAppearance_AppCompat_Small = 2131623970;
- // aapt resource value: 0x7f0b000e
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+ // aapt resource value: 0x7F0E0023
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
- // aapt resource value: 0x7f0b004a
- public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+ // aapt resource value: 0x7F0E0024
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
- // aapt resource value: 0x7f0b000f
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+ // aapt resource value: 0x7F0E0025
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
- // aapt resource value: 0x7f0b004b
- public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+ // aapt resource value: 0x7F0E0026
+ public const int Base_TextAppearance_AppCompat_Title = 2131623974;
- // aapt resource value: 0x7f0b0010
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+ // aapt resource value: 0x7F0E0027
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
- // aapt resource value: 0x7f0b00aa
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+ // aapt resource value: 0x7F0E0028
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
- // aapt resource value: 0x7f0b008e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+ // aapt resource value: 0x7F0E0029
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
- // aapt resource value: 0x7f0b004c
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+ // aapt resource value: 0x7F0E002A
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
- // aapt resource value: 0x7f0b004d
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+ // aapt resource value: 0x7F0E002B
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
- // aapt resource value: 0x7f0b004e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+ // aapt resource value: 0x7F0E002C
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
- // aapt resource value: 0x7f0b004f
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+ // aapt resource value: 0x7F0E002D
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
- // aapt resource value: 0x7f0b0050
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+ // aapt resource value: 0x7F0E002E
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
- // aapt resource value: 0x7f0b0051
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+ // aapt resource value: 0x7F0E002F
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
- // aapt resource value: 0x7f0b0052
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+ // aapt resource value: 0x7F0E0030
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
- // aapt resource value: 0x7f0b0095
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+ // aapt resource value: 0x7F0E0031
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
- // aapt resource value: 0x7f0b0096
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+ // aapt resource value: 0x7F0E0032
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
- // aapt resource value: 0x7f0b008f
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+ // aapt resource value: 0x7F0E0033
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
- // aapt resource value: 0x7f0b00ab
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+ // aapt resource value: 0x7F0E0034
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
- // aapt resource value: 0x7f0b0053
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+ // aapt resource value: 0x7F0E0035
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
- // aapt resource value: 0x7f0b0054
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+ // aapt resource value: 0x7F0E0036
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
- // aapt resource value: 0x7f0b0055
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+ // aapt resource value: 0x7F0E0037
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
- // aapt resource value: 0x7f0b0056
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+ // aapt resource value: 0x7F0E0038
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
- // aapt resource value: 0x7f0b0057
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+ // aapt resource value: 0x7F0E0039
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
- // aapt resource value: 0x7f0b00ac
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+ // aapt resource value: 0x7F0E003A
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
- // aapt resource value: 0x7f0b0058
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+ // aapt resource value: 0x7F0E003B
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
- // aapt resource value: 0x7f0b0059
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+ // aapt resource value: 0x7F0E003C
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
- // aapt resource value: 0x7f0b005a
- public const int Base_Theme_AppCompat = 2131427418;
+ // aapt resource value: 0x7F0E004B
+ public const int Base_ThemeOverlay_AppCompat = 2131624011;
- // aapt resource value: 0x7f0b00ad
- public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+ // aapt resource value: 0x7F0E004C
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
- // aapt resource value: 0x7f0b0011
- public const int Base_Theme_AppCompat_Dialog = 2131427345;
+ // aapt resource value: 0x7F0E004D
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
- // aapt resource value: 0x7f0b0012
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+ // aapt resource value: 0x7F0E004E
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
- // aapt resource value: 0x7f0b00ae
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+ // aapt resource value: 0x7F0E004F
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
- // aapt resource value: 0x7f0b0013
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+ // aapt resource value: 0x7F0E0050
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
- // aapt resource value: 0x7f0b0001
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+ // aapt resource value: 0x7F0E0051
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
- // aapt resource value: 0x7f0b005b
- public const int Base_Theme_AppCompat_Light = 2131427419;
+ // aapt resource value: 0x7F0E003D
+ public const int Base_Theme_AppCompat = 2131623997;
- // aapt resource value: 0x7f0b00af
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+ // aapt resource value: 0x7F0E003E
+ public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
- // aapt resource value: 0x7f0b0014
- public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+ // aapt resource value: 0x7F0E003F
+ public const int Base_Theme_AppCompat_Dialog = 2131623999;
- // aapt resource value: 0x7f0b0015
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+ // aapt resource value: 0x7F0E0043
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
- // aapt resource value: 0x7f0b00b0
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+ // aapt resource value: 0x7F0E0040
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
- // aapt resource value: 0x7f0b0016
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+ // aapt resource value: 0x7F0E0041
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
- // aapt resource value: 0x7f0b0002
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+ // aapt resource value: 0x7F0E0042
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
- // aapt resource value: 0x7f0b00b1
- public const int Base_ThemeOverlay_AppCompat = 2131427505;
+ // aapt resource value: 0x7F0E0044
+ public const int Base_Theme_AppCompat_Light = 2131624004;
- // aapt resource value: 0x7f0b00b2
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+ // aapt resource value: 0x7F0E0045
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
- // aapt resource value: 0x7f0b00b3
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+ // aapt resource value: 0x7F0E0046
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
- // aapt resource value: 0x7f0b00b4
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+ // aapt resource value: 0x7F0E004A
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
- // aapt resource value: 0x7f0b0017
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+ // aapt resource value: 0x7F0E0047
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
- // aapt resource value: 0x7f0b0018
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+ // aapt resource value: 0x7F0E0048
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
- // aapt resource value: 0x7f0b00b5
- public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+ // aapt resource value: 0x7F0E0049
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
- // aapt resource value: 0x7f0b0019
- public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+ // aapt resource value: 0x7F0E0054
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
- // aapt resource value: 0x7f0b001a
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+ // aapt resource value: 0x7F0E0052
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
- // aapt resource value: 0x7f0b001b
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+ // aapt resource value: 0x7F0E0053
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
- // aapt resource value: 0x7f0b0023
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+ // aapt resource value: 0x7F0E0055
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
- // aapt resource value: 0x7f0b0024
- public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+ // aapt resource value: 0x7F0E0056
+ public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
- // aapt resource value: 0x7f0b016a
- public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+ // aapt resource value: 0x7F0E0057
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
- // aapt resource value: 0x7f0b005c
- public const int Base_V21_Theme_AppCompat = 2131427420;
+ // aapt resource value: 0x7F0E005C
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
- // aapt resource value: 0x7f0b005d
- public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+ // aapt resource value: 0x7F0E0058
+ public const int Base_V21_Theme_AppCompat = 2131624024;
- // aapt resource value: 0x7f0b005e
- public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+ // aapt resource value: 0x7F0E0059
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
- // aapt resource value: 0x7f0b005f
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+ // aapt resource value: 0x7F0E005A
+ public const int Base_V21_Theme_AppCompat_Light = 2131624026;
- // aapt resource value: 0x7f0b0060
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+ // aapt resource value: 0x7F0E005B
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
- // aapt resource value: 0x7f0b0166
- public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+ // aapt resource value: 0x7F0E005D
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
- // aapt resource value: 0x7f0b008c
- public const int Base_V22_Theme_AppCompat = 2131427468;
+ // aapt resource value: 0x7F0E005E
+ public const int Base_V22_Theme_AppCompat = 2131624030;
- // aapt resource value: 0x7f0b008d
- public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+ // aapt resource value: 0x7F0E005F
+ public const int Base_V22_Theme_AppCompat_Light = 2131624031;
- // aapt resource value: 0x7f0b0090
- public const int Base_V23_Theme_AppCompat = 2131427472;
+ // aapt resource value: 0x7F0E0060
+ public const int Base_V23_Theme_AppCompat = 2131624032;
- // aapt resource value: 0x7f0b0091
- public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+ // aapt resource value: 0x7F0E0061
+ public const int Base_V23_Theme_AppCompat_Light = 2131624033;
- // aapt resource value: 0x7f0b0099
- public const int Base_V26_Theme_AppCompat = 2131427481;
+ // aapt resource value: 0x7F0E0062
+ public const int Base_V26_Theme_AppCompat = 2131624034;
- // aapt resource value: 0x7f0b009a
- public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+ // aapt resource value: 0x7F0E0063
+ public const int Base_V26_Theme_AppCompat_Light = 2131624035;
- // aapt resource value: 0x7f0b009b
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+ // aapt resource value: 0x7F0E0064
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
- // aapt resource value: 0x7f0b0168
- public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+ // aapt resource value: 0x7F0E0065
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
- // aapt resource value: 0x7f0b00b6
- public const int Base_V7_Theme_AppCompat = 2131427510;
+ // aapt resource value: 0x7F0E006A
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
- // aapt resource value: 0x7f0b00b7
- public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+ // aapt resource value: 0x7F0E0066
+ public const int Base_V7_Theme_AppCompat = 2131624038;
- // aapt resource value: 0x7f0b00b8
- public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+ // aapt resource value: 0x7F0E0067
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
- // aapt resource value: 0x7f0b00b9
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+ // aapt resource value: 0x7F0E0068
+ public const int Base_V7_Theme_AppCompat_Light = 2131624040;
- // aapt resource value: 0x7f0b00ba
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+ // aapt resource value: 0x7F0E0069
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
- // aapt resource value: 0x7f0b00bb
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+ // aapt resource value: 0x7F0E006B
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
- // aapt resource value: 0x7f0b00bc
- public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+ // aapt resource value: 0x7F0E006C
+ public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
- // aapt resource value: 0x7f0b00bd
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+ // aapt resource value: 0x7F0E006D
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
- // aapt resource value: 0x7f0b00be
- public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+ // aapt resource value: 0x7F0E006E
+ public const int Base_Widget_AppCompat_ActionBar = 2131624046;
- // aapt resource value: 0x7f0b00bf
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+ // aapt resource value: 0x7F0E006F
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
- // aapt resource value: 0x7f0b00c0
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+ // aapt resource value: 0x7F0E0070
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
- // aapt resource value: 0x7f0b0061
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+ // aapt resource value: 0x7F0E0071
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
- // aapt resource value: 0x7f0b0062
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+ // aapt resource value: 0x7F0E0072
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
- // aapt resource value: 0x7f0b0063
- public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+ // aapt resource value: 0x7F0E0073
+ public const int Base_Widget_AppCompat_ActionButton = 2131624051;
- // aapt resource value: 0x7f0b0064
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+ // aapt resource value: 0x7F0E0074
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
- // aapt resource value: 0x7f0b0065
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+ // aapt resource value: 0x7F0E0075
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
- // aapt resource value: 0x7f0b00c1
- public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+ // aapt resource value: 0x7F0E0076
+ public const int Base_Widget_AppCompat_ActionMode = 2131624054;
- // aapt resource value: 0x7f0b00c2
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+ // aapt resource value: 0x7F0E0077
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
- // aapt resource value: 0x7f0b0025
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+ // aapt resource value: 0x7F0E0078
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
- // aapt resource value: 0x7f0b0066
- public const int Base_Widget_AppCompat_Button = 2131427430;
+ // aapt resource value: 0x7F0E0079
+ public const int Base_Widget_AppCompat_Button = 2131624057;
- // aapt resource value: 0x7f0b0067
- public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+ // aapt resource value: 0x7F0E007F
+ public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
- // aapt resource value: 0x7f0b0068
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+ // aapt resource value: 0x7F0E0080
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
- // aapt resource value: 0x7f0b00c3
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+ // aapt resource value: 0x7F0E007A
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
- // aapt resource value: 0x7f0b0092
- public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+ // aapt resource value: 0x7F0E007B
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
- // aapt resource value: 0x7f0b0069
- public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+ // aapt resource value: 0x7F0E007C
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
- // aapt resource value: 0x7f0b006a
- public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+ // aapt resource value: 0x7F0E007D
+ public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
- // aapt resource value: 0x7f0b00c4
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+ // aapt resource value: 0x7F0E007E
+ public const int Base_Widget_AppCompat_Button_Small = 2131624062;
- // aapt resource value: 0x7f0b006b
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+ // aapt resource value: 0x7F0E0081
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
- // aapt resource value: 0x7f0b006c
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+ // aapt resource value: 0x7F0E0082
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
- // aapt resource value: 0x7f0b00c5
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+ // aapt resource value: 0x7F0E0083
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
- // aapt resource value: 0x7f0b0000
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+ // aapt resource value: 0x7F0E0084
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
- // aapt resource value: 0x7f0b00c6
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+ // aapt resource value: 0x7F0E0085
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
- // aapt resource value: 0x7f0b006d
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+ // aapt resource value: 0x7F0E0086
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
- // aapt resource value: 0x7f0b0026
- public const int Base_Widget_AppCompat_EditText = 2131427366;
+ // aapt resource value: 0x7F0E0087
+ public const int Base_Widget_AppCompat_EditText = 2131624071;
- // aapt resource value: 0x7f0b006e
- public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+ // aapt resource value: 0x7F0E0088
+ public const int Base_Widget_AppCompat_ImageButton = 2131624072;
- // aapt resource value: 0x7f0b00c7
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+ // aapt resource value: 0x7F0E0089
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
- // aapt resource value: 0x7f0b00c8
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+ // aapt resource value: 0x7F0E008A
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
- // aapt resource value: 0x7f0b00c9
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+ // aapt resource value: 0x7F0E008B
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
- // aapt resource value: 0x7f0b006f
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+ // aapt resource value: 0x7F0E008C
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
- // aapt resource value: 0x7f0b0070
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+ // aapt resource value: 0x7F0E008D
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
- // aapt resource value: 0x7f0b0071
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+ // aapt resource value: 0x7F0E008E
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
- // aapt resource value: 0x7f0b0072
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+ // aapt resource value: 0x7F0E008F
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
- // aapt resource value: 0x7f0b0073
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+ // aapt resource value: 0x7F0E0090
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
- // aapt resource value: 0x7f0b00ca
- public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+ // aapt resource value: 0x7F0E0091
+ public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
- // aapt resource value: 0x7f0b0074
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+ // aapt resource value: 0x7F0E0092
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
- // aapt resource value: 0x7f0b0075
- public const int Base_Widget_AppCompat_ListView = 2131427445;
+ // aapt resource value: 0x7F0E0093
+ public const int Base_Widget_AppCompat_ListView = 2131624083;
- // aapt resource value: 0x7f0b0076
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+ // aapt resource value: 0x7F0E0094
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
- // aapt resource value: 0x7f0b0077
- public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+ // aapt resource value: 0x7F0E0095
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
- // aapt resource value: 0x7f0b0078
- public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+ // aapt resource value: 0x7F0E0096
+ public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
- // aapt resource value: 0x7f0b0079
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+ // aapt resource value: 0x7F0E0097
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
- // aapt resource value: 0x7f0b00cb
- public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+ // aapt resource value: 0x7F0E0098
+ public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
- // aapt resource value: 0x7f0b001c
- public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+ // aapt resource value: 0x7F0E0099
+ public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
- // aapt resource value: 0x7f0b001d
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+ // aapt resource value: 0x7F0E009A
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
- // aapt resource value: 0x7f0b007a
- public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+ // aapt resource value: 0x7F0E009B
+ public const int Base_Widget_AppCompat_RatingBar = 2131624091;
- // aapt resource value: 0x7f0b0093
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+ // aapt resource value: 0x7F0E009C
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
- // aapt resource value: 0x7f0b0094
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+ // aapt resource value: 0x7F0E009D
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
- // aapt resource value: 0x7f0b00cc
- public const int Base_Widget_AppCompat_SearchView = 2131427532;
+ // aapt resource value: 0x7F0E009E
+ public const int Base_Widget_AppCompat_SearchView = 2131624094;
- // aapt resource value: 0x7f0b00cd
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+ // aapt resource value: 0x7F0E009F
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
- // aapt resource value: 0x7f0b007b
- public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+ // aapt resource value: 0x7F0E00A0
+ public const int Base_Widget_AppCompat_SeekBar = 2131624096;
- // aapt resource value: 0x7f0b00ce
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+ // aapt resource value: 0x7F0E00A1
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
- // aapt resource value: 0x7f0b007c
- public const int Base_Widget_AppCompat_Spinner = 2131427452;
+ // aapt resource value: 0x7F0E00A2
+ public const int Base_Widget_AppCompat_Spinner = 2131624098;
- // aapt resource value: 0x7f0b0003
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+ // aapt resource value: 0x7F0E00A3
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
- // aapt resource value: 0x7f0b007d
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+ // aapt resource value: 0x7F0E00A4
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
- // aapt resource value: 0x7f0b009c
- public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+ // aapt resource value: 0x7F0E00A5
+ public const int Base_Widget_AppCompat_Toolbar = 2131624101;
- // aapt resource value: 0x7f0b007e
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+ // aapt resource value: 0x7F0E00A6
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
- // aapt resource value: 0x7f0b0167
- public const int Base_Widget_Design_AppBarLayout = 2131427687;
+ // aapt resource value: 0x7F0E00A7
+ public const int Base_Widget_Design_AppBarLayout = 2131624103;
- // aapt resource value: 0x7f0b016b
- public const int Base_Widget_Design_TabLayout = 2131427691;
+ // aapt resource value: 0x7F0E00A8
+ public const int Base_Widget_Design_TabLayout = 2131624104;
- // aapt resource value: 0x7f0b018a
- public const int BottomSheetDialogAnimation = 2131427722;
+ // aapt resource value: 0x7F0E00A9
+ public const int BottomSheetDialogAnimation = 2131624105;
- // aapt resource value: 0x7f0b018f
- public const int MyTheme = 2131427727;
+ // aapt resource value: 0x7F0E018D
+ public const int custom_dialog2 = 2131624333;
- // aapt resource value: 0x7f0b001e
- public const int Platform_AppCompat = 2131427358;
+ // aapt resource value: 0x7F0E00AA
+ public const int MyTheme = 2131624106;
- // aapt resource value: 0x7f0b001f
- public const int Platform_AppCompat_Light = 2131427359;
+ // aapt resource value: 0x7F0E018E
+ public const int picker_view_scale_anim = 2131624334;
- // aapt resource value: 0x7f0b007f
- public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+ // aapt resource value: 0x7F0E018F
+ public const int picker_view_slide_anim = 2131624335;
- // aapt resource value: 0x7f0b0080
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+ // aapt resource value: 0x7F0E00AB
+ public const int Platform_AppCompat = 2131624107;
- // aapt resource value: 0x7f0b0081
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+ // aapt resource value: 0x7F0E00AC
+ public const int Platform_AppCompat_Light = 2131624108;
- // aapt resource value: 0x7f0b0020
- public const int Platform_V11_AppCompat = 2131427360;
+ // aapt resource value: 0x7F0E00AD
+ public const int Platform_ThemeOverlay_AppCompat = 2131624109;
- // aapt resource value: 0x7f0b0021
- public const int Platform_V11_AppCompat_Light = 2131427361;
+ // aapt resource value: 0x7F0E00AE
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
- // aapt resource value: 0x7f0b0028
- public const int Platform_V14_AppCompat = 2131427368;
+ // aapt resource value: 0x7F0E00AF
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
- // aapt resource value: 0x7f0b0029
- public const int Platform_V14_AppCompat_Light = 2131427369;
+ // aapt resource value: 0x7F0E00B0
+ public const int Platform_V11_AppCompat = 2131624112;
- // aapt resource value: 0x7f0b0082
- public const int Platform_V21_AppCompat = 2131427458;
+ // aapt resource value: 0x7F0E00B1
+ public const int Platform_V11_AppCompat_Light = 2131624113;
- // aapt resource value: 0x7f0b0083
- public const int Platform_V21_AppCompat_Light = 2131427459;
+ // aapt resource value: 0x7F0E00B2
+ public const int Platform_V14_AppCompat = 2131624114;
- // aapt resource value: 0x7f0b0097
- public const int Platform_V25_AppCompat = 2131427479;
+ // aapt resource value: 0x7F0E00B3
+ public const int Platform_V14_AppCompat_Light = 2131624115;
- // aapt resource value: 0x7f0b0098
- public const int Platform_V25_AppCompat_Light = 2131427480;
+ // aapt resource value: 0x7F0E00B4
+ public const int Platform_V21_AppCompat = 2131624116;
- // aapt resource value: 0x7f0b0022
- public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+ // aapt resource value: 0x7F0E00B5
+ public const int Platform_V21_AppCompat_Light = 2131624117;
- // aapt resource value: 0x7f0b002b
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+ // aapt resource value: 0x7F0E00B6
+ public const int Platform_V25_AppCompat = 2131624118;
- // aapt resource value: 0x7f0b002c
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+ // aapt resource value: 0x7F0E00B7
+ public const int Platform_V25_AppCompat_Light = 2131624119;
- // aapt resource value: 0x7f0b002d
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+ // aapt resource value: 0x7F0E00B8
+ public const int Platform_Widget_AppCompat_Spinner = 2131624120;
- // aapt resource value: 0x7f0b002e
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+ // aapt resource value: 0x7F0E00B9
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
- // aapt resource value: 0x7f0b002f
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+ // aapt resource value: 0x7F0E00BA
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
- // aapt resource value: 0x7f0b0030
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+ // aapt resource value: 0x7F0E00BB
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
- // aapt resource value: 0x7f0b0031
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+ // aapt resource value: 0x7F0E00BC
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
- // aapt resource value: 0x7f0b0032
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+ // aapt resource value: 0x7F0E00BD
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
- // aapt resource value: 0x7f0b0033
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+ // aapt resource value: 0x7F0E00BE
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
- // aapt resource value: 0x7f0b0034
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+ // aapt resource value: 0x7F0E00C4
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
- // aapt resource value: 0x7f0b0035
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+ // aapt resource value: 0x7F0E00BF
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
- // aapt resource value: 0x7f0b0036
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+ // aapt resource value: 0x7F0E00C0
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
- // aapt resource value: 0x7f0b0037
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+ // aapt resource value: 0x7F0E00C1
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
- // aapt resource value: 0x7f0b0038
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+ // aapt resource value: 0x7F0E00C2
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
- // aapt resource value: 0x7f0b00cf
- public const int TextAppearance_AppCompat = 2131427535;
+ // aapt resource value: 0x7F0E00C3
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
- // aapt resource value: 0x7f0b00d0
- public const int TextAppearance_AppCompat_Body1 = 2131427536;
+ // aapt resource value: 0x7F0E00C5
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
- // aapt resource value: 0x7f0b00d1
- public const int TextAppearance_AppCompat_Body2 = 2131427537;
+ // aapt resource value: 0x7F0E00C6
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
- // aapt resource value: 0x7f0b00d2
- public const int TextAppearance_AppCompat_Button = 2131427538;
+ // aapt resource value: 0x7F0E00C7
+ public const int TextAppearance_AppCompat = 2131624135;
- // aapt resource value: 0x7f0b00d3
- public const int TextAppearance_AppCompat_Caption = 2131427539;
+ // aapt resource value: 0x7F0E00C8
+ public const int TextAppearance_AppCompat_Body1 = 2131624136;
- // aapt resource value: 0x7f0b00d4
- public const int TextAppearance_AppCompat_Display1 = 2131427540;
+ // aapt resource value: 0x7F0E00C9
+ public const int TextAppearance_AppCompat_Body2 = 2131624137;
- // aapt resource value: 0x7f0b00d5
- public const int TextAppearance_AppCompat_Display2 = 2131427541;
+ // aapt resource value: 0x7F0E00CA
+ public const int TextAppearance_AppCompat_Button = 2131624138;
- // aapt resource value: 0x7f0b00d6
- public const int TextAppearance_AppCompat_Display3 = 2131427542;
+ // aapt resource value: 0x7F0E00CB
+ public const int TextAppearance_AppCompat_Caption = 2131624139;
- // aapt resource value: 0x7f0b00d7
- public const int TextAppearance_AppCompat_Display4 = 2131427543;
+ // aapt resource value: 0x7F0E00CC
+ public const int TextAppearance_AppCompat_Display1 = 2131624140;
- // aapt resource value: 0x7f0b00d8
- public const int TextAppearance_AppCompat_Headline = 2131427544;
+ // aapt resource value: 0x7F0E00CD
+ public const int TextAppearance_AppCompat_Display2 = 2131624141;
- // aapt resource value: 0x7f0b00d9
- public const int TextAppearance_AppCompat_Inverse = 2131427545;
+ // aapt resource value: 0x7F0E00CE
+ public const int TextAppearance_AppCompat_Display3 = 2131624142;
- // aapt resource value: 0x7f0b00da
- public const int TextAppearance_AppCompat_Large = 2131427546;
+ // aapt resource value: 0x7F0E00CF
+ public const int TextAppearance_AppCompat_Display4 = 2131624143;
- // aapt resource value: 0x7f0b00db
- public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+ // aapt resource value: 0x7F0E00D0
+ public const int TextAppearance_AppCompat_Headline = 2131624144;
- // aapt resource value: 0x7f0b00dc
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+ // aapt resource value: 0x7F0E00D1
+ public const int TextAppearance_AppCompat_Inverse = 2131624145;
- // aapt resource value: 0x7f0b00dd
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+ // aapt resource value: 0x7F0E00D2
+ public const int TextAppearance_AppCompat_Large = 2131624146;
- // aapt resource value: 0x7f0b00de
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+ // aapt resource value: 0x7F0E00D3
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
- // aapt resource value: 0x7f0b00df
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+ // aapt resource value: 0x7F0E00D4
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
- // aapt resource value: 0x7f0b00e0
- public const int TextAppearance_AppCompat_Medium = 2131427552;
+ // aapt resource value: 0x7F0E00D5
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
- // aapt resource value: 0x7f0b00e1
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+ // aapt resource value: 0x7F0E00D6
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
- // aapt resource value: 0x7f0b00e2
- public const int TextAppearance_AppCompat_Menu = 2131427554;
+ // aapt resource value: 0x7F0E00D7
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
- // aapt resource value: 0x7f0b0084
- public const int TextAppearance_AppCompat_Notification = 2131427460;
+ // aapt resource value: 0x7F0E00D8
+ public const int TextAppearance_AppCompat_Medium = 2131624152;
- // aapt resource value: 0x7f0b0085
- public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+ // aapt resource value: 0x7F0E00D9
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
- // aapt resource value: 0x7f0b0086
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+ // aapt resource value: 0x7F0E00DA
+ public const int TextAppearance_AppCompat_Menu = 2131624154;
- // aapt resource value: 0x7f0b00e3
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+ // aapt resource value: 0x7F0E00DB
+ public const int TextAppearance_AppCompat_Notification = 2131624155;
- // aapt resource value: 0x7f0b00e4
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+ // aapt resource value: 0x7F0E00DC
+ public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
- // aapt resource value: 0x7f0b0087
- public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+ // aapt resource value: 0x7F0E00DD
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
- // aapt resource value: 0x7f0b0088
- public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+ // aapt resource value: 0x7F0E00DE
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
- // aapt resource value: 0x7f0b0089
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+ // aapt resource value: 0x7F0E00DF
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
- // aapt resource value: 0x7f0b008a
- public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+ // aapt resource value: 0x7F0E00E0
+ public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
- // aapt resource value: 0x7f0b008b
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+ // aapt resource value: 0x7F0E00E1
+ public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
- // aapt resource value: 0x7f0b00e5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+ // aapt resource value: 0x7F0E00E2
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
- // aapt resource value: 0x7f0b00e6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+ // aapt resource value: 0x7F0E00E3
+ public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
- // aapt resource value: 0x7f0b00e7
- public const int TextAppearance_AppCompat_Small = 2131427559;
+ // aapt resource value: 0x7F0E00E4
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
- // aapt resource value: 0x7f0b00e8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+ // aapt resource value: 0x7F0E00E5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
- // aapt resource value: 0x7f0b00e9
- public const int TextAppearance_AppCompat_Subhead = 2131427561;
+ // aapt resource value: 0x7F0E00E6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
- // aapt resource value: 0x7f0b00ea
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+ // aapt resource value: 0x7F0E00E7
+ public const int TextAppearance_AppCompat_Small = 2131624167;
- // aapt resource value: 0x7f0b00eb
- public const int TextAppearance_AppCompat_Title = 2131427563;
+ // aapt resource value: 0x7F0E00E8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
- // aapt resource value: 0x7f0b00ec
- public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+ // aapt resource value: 0x7F0E00E9
+ public const int TextAppearance_AppCompat_Subhead = 2131624169;
- // aapt resource value: 0x7f0b002a
- public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+ // aapt resource value: 0x7F0E00EA
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
- // aapt resource value: 0x7f0b00ed
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+ // aapt resource value: 0x7F0E00EB
+ public const int TextAppearance_AppCompat_Title = 2131624171;
- // aapt resource value: 0x7f0b00ee
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+ // aapt resource value: 0x7F0E00EC
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
- // aapt resource value: 0x7f0b00ef
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+ // aapt resource value: 0x7F0E00ED
+ public const int TextAppearance_AppCompat_Tooltip = 2131624173;
- // aapt resource value: 0x7f0b00f0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+ // aapt resource value: 0x7F0E00EE
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
- // aapt resource value: 0x7f0b00f1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+ // aapt resource value: 0x7F0E00EF
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
- // aapt resource value: 0x7f0b00f2
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+ // aapt resource value: 0x7F0E00F0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
- // aapt resource value: 0x7f0b00f3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+ // aapt resource value: 0x7F0E00F1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
- // aapt resource value: 0x7f0b00f4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+ // aapt resource value: 0x7F0E00F2
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
- // aapt resource value: 0x7f0b00f5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+ // aapt resource value: 0x7F0E00F3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
- // aapt resource value: 0x7f0b00f6
- public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+ // aapt resource value: 0x7F0E00F4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
- // aapt resource value: 0x7f0b00f7
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+ // aapt resource value: 0x7F0E00F5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
- // aapt resource value: 0x7f0b00f8
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+ // aapt resource value: 0x7F0E00F6
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
- // aapt resource value: 0x7f0b00f9
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+ // aapt resource value: 0x7F0E00F7
+ public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
- // aapt resource value: 0x7f0b00fa
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+ // aapt resource value: 0x7F0E00F8
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
- // aapt resource value: 0x7f0b00fb
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+ // aapt resource value: 0x7F0E00F9
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
- // aapt resource value: 0x7f0b00fc
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+ // aapt resource value: 0x7F0E00FA
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
- // aapt resource value: 0x7f0b00fd
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+ // aapt resource value: 0x7F0E00FB
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
- // aapt resource value: 0x7f0b00fe
- public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+ // aapt resource value: 0x7F0E00FC
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
- // aapt resource value: 0x7f0b00ff
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+ // aapt resource value: 0x7F0E00FD
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
- // aapt resource value: 0x7f0b0183
- public const int TextAppearance_Compat_Notification = 2131427715;
+ // aapt resource value: 0x7F0E00FE
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
- // aapt resource value: 0x7f0b0184
- public const int TextAppearance_Compat_Notification_Info = 2131427716;
+ // aapt resource value: 0x7F0E00FF
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
- // aapt resource value: 0x7f0b0160
- public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+ // aapt resource value: 0x7F0E0100
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
- // aapt resource value: 0x7f0b0189
- public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+ // aapt resource value: 0x7F0E0101
+ public const int TextAppearance_Compat_Notification = 2131624193;
- // aapt resource value: 0x7f0b0164
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+ // aapt resource value: 0x7F0E0102
+ public const int TextAppearance_Compat_Notification_Info = 2131624194;
- // aapt resource value: 0x7f0b0161
- public const int TextAppearance_Compat_Notification_Media = 2131427681;
+ // aapt resource value: 0x7F0E0103
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
- // aapt resource value: 0x7f0b0185
- public const int TextAppearance_Compat_Notification_Time = 2131427717;
+ // aapt resource value: 0x7F0E0104
+ public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
- // aapt resource value: 0x7f0b0162
- public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+ // aapt resource value: 0x7F0E0105
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
- // aapt resource value: 0x7f0b0186
- public const int TextAppearance_Compat_Notification_Title = 2131427718;
+ // aapt resource value: 0x7F0E0106
+ public const int TextAppearance_Compat_Notification_Media = 2131624198;
- // aapt resource value: 0x7f0b0163
- public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+ // aapt resource value: 0x7F0E0107
+ public const int TextAppearance_Compat_Notification_Time = 2131624199;
- // aapt resource value: 0x7f0b016c
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+ // aapt resource value: 0x7F0E0108
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
- // aapt resource value: 0x7f0b016d
- public const int TextAppearance_Design_Counter = 2131427693;
+ // aapt resource value: 0x7F0E0109
+ public const int TextAppearance_Compat_Notification_Title = 2131624201;
- // aapt resource value: 0x7f0b016e
- public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+ // aapt resource value: 0x7F0E010A
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
- // aapt resource value: 0x7f0b016f
- public const int TextAppearance_Design_Error = 2131427695;
+ // aapt resource value: 0x7F0E010B
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
- // aapt resource value: 0x7f0b0170
- public const int TextAppearance_Design_Hint = 2131427696;
+ // aapt resource value: 0x7F0E010C
+ public const int TextAppearance_Design_Counter = 2131624204;
- // aapt resource value: 0x7f0b0171
- public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+ // aapt resource value: 0x7F0E010D
+ public const int TextAppearance_Design_Counter_Overflow = 2131624205;
- // aapt resource value: 0x7f0b0172
- public const int TextAppearance_Design_Tab = 2131427698;
+ // aapt resource value: 0x7F0E010E
+ public const int TextAppearance_Design_Error = 2131624206;
- // aapt resource value: 0x7f0b0100
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+ // aapt resource value: 0x7F0E010F
+ public const int TextAppearance_Design_Hint = 2131624207;
- // aapt resource value: 0x7f0b0101
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+ // aapt resource value: 0x7F0E0110
+ public const int TextAppearance_Design_Snackbar_Message = 2131624208;
- // aapt resource value: 0x7f0b0102
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+ // aapt resource value: 0x7F0E0111
+ public const int TextAppearance_Design_Tab = 2131624209;
- // aapt resource value: 0x7f0b0103
- public const int Theme_AppCompat = 2131427587;
+ // aapt resource value: 0x7F0E0112
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
- // aapt resource value: 0x7f0b0104
- public const int Theme_AppCompat_CompactMenu = 2131427588;
+ // aapt resource value: 0x7F0E0113
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
- // aapt resource value: 0x7f0b0004
- public const int Theme_AppCompat_DayNight = 2131427332;
+ // aapt resource value: 0x7F0E0114
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
- // aapt resource value: 0x7f0b0005
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+ // aapt resource value: 0x7F0E0131
+ public const int ThemeOverlay_AppCompat = 2131624241;
- // aapt resource value: 0x7f0b0006
- public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+ // aapt resource value: 0x7F0E0132
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
- // aapt resource value: 0x7f0b0007
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+ // aapt resource value: 0x7F0E0133
+ public const int ThemeOverlay_AppCompat_Dark = 2131624243;
- // aapt resource value: 0x7f0b0008
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+ // aapt resource value: 0x7F0E0134
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
- // aapt resource value: 0x7f0b0009
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+ // aapt resource value: 0x7F0E0135
+ public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
- // aapt resource value: 0x7f0b000a
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+ // aapt resource value: 0x7F0E0136
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
- // aapt resource value: 0x7f0b0105
- public const int Theme_AppCompat_Dialog = 2131427589;
+ // aapt resource value: 0x7F0E0137
+ public const int ThemeOverlay_AppCompat_Light = 2131624247;
- // aapt resource value: 0x7f0b0106
- public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+ // aapt resource value: 0x7F0E0115
+ public const int Theme_AppCompat = 2131624213;
- // aapt resource value: 0x7f0b0107
- public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+ // aapt resource value: 0x7F0E0116
+ public const int Theme_AppCompat_CompactMenu = 2131624214;
- // aapt resource value: 0x7f0b0108
- public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+ // aapt resource value: 0x7F0E0117
+ public const int Theme_AppCompat_DayNight = 2131624215;
- // aapt resource value: 0x7f0b0109
- public const int Theme_AppCompat_Light = 2131427593;
+ // aapt resource value: 0x7F0E0118
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
- // aapt resource value: 0x7f0b010a
- public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+ // aapt resource value: 0x7F0E0119
+ public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
- // aapt resource value: 0x7f0b010b
- public const int Theme_AppCompat_Light_Dialog = 2131427595;
+ // aapt resource value: 0x7F0E011C
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
- // aapt resource value: 0x7f0b010c
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+ // aapt resource value: 0x7F0E011A
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
- // aapt resource value: 0x7f0b010d
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+ // aapt resource value: 0x7F0E011B
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
- // aapt resource value: 0x7f0b010e
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+ // aapt resource value: 0x7F0E011D
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
- // aapt resource value: 0x7f0b010f
- public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+ // aapt resource value: 0x7F0E011E
+ public const int Theme_AppCompat_Dialog = 2131624222;
- // aapt resource value: 0x7f0b0110
- public const int Theme_AppCompat_NoActionBar = 2131427600;
+ // aapt resource value: 0x7F0E0121
+ public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
- // aapt resource value: 0x7f0b018b
- public const int Theme_BiometricPromptDialog = 2131427723;
+ // aapt resource value: 0x7F0E011F
+ public const int Theme_AppCompat_Dialog_Alert = 2131624223;
- // aapt resource value: 0x7f0b0173
- public const int Theme_Design = 2131427699;
+ // aapt resource value: 0x7F0E0120
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
- // aapt resource value: 0x7f0b0174
- public const int Theme_Design_BottomSheetDialog = 2131427700;
+ // aapt resource value: 0x7F0E0122
+ public const int Theme_AppCompat_Light = 2131624226;
- // aapt resource value: 0x7f0b0175
- public const int Theme_Design_Light = 2131427701;
+ // aapt resource value: 0x7F0E0123
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
- // aapt resource value: 0x7f0b0176
- public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+ // aapt resource value: 0x7F0E0124
+ public const int Theme_AppCompat_Light_Dialog = 2131624228;
- // aapt resource value: 0x7f0b0177
- public const int Theme_Design_Light_NoActionBar = 2131427703;
+ // aapt resource value: 0x7F0E0127
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
- // aapt resource value: 0x7f0b0178
- public const int Theme_Design_NoActionBar = 2131427704;
+ // aapt resource value: 0x7F0E0125
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
- // aapt resource value: 0x7f0b0111
- public const int ThemeOverlay_AppCompat = 2131427601;
+ // aapt resource value: 0x7F0E0126
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
- // aapt resource value: 0x7f0b0112
- public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+ // aapt resource value: 0x7F0E0128
+ public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
- // aapt resource value: 0x7f0b0113
- public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+ // aapt resource value: 0x7F0E0129
+ public const int Theme_AppCompat_NoActionBar = 2131624233;
- // aapt resource value: 0x7f0b0114
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+ // aapt resource value: 0x7F0E012A
+ public const int Theme_BiometricPromptDialog = 2131624234;
- // aapt resource value: 0x7f0b0115
- public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+ // aapt resource value: 0x7F0E012B
+ public const int Theme_Design = 2131624235;
- // aapt resource value: 0x7f0b0116
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+ // aapt resource value: 0x7F0E012C
+ public const int Theme_Design_BottomSheetDialog = 2131624236;
- // aapt resource value: 0x7f0b0117
- public const int ThemeOverlay_AppCompat_Light = 2131427607;
+ // aapt resource value: 0x7F0E012D
+ public const int Theme_Design_Light = 2131624237;
- // aapt resource value: 0x7f0b0118
- public const int Widget_AppCompat_ActionBar = 2131427608;
+ // aapt resource value: 0x7F0E012E
+ public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
- // aapt resource value: 0x7f0b0119
- public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+ // aapt resource value: 0x7F0E012F
+ public const int Theme_Design_Light_NoActionBar = 2131624239;
- // aapt resource value: 0x7f0b011a
- public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+ // aapt resource value: 0x7F0E0130
+ public const int Theme_Design_NoActionBar = 2131624240;
- // aapt resource value: 0x7f0b011b
- public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+ // aapt resource value: 0x7F0E0138
+ public const int Widget_AppCompat_ActionBar = 2131624248;
- // aapt resource value: 0x7f0b011c
- public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+ // aapt resource value: 0x7F0E0139
+ public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
- // aapt resource value: 0x7f0b011d
- public const int Widget_AppCompat_ActionButton = 2131427613;
+ // aapt resource value: 0x7F0E013A
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
- // aapt resource value: 0x7f0b011e
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+ // aapt resource value: 0x7F0E013B
+ public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
- // aapt resource value: 0x7f0b011f
- public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+ // aapt resource value: 0x7F0E013C
+ public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
- // aapt resource value: 0x7f0b0120
- public const int Widget_AppCompat_ActionMode = 2131427616;
+ // aapt resource value: 0x7F0E013D
+ public const int Widget_AppCompat_ActionButton = 2131624253;
- // aapt resource value: 0x7f0b0121
- public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+ // aapt resource value: 0x7F0E013E
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
- // aapt resource value: 0x7f0b0122
- public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+ // aapt resource value: 0x7F0E013F
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
- // aapt resource value: 0x7f0b0123
- public const int Widget_AppCompat_Button = 2131427619;
+ // aapt resource value: 0x7F0E0140
+ public const int Widget_AppCompat_ActionMode = 2131624256;
- // aapt resource value: 0x7f0b0124
- public const int Widget_AppCompat_Button_Borderless = 2131427620;
+ // aapt resource value: 0x7F0E0141
+ public const int Widget_AppCompat_ActivityChooserView = 2131624257;
- // aapt resource value: 0x7f0b0125
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+ // aapt resource value: 0x7F0E0142
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
- // aapt resource value: 0x7f0b0126
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+ // aapt resource value: 0x7F0E0143
+ public const int Widget_AppCompat_Button = 2131624259;
- // aapt resource value: 0x7f0b0127
- public const int Widget_AppCompat_Button_Colored = 2131427623;
+ // aapt resource value: 0x7F0E0149
+ public const int Widget_AppCompat_ButtonBar = 2131624265;
- // aapt resource value: 0x7f0b0128
- public const int Widget_AppCompat_Button_Small = 2131427624;
+ // aapt resource value: 0x7F0E014A
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
- // aapt resource value: 0x7f0b0129
- public const int Widget_AppCompat_ButtonBar = 2131427625;
+ // aapt resource value: 0x7F0E0144
+ public const int Widget_AppCompat_Button_Borderless = 2131624260;
- // aapt resource value: 0x7f0b012a
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+ // aapt resource value: 0x7F0E0145
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
- // aapt resource value: 0x7f0b012b
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+ // aapt resource value: 0x7F0E0146
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
- // aapt resource value: 0x7f0b012c
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+ // aapt resource value: 0x7F0E0147
+ public const int Widget_AppCompat_Button_Colored = 2131624263;
- // aapt resource value: 0x7f0b012d
- public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+ // aapt resource value: 0x7F0E0148
+ public const int Widget_AppCompat_Button_Small = 2131624264;
- // aapt resource value: 0x7f0b012e
- public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+ // aapt resource value: 0x7F0E014B
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
- // aapt resource value: 0x7f0b012f
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+ // aapt resource value: 0x7F0E014C
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
- // aapt resource value: 0x7f0b0130
- public const int Widget_AppCompat_EditText = 2131427632;
+ // aapt resource value: 0x7F0E014D
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
- // aapt resource value: 0x7f0b0131
- public const int Widget_AppCompat_ImageButton = 2131427633;
+ // aapt resource value: 0x7F0E014E
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
- // aapt resource value: 0x7f0b0132
- public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+ // aapt resource value: 0x7F0E014F
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
- // aapt resource value: 0x7f0b0133
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+ // aapt resource value: 0x7F0E0150
+ public const int Widget_AppCompat_EditText = 2131624272;
- // aapt resource value: 0x7f0b0134
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+ // aapt resource value: 0x7F0E0151
+ public const int Widget_AppCompat_ImageButton = 2131624273;
- // aapt resource value: 0x7f0b0135
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+ // aapt resource value: 0x7F0E0152
+ public const int Widget_AppCompat_Light_ActionBar = 2131624274;
- // aapt resource value: 0x7f0b0136
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+ // aapt resource value: 0x7F0E0153
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
- // aapt resource value: 0x7f0b0137
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+ // aapt resource value: 0x7F0E0154
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
- // aapt resource value: 0x7f0b0138
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+ // aapt resource value: 0x7F0E0155
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
- // aapt resource value: 0x7f0b0139
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+ // aapt resource value: 0x7F0E0156
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
- // aapt resource value: 0x7f0b013a
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+ // aapt resource value: 0x7F0E0157
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
- // aapt resource value: 0x7f0b013b
- public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+ // aapt resource value: 0x7F0E0158
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
- // aapt resource value: 0x7f0b013c
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+ // aapt resource value: 0x7F0E0159
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
- // aapt resource value: 0x7f0b013d
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+ // aapt resource value: 0x7F0E015A
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
- // aapt resource value: 0x7f0b013e
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+ // aapt resource value: 0x7F0E015B
+ public const int Widget_AppCompat_Light_ActionButton = 2131624283;
- // aapt resource value: 0x7f0b013f
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+ // aapt resource value: 0x7F0E015C
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
- // aapt resource value: 0x7f0b0140
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+ // aapt resource value: 0x7F0E015D
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
- // aapt resource value: 0x7f0b0141
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+ // aapt resource value: 0x7F0E015E
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
- // aapt resource value: 0x7f0b0142
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+ // aapt resource value: 0x7F0E015F
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
- // aapt resource value: 0x7f0b0143
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+ // aapt resource value: 0x7F0E0160
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
- // aapt resource value: 0x7f0b0144
- public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+ // aapt resource value: 0x7F0E0161
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
- // aapt resource value: 0x7f0b0145
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+ // aapt resource value: 0x7F0E0162
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
- // aapt resource value: 0x7f0b0146
- public const int Widget_AppCompat_Light_SearchView = 2131427654;
+ // aapt resource value: 0x7F0E0163
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
- // aapt resource value: 0x7f0b0147
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+ // aapt resource value: 0x7F0E0164
+ public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
- // aapt resource value: 0x7f0b0148
- public const int Widget_AppCompat_ListMenuView = 2131427656;
+ // aapt resource value: 0x7F0E0165
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
- // aapt resource value: 0x7f0b0149
- public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+ // aapt resource value: 0x7F0E0166
+ public const int Widget_AppCompat_Light_SearchView = 2131624294;
- // aapt resource value: 0x7f0b014a
- public const int Widget_AppCompat_ListView = 2131427658;
+ // aapt resource value: 0x7F0E0167
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
- // aapt resource value: 0x7f0b014b
- public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+ // aapt resource value: 0x7F0E0168
+ public const int Widget_AppCompat_ListMenuView = 2131624296;
- // aapt resource value: 0x7f0b014c
- public const int Widget_AppCompat_ListView_Menu = 2131427660;
+ // aapt resource value: 0x7F0E0169
+ public const int Widget_AppCompat_ListPopupWindow = 2131624297;
- // aapt resource value: 0x7f0b014d
- public const int Widget_AppCompat_PopupMenu = 2131427661;
+ // aapt resource value: 0x7F0E016A
+ public const int Widget_AppCompat_ListView = 2131624298;
- // aapt resource value: 0x7f0b014e
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+ // aapt resource value: 0x7F0E016B
+ public const int Widget_AppCompat_ListView_DropDown = 2131624299;
- // aapt resource value: 0x7f0b014f
- public const int Widget_AppCompat_PopupWindow = 2131427663;
+ // aapt resource value: 0x7F0E016C
+ public const int Widget_AppCompat_ListView_Menu = 2131624300;
- // aapt resource value: 0x7f0b0150
- public const int Widget_AppCompat_ProgressBar = 2131427664;
+ // aapt resource value: 0x7F0E016D
+ public const int Widget_AppCompat_PopupMenu = 2131624301;
- // aapt resource value: 0x7f0b0151
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+ // aapt resource value: 0x7F0E016E
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
- // aapt resource value: 0x7f0b0152
- public const int Widget_AppCompat_RatingBar = 2131427666;
+ // aapt resource value: 0x7F0E016F
+ public const int Widget_AppCompat_PopupWindow = 2131624303;
- // aapt resource value: 0x7f0b0153
- public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+ // aapt resource value: 0x7F0E0170
+ public const int Widget_AppCompat_ProgressBar = 2131624304;
- // aapt resource value: 0x7f0b0154
- public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+ // aapt resource value: 0x7F0E0171
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
- // aapt resource value: 0x7f0b0155
- public const int Widget_AppCompat_SearchView = 2131427669;
+ // aapt resource value: 0x7F0E0172
+ public const int Widget_AppCompat_RatingBar = 2131624306;
- // aapt resource value: 0x7f0b0156
- public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+ // aapt resource value: 0x7F0E0173
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
- // aapt resource value: 0x7f0b0157
- public const int Widget_AppCompat_SeekBar = 2131427671;
+ // aapt resource value: 0x7F0E0174
+ public const int Widget_AppCompat_RatingBar_Small = 2131624308;
- // aapt resource value: 0x7f0b0158
- public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+ // aapt resource value: 0x7F0E0175
+ public const int Widget_AppCompat_SearchView = 2131624309;
- // aapt resource value: 0x7f0b0159
- public const int Widget_AppCompat_Spinner = 2131427673;
+ // aapt resource value: 0x7F0E0176
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
- // aapt resource value: 0x7f0b015a
- public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+ // aapt resource value: 0x7F0E0177
+ public const int Widget_AppCompat_SeekBar = 2131624311;
- // aapt resource value: 0x7f0b015b
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+ // aapt resource value: 0x7F0E0178
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
- // aapt resource value: 0x7f0b015c
- public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+ // aapt resource value: 0x7F0E0179
+ public const int Widget_AppCompat_Spinner = 2131624313;
- // aapt resource value: 0x7f0b015d
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+ // aapt resource value: 0x7F0E017A
+ public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
- // aapt resource value: 0x7f0b015e
- public const int Widget_AppCompat_Toolbar = 2131427678;
+ // aapt resource value: 0x7F0E017B
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
- // aapt resource value: 0x7f0b015f
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+ // aapt resource value: 0x7F0E017C
+ public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
- // aapt resource value: 0x7f0b0187
- public const int Widget_Compat_NotificationActionContainer = 2131427719;
+ // aapt resource value: 0x7F0E017D
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
- // aapt resource value: 0x7f0b0188
- public const int Widget_Compat_NotificationActionText = 2131427720;
+ // aapt resource value: 0x7F0E017E
+ public const int Widget_AppCompat_Toolbar = 2131624318;
- // aapt resource value: 0x7f0b0179
- public const int Widget_Design_AppBarLayout = 2131427705;
+ // aapt resource value: 0x7F0E017F
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
- // aapt resource value: 0x7f0b017a
- public const int Widget_Design_BottomNavigationView = 2131427706;
+ // aapt resource value: 0x7F0E0180
+ public const int Widget_Compat_NotificationActionContainer = 2131624320;
- // aapt resource value: 0x7f0b017b
- public const int Widget_Design_BottomSheet_Modal = 2131427707;
+ // aapt resource value: 0x7F0E0181
+ public const int Widget_Compat_NotificationActionText = 2131624321;
- // aapt resource value: 0x7f0b017c
- public const int Widget_Design_CollapsingToolbar = 2131427708;
+ // aapt resource value: 0x7F0E0182
+ public const int Widget_Design_AppBarLayout = 2131624322;
- // aapt resource value: 0x7f0b017d
- public const int Widget_Design_CoordinatorLayout = 2131427709;
+ // aapt resource value: 0x7F0E0183
+ public const int Widget_Design_BottomNavigationView = 2131624323;
- // aapt resource value: 0x7f0b017e
- public const int Widget_Design_FloatingActionButton = 2131427710;
+ // aapt resource value: 0x7F0E0184
+ public const int Widget_Design_BottomSheet_Modal = 2131624324;
- // aapt resource value: 0x7f0b017f
- public const int Widget_Design_NavigationView = 2131427711;
+ // aapt resource value: 0x7F0E0185
+ public const int Widget_Design_CollapsingToolbar = 2131624325;
- // aapt resource value: 0x7f0b0180
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+ // aapt resource value: 0x7F0E0186
+ public const int Widget_Design_CoordinatorLayout = 2131624326;
- // aapt resource value: 0x7f0b0181
- public const int Widget_Design_Snackbar = 2131427713;
+ // aapt resource value: 0x7F0E0187
+ public const int Widget_Design_FloatingActionButton = 2131624327;
- // aapt resource value: 0x7f0b0165
- public const int Widget_Design_TabLayout = 2131427685;
+ // aapt resource value: 0x7F0E0188
+ public const int Widget_Design_NavigationView = 2131624328;
- // aapt resource value: 0x7f0b0182
- public const int Widget_Design_TextInputLayout = 2131427714;
+ // aapt resource value: 0x7F0E0189
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
- // aapt resource value: 0x7f0b018c
- public const int custom_dialog2 = 2131427724;
+ // aapt resource value: 0x7F0E018A
+ public const int Widget_Design_Snackbar = 2131624330;
- // aapt resource value: 0x7f0b018d
- public const int picker_view_scale_anim = 2131427725;
+ // aapt resource value: 0x7F0E018B
+ public const int Widget_Design_TabLayout = 2131624331;
- // aapt resource value: 0x7f0b018e
- public const int picker_view_slide_anim = 2131427726;
+ // aapt resource value: 0x7F0E018C
+ public const int Widget_Design_TextInputLayout = 2131624332;
static Style()
{
@@ -5436,204 +5418,193 @@
}
}
- public partial class Xml
- {
-
- // aapt resource value: 0x7f070000
- public const int file_paths = 2131165184;
-
- // aapt resource value: 0x7f070001
- public const int hdl_filepaths = 2131165185;
-
- static Xml()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Xml()
- {
- }
- }
-
public partial class Styleable
{
+ // aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
public static int[] ActionBar = new int[] {
- 2130771978,
- 2130771980,
- 2130771981,
- 2130771982,
- 2130771983,
- 2130771984,
- 2130771985,
- 2130771986,
- 2130771987,
- 2130771988,
- 2130771989,
- 2130771990,
- 2130771991,
- 2130771992,
- 2130771993,
- 2130771994,
- 2130771995,
- 2130771996,
- 2130771997,
- 2130771998,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772005,
- 2130772006,
- 2130772076};
+ 2130968642,
+ 2130968643,
+ 2130968644,
+ 2130968690,
+ 2130968691,
+ 2130968692,
+ 2130968693,
+ 2130968694,
+ 2130968695,
+ 2130968707,
+ 2130968711,
+ 2130968712,
+ 2130968723,
+ 2130968756,
+ 2130968757,
+ 2130968761,
+ 2130968762,
+ 2130968763,
+ 2130968768,
+ 2130968774,
+ 2130968803,
+ 2130968812,
+ 2130968828,
+ 2130968832,
+ 2130968833,
+ 2130968936,
+ 2130968939,
+ 2130968983,
+ 2130968993};
- // aapt resource value: 10
- public const int ActionBar_background = 10;
-
- // aapt resource value: 12
- public const int ActionBar_backgroundSplit = 12;
-
- // aapt resource value: 11
- public const int ActionBar_backgroundStacked = 11;
-
- // aapt resource value: 21
- public const int ActionBar_contentInsetEnd = 21;
-
- // aapt resource value: 25
- public const int ActionBar_contentInsetEndWithActions = 25;
-
- // aapt resource value: 22
- public const int ActionBar_contentInsetLeft = 22;
-
- // aapt resource value: 23
- public const int ActionBar_contentInsetRight = 23;
-
- // aapt resource value: 20
- public const int ActionBar_contentInsetStart = 20;
-
- // aapt resource value: 24
- public const int ActionBar_contentInsetStartWithNavigation = 24;
-
- // aapt resource value: 13
- public const int ActionBar_customNavigationLayout = 13;
-
- // aapt resource value: 3
- public const int ActionBar_displayOptions = 3;
-
- // aapt resource value: 9
- public const int ActionBar_divider = 9;
-
- // aapt resource value: 26
- public const int ActionBar_elevation = 26;
-
- // aapt resource value: 0
- public const int ActionBar_height = 0;
-
- // aapt resource value: 19
- public const int ActionBar_hideOnContentScroll = 19;
-
- // aapt resource value: 28
- public const int ActionBar_homeAsUpIndicator = 28;
-
- // aapt resource value: 14
- public const int ActionBar_homeLayout = 14;
-
- // aapt resource value: 7
- public const int ActionBar_icon = 7;
-
- // aapt resource value: 16
- public const int ActionBar_indeterminateProgressStyle = 16;
-
- // aapt resource value: 18
- public const int ActionBar_itemPadding = 18;
-
- // aapt resource value: 8
- public const int ActionBar_logo = 8;
-
- // aapt resource value: 2
- public const int ActionBar_navigationMode = 2;
-
- // aapt resource value: 27
- public const int ActionBar_popupTheme = 27;
-
- // aapt resource value: 17
- public const int ActionBar_progressBarPadding = 17;
-
- // aapt resource value: 15
- public const int ActionBar_progressBarStyle = 15;
-
- // aapt resource value: 4
- public const int ActionBar_subtitle = 4;
-
- // aapt resource value: 6
- public const int ActionBar_subtitleTextStyle = 6;
-
- // aapt resource value: 1
- public const int ActionBar_title = 1;
-
- // aapt resource value: 5
- public const int ActionBar_titleTextStyle = 5;
-
+ // aapt resource value: { 0x10100B3 }
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
+ // aapt resource value: 0
+ public const int ActionBar_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionBar_backgroundSplit = 1;
+
+ // aapt resource value: 2
+ public const int ActionBar_backgroundStacked = 2;
+
+ // aapt resource value: 3
+ public const int ActionBar_contentInsetEnd = 3;
+
+ // aapt resource value: 4
+ public const int ActionBar_contentInsetEndWithActions = 4;
+
+ // aapt resource value: 5
+ public const int ActionBar_contentInsetLeft = 5;
+
+ // aapt resource value: 6
+ public const int ActionBar_contentInsetRight = 6;
+
+ // aapt resource value: 7
+ public const int ActionBar_contentInsetStart = 7;
+
+ // aapt resource value: 8
+ public const int ActionBar_contentInsetStartWithNavigation = 8;
+
+ // aapt resource value: 9
+ public const int ActionBar_customNavigationLayout = 9;
+
+ // aapt resource value: 10
+ public const int ActionBar_displayOptions = 10;
+
+ // aapt resource value: 11
+ public const int ActionBar_divider = 11;
+
+ // aapt resource value: 12
+ public const int ActionBar_elevation = 12;
+
+ // aapt resource value: 13
+ public const int ActionBar_height = 13;
+
+ // aapt resource value: 14
+ public const int ActionBar_hideOnContentScroll = 14;
+
+ // aapt resource value: 15
+ public const int ActionBar_homeAsUpIndicator = 15;
+
+ // aapt resource value: 16
+ public const int ActionBar_homeLayout = 16;
+
+ // aapt resource value: 17
+ public const int ActionBar_icon = 17;
+
+ // aapt resource value: 18
+ public const int ActionBar_indeterminateProgressStyle = 18;
+
+ // aapt resource value: 19
+ public const int ActionBar_itemPadding = 19;
+
+ // aapt resource value: 20
+ public const int ActionBar_logo = 20;
+
+ // aapt resource value: 21
+ public const int ActionBar_navigationMode = 21;
+
+ // aapt resource value: 22
+ public const int ActionBar_popupTheme = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_progressBarPadding = 23;
+
+ // aapt resource value: 24
+ public const int ActionBar_progressBarStyle = 24;
+
+ // aapt resource value: 25
+ public const int ActionBar_subtitle = 25;
+
+ // aapt resource value: 26
+ public const int ActionBar_subtitleTextStyle = 26;
+
+ // aapt resource value: 27
+ public const int ActionBar_title = 27;
+
+ // aapt resource value: 28
+ public const int ActionBar_titleTextStyle = 28;
+
+ // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- public static int[] ActionMenuView;
+ // aapt resource value: { 0xFFFFFFFF }
+ public static int[] ActionMenuView = new int[] {
+ -1};
+ // aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
public static int[] ActionMode = new int[] {
- 2130771978,
- 2130771984,
- 2130771985,
- 2130771989,
- 2130771991,
- 2130772007};
-
- // aapt resource value: 3
- public const int ActionMode_background = 3;
-
- // aapt resource value: 4
- public const int ActionMode_backgroundSplit = 4;
-
- // aapt resource value: 5
- public const int ActionMode_closeItemLayout = 5;
+ 2130968642,
+ 2130968643,
+ 2130968672,
+ 2130968756,
+ 2130968939,
+ 2130968993};
// aapt resource value: 0
- public const int ActionMode_height = 0;
+ public const int ActionMode_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionMode_backgroundSplit = 1;
// aapt resource value: 2
- public const int ActionMode_subtitleTextStyle = 2;
+ public const int ActionMode_closeItemLayout = 2;
- // aapt resource value: 1
- public const int ActionMode_titleTextStyle = 1;
+ // aapt resource value: 3
+ public const int ActionMode_height = 3;
+ // aapt resource value: 4
+ public const int ActionMode_subtitleTextStyle = 4;
+
+ // aapt resource value: 5
+ public const int ActionMode_titleTextStyle = 5;
+
+ // aapt resource value: { 0x7F040096,0x7F0400C1 }
public static int[] ActivityChooserView = new int[] {
- 2130772008,
- 2130772009};
-
- // aapt resource value: 1
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+ 2130968726,
+ 2130968769};
// aapt resource value: 0
- public const int ActivityChooserView_initialActivityCount = 0;
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+ // aapt resource value: 1
+ public const int ActivityChooserView_initialActivityCount = 1;
+
+ // aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
public static int[] AlertDialog = new int[] {
16842994,
- 2130772010,
- 2130772011,
- 2130772012,
- 2130772013,
- 2130772014,
- 2130772015};
+ 2130968664,
+ 2130968794,
+ 2130968795,
+ 2130968809,
+ 2130968855,
+ 2130968856};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -5641,27 +5612,39 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
- // aapt resource value: 5
- public const int AlertDialog_listItemLayout = 5;
-
// aapt resource value: 2
- public const int AlertDialog_listLayout = 2;
+ public const int AlertDialog_listItemLayout = 2;
// aapt resource value: 3
- public const int AlertDialog_multiChoiceItemLayout = 3;
-
- // aapt resource value: 6
- public const int AlertDialog_showTitle = 6;
+ public const int AlertDialog_listLayout = 3;
// aapt resource value: 4
- public const int AlertDialog_singleChoiceItemLayout = 4;
+ public const int AlertDialog_multiChoiceItemLayout = 4;
+ // aapt resource value: 5
+ public const int AlertDialog_showTitle = 5;
+
+ // aapt resource value: 6
+ public const int AlertDialog_singleChoiceItemLayout = 6;
+
+ // aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
public static int[] AppBarLayout = new int[] {
16842964,
16843919,
16844096,
- 2130772005,
- 2130772223};
+ 2130968723,
+ 2130968727};
+
+ // aapt resource value: { 0x7F040162,0x7F040163 }
+ public static int[] AppBarLayoutStates = new int[] {
+ 2130968930,
+ 2130968931};
+
+ // aapt resource value: 0
+ public const int AppBarLayoutStates_state_collapsed = 0;
+
+ // aapt resource value: 1
+ public const int AppBarLayoutStates_state_collapsible = 1;
// aapt resource value: 0
public const int AppBarLayout_android_background = 0;
@@ -5678,19 +5661,10 @@
// aapt resource value: 4
public const int AppBarLayout_expanded = 4;
- public static int[] AppBarLayoutStates = new int[] {
- 2130772224,
- 2130772225};
-
- // aapt resource value: 0
- public const int AppBarLayoutStates_state_collapsed = 0;
-
- // aapt resource value: 1
- public const int AppBarLayoutStates_state_collapsible = 1;
-
+ // aapt resource value: { 0x7F0400D4,0x7F0400D5 }
public static int[] AppBarLayout_Layout = new int[] {
- 2130772226,
- 2130772227};
+ 2130968788,
+ 2130968789};
// aapt resource value: 0
public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -5698,11 +5672,12 @@
// aapt resource value: 1
public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
+ // aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130772016,
- 2130772017,
- 2130772018};
+ 2130968862,
+ 2130968981,
+ 2130968982};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -5716,11 +5691,12 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
+ // aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130772019,
- 2130772020,
- 2130772021};
+ 2130968978,
+ 2130968979,
+ 2130968980};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -5734,6 +5710,7 @@
// aapt resource value: 3
public const int AppCompatSeekBar_tickMarkTintMode = 3;
+ // aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
public static int[] AppCompatTextHelper = new int[] {
16842804,
16843117,
@@ -5764,265 +5741,267 @@
// aapt resource value: 0
public const int AppCompatTextHelper_android_textAppearance = 0;
+ // aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
public static int[] AppCompatTextView = new int[] {
16842804,
- 2130772022,
- 2130772023,
- 2130772024,
- 2130772025,
- 2130772026,
- 2130772027,
- 2130772028};
+ 2130968637,
+ 2130968638,
+ 2130968639,
+ 2130968640,
+ 2130968641,
+ 2130968742,
+ 2130968961};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 6
- public const int AppCompatTextView_autoSizeMaxTextSize = 6;
-
- // aapt resource value: 5
- public const int AppCompatTextView_autoSizeMinTextSize = 5;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizePresetSizes = 4;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizeStepGranularity = 3;
+ // aapt resource value: 1
+ public const int AppCompatTextView_autoSizeMaxTextSize = 1;
// aapt resource value: 2
- public const int AppCompatTextView_autoSizeTextType = 2;
+ public const int AppCompatTextView_autoSizeMinTextSize = 2;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizePresetSizes = 3;
+
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizeStepGranularity = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTextView_autoSizeTextType = 5;
+
+ // aapt resource value: 6
+ public const int AppCompatTextView_fontFamily = 6;
// aapt resource value: 7
- public const int AppCompatTextView_fontFamily = 7;
+ public const int AppCompatTextView_textAllCaps = 7;
- // aapt resource value: 1
- public const int AppCompatTextView_textAllCaps = 1;
-
+ // aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 2130772029,
- 2130772030,
- 2130772031,
- 2130772032,
- 2130772033,
- 2130772034,
- 2130772035,
- 2130772036,
- 2130772037,
- 2130772038,
- 2130772039,
- 2130772040,
- 2130772041,
- 2130772042,
- 2130772043,
- 2130772044,
- 2130772045,
- 2130772046,
- 2130772047,
- 2130772048,
- 2130772049,
- 2130772050,
- 2130772051,
- 2130772052,
- 2130772053,
- 2130772054,
- 2130772055,
- 2130772056,
- 2130772057,
- 2130772058,
- 2130772059,
- 2130772060,
- 2130772061,
- 2130772062,
- 2130772063,
- 2130772064,
- 2130772065,
- 2130772066,
- 2130772067,
- 2130772068,
- 2130772069,
- 2130772070,
- 2130772071,
- 2130772072,
- 2130772073,
- 2130772074,
- 2130772075,
- 2130772076,
- 2130772077,
- 2130772078,
- 2130772079,
- 2130772080,
- 2130772081,
- 2130772082,
- 2130772083,
- 2130772084,
- 2130772085,
- 2130772086,
- 2130772087,
- 2130772088,
- 2130772089,
- 2130772090,
- 2130772091,
- 2130772092,
- 2130772093,
- 2130772094,
- 2130772095,
- 2130772096,
- 2130772097,
- 2130772098,
- 2130772099,
- 2130772100,
- 2130772101,
- 2130772102,
- 2130772103,
- 2130772104,
- 2130772105,
- 2130772106,
- 2130772107,
- 2130772108,
- 2130772109,
- 2130772110,
- 2130772111,
- 2130772112,
- 2130772113,
- 2130772114,
- 2130772115,
- 2130772116,
- 2130772117,
- 2130772118,
- 2130772119,
- 2130772120,
- 2130772121,
- 2130772122,
- 2130772123,
- 2130772124,
- 2130772125,
- 2130772126,
- 2130772127,
- 2130772128,
- 2130772129,
- 2130772130,
- 2130772131,
- 2130772132,
- 2130772133,
- 2130772134,
- 2130772135,
- 2130772136,
- 2130772137,
- 2130772138,
- 2130772139,
- 2130772140,
- 2130772141,
- 2130772142,
- 2130772143,
- 2130772144,
- 2130772145};
+ 2130968576,
+ 2130968577,
+ 2130968578,
+ 2130968579,
+ 2130968580,
+ 2130968581,
+ 2130968582,
+ 2130968583,
+ 2130968584,
+ 2130968585,
+ 2130968586,
+ 2130968587,
+ 2130968588,
+ 2130968590,
+ 2130968591,
+ 2130968592,
+ 2130968593,
+ 2130968594,
+ 2130968595,
+ 2130968596,
+ 2130968597,
+ 2130968598,
+ 2130968599,
+ 2130968600,
+ 2130968601,
+ 2130968602,
+ 2130968603,
+ 2130968604,
+ 2130968605,
+ 2130968606,
+ 2130968609,
+ 2130968610,
+ 2130968611,
+ 2130968612,
+ 2130968613,
+ 2130968636,
+ 2130968655,
+ 2130968658,
+ 2130968659,
+ 2130968660,
+ 2130968661,
+ 2130968662,
+ 2130968665,
+ 2130968666,
+ 2130968669,
+ 2130968670,
+ 2130968678,
+ 2130968679,
+ 2130968680,
+ 2130968681,
+ 2130968682,
+ 2130968683,
+ 2130968684,
+ 2130968685,
+ 2130968686,
+ 2130968687,
+ 2130968697,
+ 2130968709,
+ 2130968710,
+ 2130968713,
+ 2130968715,
+ 2130968718,
+ 2130968719,
+ 2130968720,
+ 2130968721,
+ 2130968722,
+ 2130968761,
+ 2130968767,
+ 2130968792,
+ 2130968793,
+ 2130968796,
+ 2130968797,
+ 2130968798,
+ 2130968799,
+ 2130968800,
+ 2130968801,
+ 2130968802,
+ 2130968819,
+ 2130968820,
+ 2130968821,
+ 2130968827,
+ 2130968829,
+ 2130968836,
+ 2130968837,
+ 2130968838,
+ 2130968839,
+ 2130968846,
+ 2130968849,
+ 2130968850,
+ 2130968851,
+ 2130968859,
+ 2130968860,
+ 2130968943,
+ 2130968962,
+ 2130968963,
+ 2130968964,
+ 2130968965,
+ 2130968966,
+ 2130968967,
+ 2130968968,
+ 2130968969,
+ 2130968970,
+ 2130968972,
+ 2130968995,
+ 2130968996,
+ 2130968997,
+ 2130968998,
+ 2130969016,
+ 2130969017,
+ 2130969018,
+ 2130969019,
+ 2130969020,
+ 2130969021,
+ 2130969022,
+ 2130969023,
+ 2130969024,
+ 2130969025};
- // aapt resource value: 23
- public const int AppCompatTheme_actionBarDivider = 23;
+ // aapt resource value: 2
+ public const int AppCompatTheme_actionBarDivider = 2;
- // aapt resource value: 24
- public const int AppCompatTheme_actionBarItemBackground = 24;
+ // aapt resource value: 3
+ public const int AppCompatTheme_actionBarItemBackground = 3;
- // aapt resource value: 17
- public const int AppCompatTheme_actionBarPopupTheme = 17;
+ // aapt resource value: 4
+ public const int AppCompatTheme_actionBarPopupTheme = 4;
- // aapt resource value: 22
- public const int AppCompatTheme_actionBarSize = 22;
+ // aapt resource value: 5
+ public const int AppCompatTheme_actionBarSize = 5;
- // aapt resource value: 19
- public const int AppCompatTheme_actionBarSplitStyle = 19;
+ // aapt resource value: 6
+ public const int AppCompatTheme_actionBarSplitStyle = 6;
- // aapt resource value: 18
- public const int AppCompatTheme_actionBarStyle = 18;
+ // aapt resource value: 7
+ public const int AppCompatTheme_actionBarStyle = 7;
- // aapt resource value: 13
- public const int AppCompatTheme_actionBarTabBarStyle = 13;
+ // aapt resource value: 8
+ public const int AppCompatTheme_actionBarTabBarStyle = 8;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_actionBarTabStyle = 9;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_actionBarTabTextStyle = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_actionBarTheme = 11;
// aapt resource value: 12
- public const int AppCompatTheme_actionBarTabStyle = 12;
+ public const int AppCompatTheme_actionBarWidgetTheme = 12;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionButtonStyle = 13;
// aapt resource value: 14
- public const int AppCompatTheme_actionBarTabTextStyle = 14;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionBarTheme = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionBarWidgetTheme = 21;
-
- // aapt resource value: 50
- public const int AppCompatTheme_actionButtonStyle = 50;
-
- // aapt resource value: 46
- public const int AppCompatTheme_actionDropDownStyle = 46;
-
- // aapt resource value: 25
- public const int AppCompatTheme_actionMenuTextAppearance = 25;
-
- // aapt resource value: 26
- public const int AppCompatTheme_actionMenuTextColor = 26;
-
- // aapt resource value: 29
- public const int AppCompatTheme_actionModeBackground = 29;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
-
- // aapt resource value: 31
- public const int AppCompatTheme_actionModeCloseDrawable = 31;
-
- // aapt resource value: 33
- public const int AppCompatTheme_actionModeCopyDrawable = 33;
-
- // aapt resource value: 32
- public const int AppCompatTheme_actionModeCutDrawable = 32;
-
- // aapt resource value: 37
- public const int AppCompatTheme_actionModeFindDrawable = 37;
-
- // aapt resource value: 34
- public const int AppCompatTheme_actionModePasteDrawable = 34;
-
- // aapt resource value: 39
- public const int AppCompatTheme_actionModePopupWindowStyle = 39;
-
- // aapt resource value: 35
- public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
-
- // aapt resource value: 36
- public const int AppCompatTheme_actionModeShareDrawable = 36;
-
- // aapt resource value: 30
- public const int AppCompatTheme_actionModeSplitBackground = 30;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeStyle = 27;
-
- // aapt resource value: 38
- public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+ public const int AppCompatTheme_actionDropDownStyle = 14;
// aapt resource value: 15
- public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+ public const int AppCompatTheme_actionMenuTextAppearance = 15;
// aapt resource value: 16
- public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+ public const int AppCompatTheme_actionMenuTextColor = 16;
- // aapt resource value: 58
- public const int AppCompatTheme_activityChooserViewStyle = 58;
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionModeBackground = 17;
- // aapt resource value: 95
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
- // aapt resource value: 96
- public const int AppCompatTheme_alertDialogCenterButtons = 96;
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionModeCloseDrawable = 19;
- // aapt resource value: 94
- public const int AppCompatTheme_alertDialogStyle = 94;
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionModeCopyDrawable = 20;
- // aapt resource value: 97
- public const int AppCompatTheme_alertDialogTheme = 97;
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionModeCutDrawable = 21;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionModeFindDrawable = 22;
+
+ // aapt resource value: 23
+ public const int AppCompatTheme_actionModePasteDrawable = 23;
+
+ // aapt resource value: 24
+ public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+
+ // aapt resource value: 25
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+
+ // aapt resource value: 26
+ public const int AppCompatTheme_actionModeShareDrawable = 26;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeSplitBackground = 27;
+
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeStyle = 28;
+
+ // aapt resource value: 29
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+
+ // aapt resource value: 31
+ public const int AppCompatTheme_actionOverflowMenuStyle = 31;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_activityChooserViewStyle = 32;
+
+ // aapt resource value: 33
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+
+ // aapt resource value: 34
+ public const int AppCompatTheme_alertDialogCenterButtons = 34;
+
+ // aapt resource value: 35
+ public const int AppCompatTheme_alertDialogStyle = 35;
+
+ // aapt resource value: 36
+ public const int AppCompatTheme_alertDialogTheme = 36;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6030,270 +6009,272 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 102
- public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+ // aapt resource value: 37
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
- // aapt resource value: 55
- public const int AppCompatTheme_borderlessButtonStyle = 55;
+ // aapt resource value: 38
+ public const int AppCompatTheme_borderlessButtonStyle = 38;
- // aapt resource value: 52
- public const int AppCompatTheme_buttonBarButtonStyle = 52;
+ // aapt resource value: 39
+ public const int AppCompatTheme_buttonBarButtonStyle = 39;
- // aapt resource value: 100
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+ // aapt resource value: 40
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
- // aapt resource value: 101
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+ // aapt resource value: 41
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
- // aapt resource value: 99
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
-
- // aapt resource value: 51
- public const int AppCompatTheme_buttonBarStyle = 51;
-
- // aapt resource value: 103
- public const int AppCompatTheme_buttonStyle = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_buttonStyleSmall = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_checkboxStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_checkedTextViewStyle = 106;
-
- // aapt resource value: 86
- public const int AppCompatTheme_colorAccent = 86;
-
- // aapt resource value: 93
- public const int AppCompatTheme_colorBackgroundFloating = 93;
-
- // aapt resource value: 90
- public const int AppCompatTheme_colorButtonNormal = 90;
-
- // aapt resource value: 88
- public const int AppCompatTheme_colorControlActivated = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_colorControlHighlight = 89;
-
- // aapt resource value: 87
- public const int AppCompatTheme_colorControlNormal = 87;
-
- // aapt resource value: 118
- public const int AppCompatTheme_colorError = 118;
-
- // aapt resource value: 84
- public const int AppCompatTheme_colorPrimary = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_colorPrimaryDark = 85;
-
- // aapt resource value: 91
- public const int AppCompatTheme_colorSwitchThumbNormal = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_controlBackground = 92;
-
- // aapt resource value: 44
- public const int AppCompatTheme_dialogPreferredPadding = 44;
+ // aapt resource value: 42
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
// aapt resource value: 43
- public const int AppCompatTheme_dialogTheme = 43;
+ public const int AppCompatTheme_buttonBarStyle = 43;
- // aapt resource value: 57
- public const int AppCompatTheme_dividerHorizontal = 57;
-
- // aapt resource value: 56
- public const int AppCompatTheme_dividerVertical = 56;
-
- // aapt resource value: 75
- public const int AppCompatTheme_dropDownListViewStyle = 75;
-
- // aapt resource value: 47
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
-
- // aapt resource value: 64
- public const int AppCompatTheme_editTextBackground = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_editTextColor = 63;
-
- // aapt resource value: 107
- public const int AppCompatTheme_editTextStyle = 107;
-
- // aapt resource value: 49
- public const int AppCompatTheme_homeAsUpIndicator = 49;
-
- // aapt resource value: 65
- public const int AppCompatTheme_imageButtonStyle = 65;
-
- // aapt resource value: 83
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+ // aapt resource value: 44
+ public const int AppCompatTheme_buttonStyle = 44;
// aapt resource value: 45
- public const int AppCompatTheme_listDividerAlertDialog = 45;
+ public const int AppCompatTheme_buttonStyleSmall = 45;
- // aapt resource value: 115
- public const int AppCompatTheme_listMenuViewStyle = 115;
+ // aapt resource value: 46
+ public const int AppCompatTheme_checkboxStyle = 46;
- // aapt resource value: 76
- public const int AppCompatTheme_listPopupWindowStyle = 76;
+ // aapt resource value: 47
+ public const int AppCompatTheme_checkedTextViewStyle = 47;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_colorAccent = 48;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_colorBackgroundFloating = 49;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_colorButtonNormal = 50;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_colorControlActivated = 51;
+
+ // aapt resource value: 52
+ public const int AppCompatTheme_colorControlHighlight = 52;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_colorControlNormal = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_colorError = 54;
+
+ // aapt resource value: 55
+ public const int AppCompatTheme_colorPrimary = 55;
+
+ // aapt resource value: 56
+ public const int AppCompatTheme_colorPrimaryDark = 56;
+
+ // aapt resource value: 57
+ public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_controlBackground = 58;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_dialogPreferredPadding = 59;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_dialogTheme = 60;
+
+ // aapt resource value: 61
+ public const int AppCompatTheme_dividerHorizontal = 61;
+
+ // aapt resource value: 62
+ public const int AppCompatTheme_dividerVertical = 62;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_dropDownListViewStyle = 63;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_editTextBackground = 65;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_editTextColor = 66;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_editTextStyle = 67;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_homeAsUpIndicator = 68;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_imageButtonStyle = 69;
// aapt resource value: 70
- public const int AppCompatTheme_listPreferredItemHeight = 70;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
// aapt resource value: 71
- public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+ public const int AppCompatTheme_listDividerAlertDialog = 71;
+
+ // aapt resource value: 72
+ public const int AppCompatTheme_listMenuViewStyle = 72;
// aapt resource value: 73
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+ public const int AppCompatTheme_listPopupWindowStyle = 73;
// aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+ public const int AppCompatTheme_listPreferredItemHeight = 74;
+
+ // aapt resource value: 75
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+
+ // aapt resource value: 76
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+
+ // aapt resource value: 77
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_panelBackground = 79;
// aapt resource value: 80
- public const int AppCompatTheme_panelBackground = 80;
-
- // aapt resource value: 82
- public const int AppCompatTheme_panelMenuListTheme = 82;
+ public const int AppCompatTheme_panelMenuListTheme = 80;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 61
- public const int AppCompatTheme_popupMenuStyle = 61;
+ // aapt resource value: 82
+ public const int AppCompatTheme_popupMenuStyle = 82;
- // aapt resource value: 62
- public const int AppCompatTheme_popupWindowStyle = 62;
+ // aapt resource value: 83
+ public const int AppCompatTheme_popupWindowStyle = 83;
- // aapt resource value: 108
- public const int AppCompatTheme_radioButtonStyle = 108;
+ // aapt resource value: 84
+ public const int AppCompatTheme_radioButtonStyle = 84;
- // aapt resource value: 109
- public const int AppCompatTheme_ratingBarStyle = 109;
+ // aapt resource value: 85
+ public const int AppCompatTheme_ratingBarStyle = 85;
- // aapt resource value: 110
- public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+ // aapt resource value: 86
+ public const int AppCompatTheme_ratingBarStyleIndicator = 86;
- // aapt resource value: 111
- public const int AppCompatTheme_ratingBarStyleSmall = 111;
+ // aapt resource value: 87
+ public const int AppCompatTheme_ratingBarStyleSmall = 87;
- // aapt resource value: 69
- public const int AppCompatTheme_searchViewStyle = 69;
+ // aapt resource value: 88
+ public const int AppCompatTheme_searchViewStyle = 88;
- // aapt resource value: 112
- public const int AppCompatTheme_seekBarStyle = 112;
+ // aapt resource value: 89
+ public const int AppCompatTheme_seekBarStyle = 89;
- // aapt resource value: 53
- public const int AppCompatTheme_selectableItemBackground = 53;
+ // aapt resource value: 90
+ public const int AppCompatTheme_selectableItemBackground = 90;
- // aapt resource value: 54
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+ // aapt resource value: 91
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
- // aapt resource value: 48
- public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+ // aapt resource value: 92
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
- // aapt resource value: 113
- public const int AppCompatTheme_spinnerStyle = 113;
+ // aapt resource value: 93
+ public const int AppCompatTheme_spinnerStyle = 93;
- // aapt resource value: 114
- public const int AppCompatTheme_switchStyle = 114;
+ // aapt resource value: 94
+ public const int AppCompatTheme_switchStyle = 94;
- // aapt resource value: 40
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+ // aapt resource value: 95
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
- // aapt resource value: 77
- public const int AppCompatTheme_textAppearanceListItem = 77;
+ // aapt resource value: 96
+ public const int AppCompatTheme_textAppearanceListItem = 96;
- // aapt resource value: 78
- public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
-
- // aapt resource value: 79
- public const int AppCompatTheme_textAppearanceListItemSmall = 79;
-
- // aapt resource value: 42
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
-
- // aapt resource value: 67
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
-
- // aapt resource value: 66
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
-
- // aapt resource value: 41
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+ // aapt resource value: 97
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
// aapt resource value: 98
- public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+ public const int AppCompatTheme_textAppearanceListItemSmall = 98;
- // aapt resource value: 68
- public const int AppCompatTheme_textColorSearchUrl = 68;
+ // aapt resource value: 99
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
- // aapt resource value: 60
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+ // aapt resource value: 100
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
- // aapt resource value: 59
- public const int AppCompatTheme_toolbarStyle = 59;
+ // aapt resource value: 101
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
- // aapt resource value: 117
- public const int AppCompatTheme_tooltipForegroundColor = 117;
+ // aapt resource value: 102
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_textColorAlertDialogListItem = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_textColorSearchUrl = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_toolbarStyle = 106;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_tooltipForegroundColor = 107;
+
+ // aapt resource value: 108
+ public const int AppCompatTheme_tooltipFrameBackground = 108;
+
+ // aapt resource value: 109
+ public const int AppCompatTheme_windowActionBar = 109;
+
+ // aapt resource value: 110
+ public const int AppCompatTheme_windowActionBarOverlay = 110;
+
+ // aapt resource value: 111
+ public const int AppCompatTheme_windowActionModeOverlay = 111;
+
+ // aapt resource value: 112
+ public const int AppCompatTheme_windowFixedHeightMajor = 112;
+
+ // aapt resource value: 113
+ public const int AppCompatTheme_windowFixedHeightMinor = 113;
+
+ // aapt resource value: 114
+ public const int AppCompatTheme_windowFixedWidthMajor = 114;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_windowFixedWidthMinor = 115;
// aapt resource value: 116
- public const int AppCompatTheme_tooltipFrameBackground = 116;
+ public const int AppCompatTheme_windowMinWidthMajor = 116;
- // aapt resource value: 2
- public const int AppCompatTheme_windowActionBar = 2;
+ // aapt resource value: 117
+ public const int AppCompatTheme_windowMinWidthMinor = 117;
- // aapt resource value: 4
- public const int AppCompatTheme_windowActionBarOverlay = 4;
+ // aapt resource value: 118
+ public const int AppCompatTheme_windowNoTitle = 118;
- // aapt resource value: 5
- public const int AppCompatTheme_windowActionModeOverlay = 5;
-
- // aapt resource value: 9
- public const int AppCompatTheme_windowFixedHeightMajor = 9;
-
- // aapt resource value: 7
- public const int AppCompatTheme_windowFixedHeightMinor = 7;
-
- // aapt resource value: 6
- public const int AppCompatTheme_windowFixedWidthMajor = 6;
-
- // aapt resource value: 8
- public const int AppCompatTheme_windowFixedWidthMinor = 8;
-
- // aapt resource value: 10
- public const int AppCompatTheme_windowMinWidthMajor = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_windowMinWidthMinor = 11;
-
- // aapt resource value: 3
- public const int AppCompatTheme_windowNoTitle = 3;
-
+ // aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
public static int[] BallPulseFooter = new int[] {
- 2130772317,
- 2130772338,
- 2130772339};
-
- // aapt resource value: 1
- public const int BallPulseFooter_srlAnimatingColor = 1;
+ 2130968864,
+ 2130968865,
+ 2130968912};
// aapt resource value: 0
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
+ public const int BallPulseFooter_srlAnimatingColor = 0;
+
+ // aapt resource value: 1
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
+ // aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
public static int[] BezierRadarHeader = new int[] {
- 2130772316,
- 2130772324,
- 2130772326};
+ 2130968863,
+ 2130968882,
+ 2130968913};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6304,18 +6285,19 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
+ // aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
public static int[] BottomNavigationView = new int[] {
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269};
+ 2130968723,
+ 2130968772,
+ 2130968773,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int BottomNavigationView_elevation = 0;
- // aapt resource value: 4
- public const int BottomNavigationView_itemBackground = 4;
+ // aapt resource value: 1
+ public const int BottomNavigationView_itemBackground = 1;
// aapt resource value: 2
public const int BottomNavigationView_itemIconTint = 2;
@@ -6323,48 +6305,51 @@
// aapt resource value: 3
public const int BottomNavigationView_itemTextColor = 3;
- // aapt resource value: 1
- public const int BottomNavigationView_menu = 1;
+ // aapt resource value: 4
+ public const int BottomNavigationView_menu = 4;
+ // aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
public static int[] BottomSheetBehavior_Layout = new int[] {
- 2130772228,
- 2130772229,
- 2130772230};
-
- // aapt resource value: 1
- public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+ 2130968649,
+ 2130968651,
+ 2130968652};
// aapt resource value: 0
- public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+
+ // aapt resource value: 1
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
// aapt resource value: 2
public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
+ // aapt resource value: { 0x7F040026 }
public static int[] ButtonBarLayout = new int[] {
- 2130772146};
+ 2130968614};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
+ // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015D }
public static int[] ClassicsFooter = new int[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772330,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772336};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968919,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968925};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -6420,29 +6405,30 @@
// aapt resource value: 17
public const int ClassicsFooter_srlTextSizeTitle = 17;
+ // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
public static int[] ClassicsHeader = new int[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772334,
- 2130772335,
- 2130772336,
- 2130772337,
- 2130772340,
- 2130772341};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968883,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968923,
+ 2130968924,
+ 2130968925,
+ 2130968926,
+ 2130968927};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -6468,117 +6454,101 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
- // aapt resource value: 21
- public const int ClassicsHeader_srlEnableLastTime = 21;
-
// aapt resource value: 8
- public const int ClassicsHeader_srlFinishDuration = 8;
+ public const int ClassicsHeader_srlEnableLastTime = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlPrimaryColor = 9;
+ public const int ClassicsHeader_srlFinishDuration = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlTextFailed = 10;
+ public const int ClassicsHeader_srlPrimaryColor = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFinish = 11;
+ public const int ClassicsHeader_srlTextFailed = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextLoading = 12;
+ public const int ClassicsHeader_srlTextFinish = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextPulling = 13;
+ public const int ClassicsHeader_srlTextLoading = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextRefreshing = 14;
+ public const int ClassicsHeader_srlTextPulling = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRelease = 15;
+ public const int ClassicsHeader_srlTextRefreshing = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextSecondary = 16;
+ public const int ClassicsHeader_srlTextRelease = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSizeTime = 17;
+ public const int ClassicsHeader_srlTextSecondary = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTitle = 18;
+ public const int ClassicsHeader_srlTextSizeTime = 18;
+
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextSizeTitle = 19;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextUpdate = 19;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
public static int[] CollapsingToolbarLayout = new int[] {
- 2130771980,
- 2130772231,
- 2130772232,
- 2130772233,
- 2130772234,
- 2130772235,
- 2130772236,
- 2130772237,
- 2130772238,
- 2130772239,
- 2130772240,
- 2130772241,
- 2130772242,
- 2130772243,
- 2130772244,
- 2130772245};
+ 2130968675,
+ 2130968676,
+ 2130968696,
+ 2130968728,
+ 2130968729,
+ 2130968730,
+ 2130968731,
+ 2130968732,
+ 2130968733,
+ 2130968734,
+ 2130968842,
+ 2130968843,
+ 2130968933,
+ 2130968983,
+ 2130968984,
+ 2130968994};
- // aapt resource value: 13
- public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
-
- // aapt resource value: 7
- public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
-
- // aapt resource value: 8
- public const int CollapsingToolbarLayout_contentScrim = 8;
-
- // aapt resource value: 14
- public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
// aapt resource value: 1
- public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
+ public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 1;
+
+ // aapt resource value: 2
+ public const int CollapsingToolbarLayout_contentScrim = 2;
+
+ // aapt resource value: 3
+ public const int CollapsingToolbarLayout_expandedTitleGravity = 3;
+
+ // aapt resource value: 4
+ public const int CollapsingToolbarLayout_expandedTitleMargin = 4;
// aapt resource value: 5
public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
- // aapt resource value: 4
- public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
-
- // aapt resource value: 2
- public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
-
- // aapt resource value: 3
- public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
-
// aapt resource value: 6
- public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+ public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
- // aapt resource value: 12
- public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+ // aapt resource value: 7
+ public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
- // aapt resource value: 11
- public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+ // aapt resource value: 8
+ public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
// aapt resource value: 9
- public const int CollapsingToolbarLayout_statusBarScrim = 9;
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_title = 0;
-
- // aapt resource value: 15
- public const int CollapsingToolbarLayout_titleEnabled = 15;
-
- // aapt resource value: 10
- public const int CollapsingToolbarLayout_toolbarId = 10;
-
+ // aapt resource value: { 0x7F0400CF,0x7F0400D0 }
public static int[] CollapsingToolbarLayout_Layout = new int[] {
- 2130772246,
- 2130772247};
+ 2130968783,
+ 2130968784};
// aapt resource value: 0
public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6586,10 +6556,29 @@
// aapt resource value: 1
public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+ // aapt resource value: 10
+ public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
+
+ // aapt resource value: 11
+ public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+
+ // aapt resource value: 12
+ public const int CollapsingToolbarLayout_statusBarScrim = 12;
+
+ // aapt resource value: 13
+ public const int CollapsingToolbarLayout_title = 13;
+
+ // aapt resource value: 14
+ public const int CollapsingToolbarLayout_titleEnabled = 14;
+
+ // aapt resource value: 15
+ public const int CollapsingToolbarLayout_toolbarId = 15;
+
+ // aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130772147};
+ 2130968615};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -6600,10 +6589,11 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
+ // aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
public static int[] CompoundButton = new int[] {
16843015,
- 2130772148,
- 2130772149};
+ 2130968667,
+ 2130968668};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -6614,50 +6604,53 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
+ // aapt resource value: { 0x7F0400C9,0x7F040164 }
public static int[] CoordinatorLayout = new int[] {
- 2130772248,
- 2130772249};
+ 2130968777,
+ 2130968932};
// aapt resource value: 0
public const int CoordinatorLayout_keylines = 0;
- // aapt resource value: 1
- public const int CoordinatorLayout_statusBarBackground = 1;
-
+ // aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
public static int[] CoordinatorLayout_Layout = new int[] {
16842931,
- 2130772250,
- 2130772251,
- 2130772252,
- 2130772253,
- 2130772254,
- 2130772255};
+ 2130968780,
+ 2130968781,
+ 2130968782,
+ 2130968785,
+ 2130968786,
+ 2130968787};
// aapt resource value: 0
public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_Layout_layout_anchor = 1;
+
// aapt resource value: 2
- public const int CoordinatorLayout_Layout_layout_anchor = 2;
+ public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
+
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_behavior = 3;
// aapt resource value: 4
- public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
-
- // aapt resource value: 1
- public const int CoordinatorLayout_Layout_layout_behavior = 1;
-
- // aapt resource value: 6
- public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
+ public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
// aapt resource value: 5
public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
- // aapt resource value: 3
- public const int CoordinatorLayout_Layout_layout_keyline = 3;
+ // aapt resource value: 6
+ public const int CoordinatorLayout_Layout_layout_keyline = 6;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_statusBarBackground = 1;
+
+ // aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
public static int[] DesignTheme = new int[] {
- 2130772256,
- 2130772257,
- 2130772258};
+ 2130968656,
+ 2130968657,
+ 2130968971};
// aapt resource value: 0
public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -6668,61 +6661,70 @@
// aapt resource value: 2
public const int DesignTheme_textColorError = 2;
+ // aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
public static int[] DrawerArrowToggle = new int[] {
- 2130772150,
- 2130772151,
- 2130772152,
- 2130772153,
- 2130772154,
- 2130772155,
- 2130772156,
- 2130772157};
-
- // aapt resource value: 4
- public const int DrawerArrowToggle_arrowHeadLength = 4;
-
- // aapt resource value: 5
- public const int DrawerArrowToggle_arrowShaftLength = 5;
-
- // aapt resource value: 6
- public const int DrawerArrowToggle_barLength = 6;
+ 2130968634,
+ 2130968635,
+ 2130968647,
+ 2130968677,
+ 2130968716,
+ 2130968752,
+ 2130968858,
+ 2130968974};
// aapt resource value: 0
- public const int DrawerArrowToggle_color = 0;
-
- // aapt resource value: 2
- public const int DrawerArrowToggle_drawableSize = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_gapBetweenBars = 3;
+ public const int DrawerArrowToggle_arrowHeadLength = 0;
// aapt resource value: 1
- public const int DrawerArrowToggle_spinBars = 1;
+ public const int DrawerArrowToggle_arrowShaftLength = 1;
+
+ // aapt resource value: 2
+ public const int DrawerArrowToggle_barLength = 2;
+
+ // aapt resource value: 3
+ public const int DrawerArrowToggle_color = 3;
+
+ // aapt resource value: 4
+ public const int DrawerArrowToggle_drawableSize = 4;
+
+ // aapt resource value: 5
+ public const int DrawerArrowToggle_gapBetweenBars = 5;
+
+ // aapt resource value: 6
+ public const int DrawerArrowToggle_spinBars = 6;
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
+ // aapt resource value: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
public static int[] FloatingActionButton = new int[] {
- 2130772005,
- 2130772221,
- 2130772222,
- 2130772259,
- 2130772260,
- 2130772261,
- 2130772262,
- 2130772263};
-
- // aapt resource value: 1
- public const int FloatingActionButton_backgroundTint = 1;
-
- // aapt resource value: 2
- public const int FloatingActionButton_backgroundTintMode = 2;
-
- // aapt resource value: 6
- public const int FloatingActionButton_borderWidth = 6;
+ 2130968645,
+ 2130968646,
+ 2130968654,
+ 2130968723,
+ 2130968735,
+ 2130968831,
+ 2130968841,
+ 2130969003};
// aapt resource value: 0
- public const int FloatingActionButton_elevation = 0;
+ public const int FloatingActionButton_backgroundTint = 0;
+
+ // aapt resource value: 1
+ public const int FloatingActionButton_backgroundTintMode = 1;
+
+ // aapt resource value: { 0x7F040048 }
+ public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+ 2130968648};
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+
+ // aapt resource value: 2
+ public const int FloatingActionButton_borderWidth = 2;
+
+ // aapt resource value: 3
+ public const int FloatingActionButton_elevation = 3;
// aapt resource value: 4
public const int FloatingActionButton_fabSize = 4;
@@ -6730,62 +6732,59 @@
// aapt resource value: 5
public const int FloatingActionButton_pressedTranslationZ = 5;
- // aapt resource value: 3
- public const int FloatingActionButton_rippleColor = 3;
+ // aapt resource value: 6
+ public const int FloatingActionButton_rippleColor = 6;
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- public static int[] FloatingActionButton_Behavior_Layout = new int[] {
- 2130772264};
-
- // aapt resource value: 0
- public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
-
+ // aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
public static int[] FontFamily = new int[] {
- 2130772305,
- 2130772306,
- 2130772307,
- 2130772308,
- 2130772309,
- 2130772310};
+ 2130968743,
+ 2130968744,
+ 2130968745,
+ 2130968746,
+ 2130968747,
+ 2130968748};
- // aapt resource value: 0
- public const int FontFamily_fontProviderAuthority = 0;
-
- // aapt resource value: 3
- public const int FontFamily_fontProviderCerts = 3;
-
- // aapt resource value: 4
- public const int FontFamily_fontProviderFetchStrategy = 4;
-
- // aapt resource value: 5
- public const int FontFamily_fontProviderFetchTimeout = 5;
-
- // aapt resource value: 1
- public const int FontFamily_fontProviderPackage = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderQuery = 2;
-
+ // aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
public static int[] FontFamilyFont = new int[] {
- 2130772311,
- 2130772312,
- 2130772313};
-
- // aapt resource value: 1
- public const int FontFamilyFont_font = 1;
+ 2130968741,
+ 2130968749,
+ 2130968750};
// aapt resource value: 0
- public const int FontFamilyFont_fontStyle = 0;
+ public const int FontFamilyFont_font = 0;
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_fontStyle = 1;
// aapt resource value: 2
public const int FontFamilyFont_fontWeight = 2;
+ // aapt resource value: 0
+ public const int FontFamily_fontProviderAuthority = 0;
+
+ // aapt resource value: 1
+ public const int FontFamily_fontProviderCerts = 1;
+
+ // aapt resource value: 2
+ public const int FontFamily_fontProviderFetchStrategy = 2;
+
+ // aapt resource value: 3
+ public const int FontFamily_fontProviderFetchTimeout = 3;
+
+ // aapt resource value: 4
+ public const int FontFamily_fontProviderPackage = 4;
+
+ // aapt resource value: 5
+ public const int FontFamily_fontProviderQuery = 5;
+
+ // aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
- 2130772265};
+ 2130968751};
// aapt resource value: 0
public const int ForegroundLinearLayout_android_foreground = 0;
@@ -6796,142 +6795,146 @@
// aapt resource value: 2
public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
+ // aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
public static int[] HDLArcSeekBar = new int[] {
- 2130772382,
- 2130772383,
- 2130772384,
- 2130772385,
- 2130772386,
- 2130772387,
- 2130772388,
- 2130772389,
- 2130772390,
- 2130772391,
- 2130772392,
- 2130772393,
- 2130772394,
- 2130772395,
- 2130772396,
- 2130772397,
- 2130772398,
- 2130772399};
+ 2130968617,
+ 2130968618,
+ 2130968619,
+ 2130968620,
+ 2130968621,
+ 2130968622,
+ 2130968623,
+ 2130968624,
+ 2130968625,
+ 2130968626,
+ 2130968627,
+ 2130968628,
+ 2130968629,
+ 2130968630,
+ 2130968631,
+ 2130968632,
+ 2130968633,
+ 2130968754};
- // aapt resource value: 5
- public const int HDLArcSeekBar_arc_border_color = 5;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_border_width = 4;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_colors = 3;
-
- // aapt resource value: 6
- public const int HDLArcSeekBar_arc_max = 6;
-
- // aapt resource value: 7
- public const int HDLArcSeekBar_arc_min = 7;
+ // aapt resource value: 0
+ public const int HDLArcSeekBar_arc_border_color = 0;
// aapt resource value: 1
- public const int HDLArcSeekBar_arc_open_angle = 1;
-
- // aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress = 8;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_progress_bar_color = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+ public const int HDLArcSeekBar_arc_border_width = 1;
// aapt resource value: 2
- public const int HDLArcSeekBar_arc_rotate_angle = 2;
+ public const int HDLArcSeekBar_arc_colors = 2;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_shadow_radius = 15;
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_max = 3;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_min = 4;
+
+ // aapt resource value: 5
+ public const int HDLArcSeekBar_arc_open_angle = 5;
+
+ // aapt resource value: 6
+ public const int HDLArcSeekBar_arc_progress = 6;
+
+ // aapt resource value: 7
+ public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+
+ // aapt resource value: 8
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_rotate_angle = 9;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_thumb_color = 10;
+ public const int HDLArcSeekBar_arc_shadow_radius = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_radius = 11;
+ public const int HDLArcSeekBar_arc_thumb_color = 11;
+
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_radius = 12;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_thumb_width = 9;
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_thumb_width = 15;
+
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_width = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
+
+ // aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130968702,
+ 2130968703,
+ 2130968704,
+ 2130968705,
+ 2130968706,
+ 2130968847};
// aapt resource value: 0
- public const int HDLArcSeekBar_arc_width = 0;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
- // aapt resource value: 14
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
-
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130772400,
- 2130772401,
- 2130772402,
- 2130772403,
- 2130772404,
- 2130772405};
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
-
- // aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_color = 0;
-
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_curtain_bar_height = 5;
+ public const int HDLCurtainSeekBar_curtain_bar_height = 3;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
public static int[] HDLWaveSeekBar = new int[] {
- 2130772406,
- 2130772407,
- 2130772408,
- 2130772409,
- 2130772410,
- 2130772411};
-
- // aapt resource value: 1
- public const int HDLWaveSeekBar_second_wave_color = 1;
-
- // aapt resource value: 2
- public const int HDLWaveSeekBar_wave_bg_color = 2;
-
- // aapt resource value: 3
- public const int HDLWaveSeekBar_wave_border_color = 3;
+ 2130968848,
+ 2130969005,
+ 2130969006,
+ 2130969007,
+ 2130969008,
+ 2130969009};
// aapt resource value: 0
- public const int HDLWaveSeekBar_wave_color = 0;
+ public const int HDLWaveSeekBar_second_wave_color = 0;
- // aapt resource value: 5
- public const int HDLWaveSeekBar_wave_height = 5;
+ // aapt resource value: 1
+ public const int HDLWaveSeekBar_wave_bg_color = 1;
+
+ // aapt resource value: 2
+ public const int HDLWaveSeekBar_wave_border_color = 2;
+
+ // aapt resource value: 3
+ public const int HDLWaveSeekBar_wave_color = 3;
// aapt resource value: 4
- public const int HDLWaveSeekBar_wave_width = 4;
+ public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 5
+ public const int HDLWaveSeekBar_wave_width = 5;
+
+ // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130771988,
- 2130772158,
- 2130772159,
- 2130772160};
+ 2130968712,
+ 2130968714,
+ 2130968807,
+ 2130968853};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -6951,15 +6954,10 @@
// aapt resource value: 5
public const int LinearLayoutCompat_divider = 5;
- // aapt resource value: 8
- public const int LinearLayoutCompat_dividerPadding = 8;
-
// aapt resource value: 6
- public const int LinearLayoutCompat_measureWithLargestChild = 6;
+ public const int LinearLayoutCompat_dividerPadding = 6;
- // aapt resource value: 7
- public const int LinearLayoutCompat_showDividers = 7;
-
+ // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
@@ -6978,6 +6976,13 @@
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_measureWithLargestChild = 7;
+
+ // aapt resource value: 8
+ public const int LinearLayoutCompat_showDividers = 8;
+
+ // aapt resource value: { 0x10102AC,0x10102AD }
public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -6988,6 +6993,7 @@
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
+ // aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
public static int[] MenuGroup = new int[] {
16842766,
16842960,
@@ -7014,6 +7020,7 @@
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
+ // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -7028,28 +7035,28 @@
16843236,
16843237,
16843375,
- 2130772161,
- 2130772162,
- 2130772163,
- 2130772164,
- 2130772165,
- 2130772166,
- 2130772167,
- 2130772168,
- 2130772169,
- 2130772170};
-
- // aapt resource value: 16
- public const int MenuItem_actionLayout = 16;
-
- // aapt resource value: 18
- public const int MenuItem_actionProviderClass = 18;
-
- // aapt resource value: 17
- public const int MenuItem_actionViewClass = 17;
+ 2130968589,
+ 2130968607,
+ 2130968608,
+ 2130968616,
+ 2130968689,
+ 2130968764,
+ 2130968765,
+ 2130968813,
+ 2130968852,
+ 2130968999};
// aapt resource value: 13
- public const int MenuItem_alphabeticModifiers = 13;
+ public const int MenuItem_actionLayout = 13;
+
+ // aapt resource value: 14
+ public const int MenuItem_actionProviderClass = 14;
+
+ // aapt resource value: 15
+ public const int MenuItem_actionViewClass = 15;
+
+ // aapt resource value: 16
+ public const int MenuItem_alphabeticModifiers = 16;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7090,24 +7097,25 @@
// aapt resource value: 4
public const int MenuItem_android_visible = 4;
+ // aapt resource value: 17
+ public const int MenuItem_contentDescription = 17;
+
+ // aapt resource value: 18
+ public const int MenuItem_iconTint = 18;
+
// aapt resource value: 19
- public const int MenuItem_contentDescription = 19;
-
- // aapt resource value: 21
- public const int MenuItem_iconTint = 21;
-
- // aapt resource value: 22
- public const int MenuItem_iconTintMode = 22;
-
- // aapt resource value: 14
- public const int MenuItem_numericModifiers = 14;
-
- // aapt resource value: 15
- public const int MenuItem_showAsAction = 15;
+ public const int MenuItem_iconTintMode = 19;
// aapt resource value: 20
- public const int MenuItem_tooltipText = 20;
+ public const int MenuItem_numericModifiers = 20;
+ // aapt resource value: 21
+ public const int MenuItem_showAsAction = 21;
+
+ // aapt resource value: 22
+ public const int MenuItem_tooltipText = 22;
+
+ // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -7116,8 +7124,8 @@
16843055,
16843056,
16843057,
- 2130772171,
- 2130772172};
+ 2130968830,
+ 2130968934};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -7146,17 +7154,18 @@
// aapt resource value: 8
public const int MenuView_subMenuArrow = 8;
+ // aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
public static int[] NavigationView = new int[] {
16842964,
16842973,
16843039,
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269,
- 2130772270,
- 2130772271};
+ 2130968723,
+ 2130968755,
+ 2130968772,
+ 2130968773,
+ 2130968775,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int NavigationView_android_background = 0;
@@ -7170,28 +7179,63 @@
// aapt resource value: 3
public const int NavigationView_elevation = 3;
- // aapt resource value: 9
- public const int NavigationView_headerLayout = 9;
-
- // aapt resource value: 7
- public const int NavigationView_itemBackground = 7;
+ // aapt resource value: 4
+ public const int NavigationView_headerLayout = 4;
// aapt resource value: 5
- public const int NavigationView_itemIconTint = 5;
-
- // aapt resource value: 8
- public const int NavigationView_itemTextAppearance = 8;
+ public const int NavigationView_itemBackground = 5;
// aapt resource value: 6
- public const int NavigationView_itemTextColor = 6;
+ public const int NavigationView_itemIconTint = 6;
+
+ // aapt resource value: 7
+ public const int NavigationView_itemTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int NavigationView_itemTextColor = 8;
+
+ // aapt resource value: 9
+ public const int NavigationView_menu = 9;
+
+ // aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
+ public static int[] pickerview = new int[] {
+ 2130969010,
+ 2130969011,
+ 2130969012,
+ 2130969013,
+ 2130969014,
+ 2130969015};
+
+ // aapt resource value: 0
+ public const int pickerview_wheelview_dividerColor = 0;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_gravity = 1;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_lineSpacingMultiplier = 2;
+
+ // aapt resource value: 3
+ public const int pickerview_wheelview_textColorCenter = 3;
// aapt resource value: 4
- public const int NavigationView_menu = 4;
+ public const int pickerview_wheelview_textColorOut = 4;
+ // aapt resource value: 5
+ public const int pickerview_wheelview_textSize = 5;
+
+ // aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130772173};
+ 2130968814};
+
+ // aapt resource value: { 0x7F040161 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130968929};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7202,15 +7246,10 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130772174};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
-
+ // aapt resource value: { 0x7F0400EF,0x7F0400F2 }
public static int[] RecycleListView = new int[] {
- 2130772175,
- 2130772176};
+ 2130968815,
+ 2130968818};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7218,18 +7257,19 @@
// aapt resource value: 1
public const int RecycleListView_paddingTopNoTitle = 1;
+ // aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
public static int[] RecyclerView = new int[] {
16842948,
16842993,
- 2130771968,
- 2130771969,
- 2130771970,
- 2130771971,
- 2130771972,
- 2130771973,
- 2130771974,
- 2130771975,
- 2130771976};
+ 2130968736,
+ 2130968737,
+ 2130968738,
+ 2130968739,
+ 2130968740,
+ 2130968779,
+ 2130968840,
+ 2130968857,
+ 2130968928};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -7237,63 +7277,66 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 6
- public const int RecyclerView_fastScrollEnabled = 6;
-
- // aapt resource value: 9
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
-
- // aapt resource value: 10
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
-
- // aapt resource value: 7
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
-
// aapt resource value: 2
- public const int RecyclerView_layoutManager = 2;
-
- // aapt resource value: 4
- public const int RecyclerView_reverseLayout = 4;
+ public const int RecyclerView_fastScrollEnabled = 2;
// aapt resource value: 3
- public const int RecyclerView_spanCount = 3;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
+
+ // aapt resource value: 4
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
// aapt resource value: 5
- public const int RecyclerView_stackFromEnd = 5;
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
+ // aapt resource value: 6
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
+
+ // aapt resource value: 7
+ public const int RecyclerView_layoutManager = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_reverseLayout = 8;
+
+ // aapt resource value: 9
+ public const int RecyclerView_spanCount = 9;
+
+ // aapt resource value: 10
+ public const int RecyclerView_stackFromEnd = 10;
+
+ // aapt resource value: { 0x7F0400C2 }
public static int[] ScrimInsetsFrameLayout = new int[] {
- 2130772272};
+ 2130968770};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
+ // aapt resource value: { 0x7F04004A }
public static int[] ScrollingViewBehavior_Layout = new int[] {
- 2130772273};
+ 2130968650};
// aapt resource value: 0
public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
+ // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F04005F,0x7F040070,0x7F040084,0x7F0400B1,0x7F0400BE,0x7F0400CA,0x7F040102,0x7F040103,0x7F04010C,0x7F04010D,0x7F040167,0x7F04016C,0x7F0401AC }
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130772177,
- 2130772178,
- 2130772179,
- 2130772180,
- 2130772181,
- 2130772182,
- 2130772183,
- 2130772184,
- 2130772185,
- 2130772186,
- 2130772187,
- 2130772188,
- 2130772189};
+ 2130968671,
+ 2130968688,
+ 2130968708,
+ 2130968753,
+ 2130968766,
+ 2130968778,
+ 2130968834,
+ 2130968835,
+ 2130968844,
+ 2130968845,
+ 2130968935,
+ 2130968940,
+ 2130969004};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -7307,83 +7350,84 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 8
- public const int SearchView_closeIcon = 8;
-
- // aapt resource value: 13
- public const int SearchView_commitIcon = 13;
-
- // aapt resource value: 7
- public const int SearchView_defaultQueryHint = 7;
-
- // aapt resource value: 9
- public const int SearchView_goIcon = 9;
+ // aapt resource value: 4
+ public const int SearchView_closeIcon = 4;
// aapt resource value: 5
- public const int SearchView_iconifiedByDefault = 5;
-
- // aapt resource value: 4
- public const int SearchView_layout = 4;
-
- // aapt resource value: 15
- public const int SearchView_queryBackground = 15;
+ public const int SearchView_commitIcon = 5;
// aapt resource value: 6
- public const int SearchView_queryHint = 6;
+ public const int SearchView_defaultQueryHint = 6;
- // aapt resource value: 11
- public const int SearchView_searchHintIcon = 11;
+ // aapt resource value: 7
+ public const int SearchView_goIcon = 7;
+
+ // aapt resource value: 8
+ public const int SearchView_iconifiedByDefault = 8;
+
+ // aapt resource value: 9
+ public const int SearchView_layout = 9;
// aapt resource value: 10
- public const int SearchView_searchIcon = 10;
+ public const int SearchView_queryBackground = 10;
- // aapt resource value: 16
- public const int SearchView_submitBackground = 16;
-
- // aapt resource value: 14
- public const int SearchView_suggestionRowLayout = 14;
+ // aapt resource value: 11
+ public const int SearchView_queryHint = 11;
// aapt resource value: 12
- public const int SearchView_voiceIcon = 12;
+ public const int SearchView_searchHintIcon = 12;
+ // aapt resource value: 13
+ public const int SearchView_searchIcon = 13;
+
+ // aapt resource value: 14
+ public const int SearchView_submitBackground = 14;
+
+ // aapt resource value: 15
+ public const int SearchView_suggestionRowLayout = 15;
+
+ // aapt resource value: 16
+ public const int SearchView_voiceIcon = 16;
+
+ // aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 2130772316,
- 2130772326,
- 2130772342,
- 2130772343,
- 2130772344,
- 2130772345,
- 2130772346,
- 2130772347,
- 2130772348,
- 2130772349,
- 2130772350,
- 2130772351,
- 2130772352,
- 2130772353,
- 2130772354,
- 2130772355,
- 2130772356,
- 2130772357,
- 2130772358,
- 2130772359,
- 2130772360,
- 2130772361,
- 2130772362,
- 2130772363,
- 2130772364,
- 2130772365,
- 2130772366,
- 2130772367,
- 2130772368,
- 2130772369,
- 2130772370,
- 2130772371,
- 2130772372,
- 2130772373,
- 2130772374};
+ 2130968863,
+ 2130968866,
+ 2130968867,
+ 2130968868,
+ 2130968875,
+ 2130968876,
+ 2130968877,
+ 2130968878,
+ 2130968879,
+ 2130968880,
+ 2130968881,
+ 2130968884,
+ 2130968885,
+ 2130968886,
+ 2130968887,
+ 2130968888,
+ 2130968889,
+ 2130968891,
+ 2130968892,
+ 2130968893,
+ 2130968894,
+ 2130968897,
+ 2130968898,
+ 2130968901,
+ 2130968902,
+ 2130968903,
+ 2130968904,
+ 2130968905,
+ 2130968906,
+ 2130968907,
+ 2130968908,
+ 2130968909,
+ 2130968910,
+ 2130968913,
+ 2130968914};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7391,125 +7435,127 @@
// aapt resource value: 1
public const int SmartRefreshLayout_android_clipToPadding = 1;
+ // aapt resource value: { 0x7F0400D6,0x7F0400D7 }
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130968790,
+ 2130968791};
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
+
// aapt resource value: 2
public const int SmartRefreshLayout_srlAccentColor = 2;
- // aapt resource value: 34
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
-
- // aapt resource value: 33
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlDragRate = 9;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableLoadMore = 15;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableRefresh = 14;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
-
- // aapt resource value: 36
- public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
-
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlFooterHeight = 6;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlFooterInsetStart = 8;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlHeaderHeight = 5;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
-
// aapt resource value: 3
- public const int SmartRefreshLayout_srlPrimaryColor = 3;
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
// aapt resource value: 4
- public const int SmartRefreshLayout_srlReboundDuration = 4;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
- public static int[] SmartRefreshLayout_Layout = new int[] {
- 2130772315,
- 2130772375};
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlDragRate = 5;
- // aapt resource value: 1
- public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
- // aapt resource value: 0
- public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
+
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlEnableLoadMore = 13;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnableRefresh = 20;
+
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlFooterHeight = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlFooterInsetStart = 26;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlHeaderHeight = 30;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+
+ // aapt resource value: 33
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlPrimaryColor = 35;
+
+ // aapt resource value: 36
+ public const int SmartRefreshLayout_srlReboundDuration = 36;
+
+ // aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
public static int[] SnackbarLayout = new int[] {
16843039,
- 2130772005,
- 2130772274};
+ 2130968723,
+ 2130968805};
// aapt resource value: 0
public const int SnackbarLayout_android_maxWidth = 0;
@@ -7520,12 +7566,13 @@
// aapt resource value: 2
public const int SnackbarLayout_maxActionInlineWidth = 2;
+ // aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130772006};
+ 2130968828};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -7542,21 +7589,22 @@
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
+ // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
- 2130772190,
- 2130772191,
- 2130772192,
- 2130772193,
- 2130772194,
- 2130772195,
- 2130772196,
- 2130772197,
- 2130772198,
- 2130772199,
- 2130772200};
+ 2130968854,
+ 2130968861,
+ 2130968941,
+ 2130968942,
+ 2130968944,
+ 2130968975,
+ 2130968976,
+ 2130968977,
+ 2130969000,
+ 2130969001,
+ 2130969002};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -7567,39 +7615,40 @@
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
- // aapt resource value: 13
- public const int SwitchCompat_showText = 13;
+ // aapt resource value: 3
+ public const int SwitchCompat_showText = 3;
- // aapt resource value: 12
- public const int SwitchCompat_splitTrack = 12;
+ // aapt resource value: 4
+ public const int SwitchCompat_splitTrack = 4;
- // aapt resource value: 10
- public const int SwitchCompat_switchMinWidth = 10;
+ // aapt resource value: 5
+ public const int SwitchCompat_switchMinWidth = 5;
- // aapt resource value: 11
- public const int SwitchCompat_switchPadding = 11;
+ // aapt resource value: 6
+ public const int SwitchCompat_switchPadding = 6;
- // aapt resource value: 9
- public const int SwitchCompat_switchTextAppearance = 9;
+ // aapt resource value: 7
+ public const int SwitchCompat_switchTextAppearance = 7;
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
- // aapt resource value: 3
- public const int SwitchCompat_thumbTint = 3;
+ // aapt resource value: 9
+ public const int SwitchCompat_thumbTint = 9;
- // aapt resource value: 4
- public const int SwitchCompat_thumbTintMode = 4;
+ // aapt resource value: 10
+ public const int SwitchCompat_thumbTintMode = 10;
- // aapt resource value: 5
- public const int SwitchCompat_track = 5;
+ // aapt resource value: 11
+ public const int SwitchCompat_track = 11;
- // aapt resource value: 6
- public const int SwitchCompat_trackTint = 6;
+ // aapt resource value: 12
+ public const int SwitchCompat_trackTint = 12;
- // aapt resource value: 7
- public const int SwitchCompat_trackTintMode = 7;
+ // aapt resource value: 13
+ public const int SwitchCompat_trackTintMode = 13;
+ // aapt resource value: { 0x1010002,0x10100F2,0x101014F }
public static int[] TabItem = new int[] {
16842754,
16842994,
@@ -7614,56 +7663,57 @@
// aapt resource value: 2
public const int TabItem_android_text = 2;
+ // aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
public static int[] TabLayout = new int[] {
- 2130772275,
- 2130772276,
- 2130772277,
- 2130772278,
- 2130772279,
- 2130772280,
- 2130772281,
- 2130772282,
- 2130772283,
- 2130772284,
- 2130772285,
- 2130772286,
- 2130772287,
- 2130772288,
- 2130772289,
- 2130772290};
-
- // aapt resource value: 3
- public const int TabLayout_tabBackground = 3;
-
- // aapt resource value: 2
- public const int TabLayout_tabContentStart = 2;
-
- // aapt resource value: 5
- public const int TabLayout_tabGravity = 5;
+ 2130968945,
+ 2130968946,
+ 2130968947,
+ 2130968948,
+ 2130968949,
+ 2130968950,
+ 2130968951,
+ 2130968952,
+ 2130968953,
+ 2130968954,
+ 2130968955,
+ 2130968956,
+ 2130968957,
+ 2130968958,
+ 2130968959,
+ 2130968960};
// aapt resource value: 0
- public const int TabLayout_tabIndicatorColor = 0;
+ public const int TabLayout_tabBackground = 0;
// aapt resource value: 1
- public const int TabLayout_tabIndicatorHeight = 1;
+ public const int TabLayout_tabContentStart = 1;
- // aapt resource value: 7
- public const int TabLayout_tabMaxWidth = 7;
+ // aapt resource value: 2
+ public const int TabLayout_tabGravity = 2;
+
+ // aapt resource value: 3
+ public const int TabLayout_tabIndicatorColor = 3;
+
+ // aapt resource value: 4
+ public const int TabLayout_tabIndicatorHeight = 4;
+
+ // aapt resource value: 5
+ public const int TabLayout_tabMaxWidth = 5;
// aapt resource value: 6
public const int TabLayout_tabMinWidth = 6;
- // aapt resource value: 4
- public const int TabLayout_tabMode = 4;
+ // aapt resource value: 7
+ public const int TabLayout_tabMode = 7;
- // aapt resource value: 15
- public const int TabLayout_tabPadding = 15;
+ // aapt resource value: 8
+ public const int TabLayout_tabPadding = 8;
- // aapt resource value: 14
- public const int TabLayout_tabPaddingBottom = 14;
+ // aapt resource value: 9
+ public const int TabLayout_tabPaddingBottom = 9;
- // aapt resource value: 13
- public const int TabLayout_tabPaddingEnd = 13;
+ // aapt resource value: 10
+ public const int TabLayout_tabPaddingEnd = 10;
// aapt resource value: 11
public const int TabLayout_tabPaddingStart = 11;
@@ -7671,15 +7721,16 @@
// aapt resource value: 12
public const int TabLayout_tabPaddingTop = 12;
- // aapt resource value: 10
- public const int TabLayout_tabSelectedTextColor = 10;
+ // aapt resource value: 13
+ public const int TabLayout_tabSelectedTextColor = 13;
- // aapt resource value: 8
- public const int TabLayout_tabTextAppearance = 8;
+ // aapt resource value: 14
+ public const int TabLayout_tabTextAppearance = 14;
- // aapt resource value: 9
- public const int TabLayout_tabTextColor = 9;
+ // aapt resource value: 15
+ public const int TabLayout_tabTextColor = 15;
+ // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -7692,8 +7743,8 @@
16843107,
16843108,
16843692,
- 2130772022,
- 2130772028};
+ 2130968742,
+ 2130968961};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -7728,29 +7779,30 @@
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
- // aapt resource value: 12
- public const int TextAppearance_fontFamily = 12;
-
// aapt resource value: 11
- public const int TextAppearance_textAllCaps = 11;
+ public const int TextAppearance_fontFamily = 11;
+ // aapt resource value: 12
+ public const int TextAppearance_textAllCaps = 12;
+
+ // aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
public static int[] TextInputLayout = new int[] {
16842906,
16843088,
- 2130772291,
- 2130772292,
- 2130772293,
- 2130772294,
- 2130772295,
- 2130772296,
- 2130772297,
- 2130772298,
- 2130772299,
- 2130772300,
- 2130772301,
- 2130772302,
- 2130772303,
- 2130772304};
+ 2130968698,
+ 2130968699,
+ 2130968700,
+ 2130968701,
+ 2130968724,
+ 2130968725,
+ 2130968758,
+ 2130968759,
+ 2130968760,
+ 2130968822,
+ 2130968823,
+ 2130968824,
+ 2130968825,
+ 2130968826};
// aapt resource value: 1
public const int TextInputLayout_android_hint = 1;
@@ -7758,41 +7810,41 @@
// aapt resource value: 0
public const int TextInputLayout_android_textColorHint = 0;
- // aapt resource value: 6
- public const int TextInputLayout_counterEnabled = 6;
-
- // aapt resource value: 7
- public const int TextInputLayout_counterMaxLength = 7;
-
- // aapt resource value: 9
- public const int TextInputLayout_counterOverflowTextAppearance = 9;
-
- // aapt resource value: 8
- public const int TextInputLayout_counterTextAppearance = 8;
-
- // aapt resource value: 4
- public const int TextInputLayout_errorEnabled = 4;
-
- // aapt resource value: 5
- public const int TextInputLayout_errorTextAppearance = 5;
-
- // aapt resource value: 10
- public const int TextInputLayout_hintAnimationEnabled = 10;
+ // aapt resource value: 2
+ public const int TextInputLayout_counterEnabled = 2;
// aapt resource value: 3
- public const int TextInputLayout_hintEnabled = 3;
+ public const int TextInputLayout_counterMaxLength = 3;
- // aapt resource value: 2
- public const int TextInputLayout_hintTextAppearance = 2;
+ // aapt resource value: 4
+ public const int TextInputLayout_counterOverflowTextAppearance = 4;
- // aapt resource value: 13
- public const int TextInputLayout_passwordToggleContentDescription = 13;
+ // aapt resource value: 5
+ public const int TextInputLayout_counterTextAppearance = 5;
+
+ // aapt resource value: 6
+ public const int TextInputLayout_errorEnabled = 6;
+
+ // aapt resource value: 7
+ public const int TextInputLayout_errorTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int TextInputLayout_hintAnimationEnabled = 8;
+
+ // aapt resource value: 9
+ public const int TextInputLayout_hintEnabled = 9;
+
+ // aapt resource value: 10
+ public const int TextInputLayout_hintTextAppearance = 10;
+
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleContentDescription = 11;
// aapt resource value: 12
public const int TextInputLayout_passwordToggleDrawable = 12;
- // aapt resource value: 11
- public const int TextInputLayout_passwordToggleEnabled = 11;
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleEnabled = 13;
// aapt resource value: 14
public const int TextInputLayout_passwordToggleTint = 14;
@@ -7800,36 +7852,37 @@
// aapt resource value: 15
public const int TextInputLayout_passwordToggleTintMode = 15;
+ // aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 2130771980,
- 2130771983,
- 2130771987,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772006,
- 2130772201,
- 2130772202,
- 2130772203,
- 2130772204,
- 2130772205,
- 2130772206,
- 2130772207,
- 2130772208,
- 2130772209,
- 2130772210,
- 2130772211,
- 2130772212,
- 2130772213,
- 2130772214,
- 2130772215,
- 2130772216,
- 2130772217};
+ 2130968663,
+ 2130968673,
+ 2130968674,
+ 2130968690,
+ 2130968691,
+ 2130968692,
+ 2130968693,
+ 2130968694,
+ 2130968695,
+ 2130968803,
+ 2130968804,
+ 2130968806,
+ 2130968810,
+ 2130968811,
+ 2130968828,
+ 2130968936,
+ 2130968937,
+ 2130968938,
+ 2130968983,
+ 2130968985,
+ 2130968986,
+ 2130968987,
+ 2130968988,
+ 2130968989,
+ 2130968990,
+ 2130968991,
+ 2130968992};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -7837,20 +7890,20 @@
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
- // aapt resource value: 21
- public const int Toolbar_buttonGravity = 21;
+ // aapt resource value: 2
+ public const int Toolbar_buttonGravity = 2;
- // aapt resource value: 23
- public const int Toolbar_collapseContentDescription = 23;
+ // aapt resource value: 3
+ public const int Toolbar_collapseContentDescription = 3;
- // aapt resource value: 22
- public const int Toolbar_collapseIcon = 22;
+ // aapt resource value: 4
+ public const int Toolbar_collapseIcon = 4;
+
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetEnd = 5;
// aapt resource value: 6
- public const int Toolbar_contentInsetEnd = 6;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetEndWithActions = 10;
+ public const int Toolbar_contentInsetEndWithActions = 6;
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
@@ -7858,118 +7911,106 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
- // aapt resource value: 5
- public const int Toolbar_contentInsetStart = 5;
-
// aapt resource value: 9
- public const int Toolbar_contentInsetStartWithNavigation = 9;
+ public const int Toolbar_contentInsetStart = 9;
- // aapt resource value: 4
- public const int Toolbar_logo = 4;
-
- // aapt resource value: 26
- public const int Toolbar_logoDescription = 26;
-
- // aapt resource value: 20
- public const int Toolbar_maxButtonHeight = 20;
-
- // aapt resource value: 25
- public const int Toolbar_navigationContentDescription = 25;
-
- // aapt resource value: 24
- public const int Toolbar_navigationIcon = 24;
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetStartWithNavigation = 10;
// aapt resource value: 11
- public const int Toolbar_popupTheme = 11;
-
- // aapt resource value: 3
- public const int Toolbar_subtitle = 3;
-
- // aapt resource value: 13
- public const int Toolbar_subtitleTextAppearance = 13;
-
- // aapt resource value: 28
- public const int Toolbar_subtitleTextColor = 28;
-
- // aapt resource value: 2
- public const int Toolbar_title = 2;
-
- // aapt resource value: 14
- public const int Toolbar_titleMargin = 14;
-
- // aapt resource value: 18
- public const int Toolbar_titleMarginBottom = 18;
-
- // aapt resource value: 16
- public const int Toolbar_titleMarginEnd = 16;
-
- // aapt resource value: 15
- public const int Toolbar_titleMarginStart = 15;
-
- // aapt resource value: 17
- public const int Toolbar_titleMarginTop = 17;
-
- // aapt resource value: 19
- public const int Toolbar_titleMargins = 19;
+ public const int Toolbar_logo = 11;
// aapt resource value: 12
- public const int Toolbar_titleTextAppearance = 12;
+ public const int Toolbar_logoDescription = 12;
+
+ // aapt resource value: 13
+ public const int Toolbar_maxButtonHeight = 13;
+
+ // aapt resource value: 14
+ public const int Toolbar_navigationContentDescription = 14;
+
+ // aapt resource value: 15
+ public const int Toolbar_navigationIcon = 15;
+
+ // aapt resource value: 16
+ public const int Toolbar_popupTheme = 16;
+
+ // aapt resource value: 17
+ public const int Toolbar_subtitle = 17;
+
+ // aapt resource value: 18
+ public const int Toolbar_subtitleTextAppearance = 18;
+
+ // aapt resource value: 19
+ public const int Toolbar_subtitleTextColor = 19;
+
+ // aapt resource value: 20
+ public const int Toolbar_title = 20;
+
+ // aapt resource value: 21
+ public const int Toolbar_titleMargin = 21;
+
+ // aapt resource value: 22
+ public const int Toolbar_titleMarginBottom = 22;
+
+ // aapt resource value: 23
+ public const int Toolbar_titleMarginEnd = 23;
+
+ // aapt resource value: 26
+ public const int Toolbar_titleMargins = 26;
+
+ // aapt resource value: 24
+ public const int Toolbar_titleMarginStart = 24;
+
+ // aapt resource value: 25
+ public const int Toolbar_titleMarginTop = 25;
// aapt resource value: 27
- public const int Toolbar_titleTextColor = 27;
+ public const int Toolbar_titleTextAppearance = 27;
+ // aapt resource value: 28
+ public const int Toolbar_titleTextColor = 28;
+
+ // aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
public static int[] TwoLevelHeader = new int[] {
- 2130772376,
- 2130772377,
- 2130772378,
- 2130772379,
- 2130772380,
- 2130772381};
-
- // aapt resource value: 5
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
-
- // aapt resource value: 4
- public const int TwoLevelHeader_srlEnableTwoLevel = 4;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorDuration = 3;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlFloorRage = 1;
+ 2130968890,
+ 2130968895,
+ 2130968899,
+ 2130968900,
+ 2130968911,
+ 2130968915};
// aapt resource value: 0
- public const int TwoLevelHeader_srlMaxRage = 0;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlEnableTwoLevel = 1;
// aapt resource value: 2
- public const int TwoLevelHeader_srlRefreshRage = 2;
+ public const int TwoLevelHeader_srlFloorDuration = 2;
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorRage = 3;
+
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlMaxRage = 4;
+
+ // aapt resource value: 5
+ public const int TwoLevelHeader_srlRefreshRage = 5;
+
+ // aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
public static int[] View = new int[] {
16842752,
16842970,
- 2130772218,
- 2130772219,
- 2130772220};
+ 2130968816,
+ 2130968817,
+ 2130968973};
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 3
- public const int View_paddingEnd = 3;
-
- // aapt resource value: 2
- public const int View_paddingStart = 2;
-
- // aapt resource value: 4
- public const int View_theme = 4;
-
+ // aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130772221,
- 2130772222};
+ 2130968645,
+ 2130968646};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -7980,6 +8021,7 @@
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
+ // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
@@ -7994,31 +8036,20 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- public static int[] pickerview = new int[] {
- 2130772412,
- 2130772413,
- 2130772414,
- 2130772415,
- 2130772416,
- 2130772417};
-
- // aapt resource value: 4
- public const int pickerview_wheelview_dividerColor = 4;
+ // aapt resource value: 1
+ public const int View_android_focusable = 1;
// aapt resource value: 0
- public const int pickerview_wheelview_gravity = 0;
-
- // aapt resource value: 5
- public const int pickerview_wheelview_lineSpacingMultiplier = 5;
-
- // aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
+ public const int View_android_theme = 0;
// aapt resource value: 2
- public const int pickerview_wheelview_textColorOut = 2;
+ public const int View_paddingEnd = 2;
- // aapt resource value: 1
- public const int pickerview_wheelview_textSize = 1;
+ // aapt resource value: 3
+ public const int View_paddingStart = 3;
+
+ // aapt resource value: 4
+ public const int View_theme = 4;
static Styleable()
{
@@ -8029,6 +8060,25 @@
{
}
}
+
+ public partial class Xml
+ {
+
+ // aapt resource value: 0x7F100000
+ public const int file_paths = 2131755008;
+
+ // aapt resource value: 0x7F100001
+ public const int hdl_filepaths = 2131755009;
+
+ static Xml()
+ {
+ global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+ }
+
+ private Xml()
+ {
+ }
+ }
}
}
#pragma warning restore 1591
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index 51a85b9..fc43236 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -274,11 +274,27 @@
public static class QRCode
{
static ZXing.Mobile.MobileBarcodeScanner scanner;
- public static async System.Threading.Tasks.Task ScanQRcode(Action<string> action, string topText = "", string bottomText = "", string cancel = "Cancel")
+ public static async System.Threading.Tasks.Task ScanQRcode(Action<string> action, string cancel = "鍙栨秷", string flashText = "闂厜鐏�", string titleText = "浜岀淮鐮佹壂鎻�")
{
if (scanner == null)
{
- scanner = new ZXing.Mobile.MobileBarcodeScanner(Home.IOS.AppDelegate.rootViewController) { FlashButtonText = "", TopText = topText, BottomText = bottomText, CancelButtonText = cancel };
+ var mZXingOverlayView = new Home.IOS.ZXingOverlayView(cancel, flashText, titleText);
+ scanner = new ZXing.Mobile.MobileBarcodeScanner(Home.IOS.AppDelegate.rootViewController) { FlashButtonText = flashText, TopText = titleText, BottomText = "", CancelButtonText = cancel };
+ scanner.UseCustomOverlay = true;
+
+ scanner.CustomOverlay = mZXingOverlayView;
+ var bOn = false;
+ mZXingOverlayView.OnCancel += () => {
+
+ scanner?.Cancel();
+ };
+
+ mZXingOverlayView.OnTorch += () =>
+ {
+ bOn = !bOn;
+ scanner?.Torch(bOn);
+ };
+
}
var result = await scanner.Scan();
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png
new file mode 100644
index 0000000..bcd7313
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
new file mode 100644
index 0000000..e5486ed
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.png
new file mode 100644
index 0000000..e5486ed
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png
new file mode 100644
index 0000000..c9a024c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png
new file mode 100644
index 0000000..42589ec
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png
new file mode 100644
index 0000000..2c8d4de
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png
new file mode 100644
index 0000000..69a7045
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png
new file mode 100644
index 0000000..a5d4e0c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
new file mode 100644
index 0000000..b3a3828
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.png
new file mode 100644
index 0000000..b3a3828
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.png
new file mode 100644
index 0000000..b3a3828
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
new file mode 100644
index 0000000..83858fd
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.png
new file mode 100644
index 0000000..83858fd
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png
new file mode 100644
index 0000000..529ef23
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png
new file mode 100644
index 0000000..41a2319
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
new file mode 100644
index 0000000..191772c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.png
new file mode 100644
index 0000000..191772c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png
new file mode 100644
index 0000000..15b2a5a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
index 728e6c3..9b94864 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,249 @@
{
- "images": [
- {
- "size": "20x20",
- "idiom": "iphone",
- "filename": "icon-20@2x.png",
- "scale": "2x"
- },
- {
- "size": "20x20",
- "idiom": "iphone",
- "filename": "icon-20@3x.png",
- "scale": "3x"
- },
- {
- "size": "29x29",
- "idiom": "iphone",
- "filename": "icon-29.png",
- "scale": "1x"
- },
- {
- "size": "29x29",
- "idiom": "iphone",
- "filename": "icon-29@2x.png",
- "scale": "2x"
- },
- {
- "size": "29x29",
- "idiom": "iphone",
- "filename": "icon-29@3x.png",
- "scale": "3x"
- },
- {
- "size": "40x40",
- "idiom": "iphone",
- "filename": "icon-40@2x.png",
- "scale": "2x"
- },
- {
- "size": "40x40",
- "idiom": "iphone",
- "filename": "icon-40@3x.png",
- "scale": "3x"
- },
- {
- "size": "60x60",
- "idiom": "iphone",
- "filename": "icon-60@2x.png",
- "scale": "2x"
- },
- {
- "size": "60x60",
- "idiom": "iphone",
- "filename": "icon-60@3x.png",
- "scale": "3x"
- },
- {
- "size": "20x20",
- "idiom": "ipad",
- "filename": "icon-20-ipad.png",
- "scale": "1x"
- },
- {
- "size": "20x20",
- "idiom": "ipad",
- "filename": "icon-20@2x-ipad.png",
- "scale": "2x"
- },
- {
- "size": "29x29",
- "idiom": "ipad",
- "filename": "icon-29-ipad.png",
- "scale": "1x"
- },
- {
- "size": "29x29",
- "idiom": "ipad",
- "filename": "icon-29@2x-ipad.png",
- "scale": "2x"
- },
- {
- "size": "40x40",
- "idiom": "ipad",
- "filename": "icon-40.png",
- "scale": "1x"
- },
- {
- "size": "40x40",
- "idiom": "ipad",
- "filename": "icon-40@2x.png",
- "scale": "2x"
- },
- {
- "size": "76x76",
- "idiom": "ipad",
- "filename": "icon-76.png",
- "scale": "1x"
- },
- {
- "size": "76x76",
- "idiom": "ipad",
- "filename": "icon-76@2x.png",
- "scale": "2x"
- },
- {
- "size": "83.5x83.5",
- "idiom": "ipad",
- "filename": "icon-83.5@2x.png",
- "scale": "2x"
- },
- {
- "size": "1024x1024",
- "idiom": "ios-marketing",
- "filename": "icon-1024.png",
- "scale": "1x"
- }
- ],
- "info": {
- "version": 1,
- "author": "icon.wuruihong.com"
+ "images": [
+ {
+ "filename": "40*40.png",
+ "size": "20x20",
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "60*60.png",
+ "size": "20x20",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "58*58.png",
+ "size": "29x29",
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "87*87.png",
+ "size": "29x29",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "80*80-1.png",
+ "size": "40x40",
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "120*120.png",
+ "size": "40x40",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "120*120-1.png",
+ "size": "60x60",
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "180*180.png",
+ "size": "60x60",
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "filename": "20*20.png",
+ "size": "20x20",
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "40*40-1.png",
+ "size": "20x20",
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "29*29.png",
+ "size": "29x29",
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "58*58-1.png",
+ "size": "29x29",
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "40*40-2.png",
+ "size": "40x40",
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "80*80.png",
+ "size": "40x40",
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "167*167.png",
+ "size": "83.5x83.5",
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "76*76.png",
+ "size": "76x76",
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "152*152.png",
+ "size": "76x76",
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "filename": "1024*1024.png",
+ "size": "1024x1024",
+ "scale": "1x",
+ "idiom": "ios-marketing"
+ },
+ {
+ "size": "60x60",
+ "scale": "2x",
+ "idiom": "car"
+ },
+ {
+ "size": "60x60",
+ "scale": "3x",
+ "idiom": "car"
+ },
+ {
+ "role": "notificationCenter",
+ "size": "24x24",
+ "subtype": "38mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "notificationCenter",
+ "size": "27.5x27.5",
+ "subtype": "42mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "companionSettings",
+ "size": "29x29",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "companionSettings",
+ "size": "29x29",
+ "scale": "3x",
+ "idiom": "watch"
+ },
+ {
+ "role": "appLauncher",
+ "size": "40x40",
+ "subtype": "38mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "appLauncher",
+ "size": "44x44",
+ "subtype": "40mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "appLauncher",
+ "size": "50x50",
+ "subtype": "44mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "quickLook",
+ "size": "86x86",
+ "subtype": "38mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "quickLook",
+ "size": "98x98",
+ "subtype": "42mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "role": "quickLook",
+ "size": "108x108",
+ "subtype": "44mm",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "size": "1024x1024",
+ "scale": "1x",
+ "idiom": "watch-marketing"
+ },
+ {
+ "size": "16x16",
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "size": "16x16",
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "size": "32x32",
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "size": "32x32",
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "size": "128x128",
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "size": "128x128",
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "size": "256x256",
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "size": "256x256",
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "size": "512x512",
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "size": "512x512",
+ "scale": "2x",
+ "idiom": "mac"
}
+ ],
+ "info": {
+ "version": 1,
+ "author": "xcode"
+ }
}
\ No newline at end of file
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-1024.png
deleted file mode 100755
index cd71df7..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-1024.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
deleted file mode 100755
index 7222c6b..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png
deleted file mode 100755
index dd8484b..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
deleted file mode 100755
index f1e3ace..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
deleted file mode 100755
index f369e54..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png
deleted file mode 100755
index 50e5d52..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png
deleted file mode 100755
index 1e92c26..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
deleted file mode 100755
index 4f727b0..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
deleted file mode 100755
index e4e085e..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40.png
deleted file mode 100755
index dd8484b..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
deleted file mode 100755
index b6110a5..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
deleted file mode 100755
index 39b6b04..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
deleted file mode 100755
index 39b6b04..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
deleted file mode 100755
index b20e576..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76.png
deleted file mode 100755
index ef3ba5f..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
deleted file mode 100755
index 7349c28..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
deleted file mode 100755
index c690bdc..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X748.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X748.png
deleted file mode 100755
index 6475a8e..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X748.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X768.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X768.png
deleted file mode 100755
index 938bc00..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024X768.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.png
new file mode 100755
index 0000000..f9b76f8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.png
new file mode 100755
index 0000000..23bb0e1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png
new file mode 100755
index 0000000..23bb0e1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11 Pro Max.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11 Pro Max.png
new file mode 100755
index 0000000..86a7f91
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11 Pro Max.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11.png
new file mode 100755
index 0000000..5949696
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125X2436.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125X2436.png
deleted file mode 100755
index 500b969..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125X2436.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11pro.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11pro.png
new file mode 100755
index 0000000..2bac436
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/11pro.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2208.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2208.png
deleted file mode 100755
index cb891f2..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2208.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2688.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2688.png
deleted file mode 100755
index 5c34c33..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242X2688.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
new file mode 100755
index 0000000..4be6fa4
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2008.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2008.png
deleted file mode 100755
index 88de8d4..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2008.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2048.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2048.png
deleted file mode 100755
index 057b544..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536X2048.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.png
new file mode 100755
index 0000000..adab731
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.png
new file mode 100755
index 0000000..6fffb09
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png
new file mode 100755
index 0000000..6fffb09
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792X828.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792X828.png
deleted file mode 100755
index 4c70068..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792X828.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.png
new file mode 100755
index 0000000..522acce
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080.png
new file mode 100755
index 0000000..0bcc58b
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1496.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1496.png
deleted file mode 100755
index 40311c0..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1496.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1536.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1536.png
deleted file mode 100755
index e8b7629..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X1536.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X2732.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X2732.png
deleted file mode 100755
index 5085373..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048X2732.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.png
new file mode 100755
index 0000000..92c23a8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.png
new file mode 100755
index 0000000..ae0258e
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.png
new file mode 100755
index 0000000..ae0258e
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
new file mode 100755
index 0000000..946a965
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208X1242.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208X1242.png
deleted file mode 100755
index 5606364..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208X1242.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png
new file mode 100755
index 0000000..083312e
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436X1125.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436X1125.png
deleted file mode 100755
index d45bf38..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436X1125.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png
new file mode 100755
index 0000000..979f726
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688X1242.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688X1242.png
deleted file mode 100755
index 30d8bff..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688X1242.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png
new file mode 100755
index 0000000..da11cf8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320X480.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320X480.png
deleted file mode 100755
index 02353bf..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320X480.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.png
new file mode 100755
index 0000000..30d820c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160.png
new file mode 100755
index 0000000..087b39d
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X1136.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X1136.png
deleted file mode 100755
index 52767be..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X1136.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X960.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X960.png
deleted file mode 100755
index 4008423..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640X960.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png
new file mode 100755
index 0000000..cdcc25a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.png
new file mode 100755
index 0000000..cdcc25a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.png
new file mode 100755
index 0000000..c66f1f9
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png
new file mode 100755
index 0000000..c66f1f9
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750X1334.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750X1334.png
deleted file mode 100755
index 344a3d8..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750X1334.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png
new file mode 100755
index 0000000..597b374
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1004.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1004.png
deleted file mode 100755
index 35e8168..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1004.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1024.png
deleted file mode 100755
index 6b97ea8..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768X1024.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.png
new file mode 100755
index 0000000..266d439
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.png
new file mode 100755
index 0000000..0241dc5
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png
new file mode 100755
index 0000000..0241dc5
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828X1792.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828X1792.png
deleted file mode 100755
index 2652629..0000000
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828X1792.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 0348d45..92ff60a 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,7 +3,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1920X1080.png",
+ "filename": "1920_1080.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -12,7 +12,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "3840X2160.png",
+ "filename": "3840_2160.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -22,7 +22,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2688.png",
+ "filename": "11 Pro Max.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -32,7 +32,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "828X1792.png",
+ "filename": "11.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -42,7 +42,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2688X1242.png",
+ "filename": "2688_1242.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -52,7 +52,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1792X828.png",
+ "filename": "1792_828.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -62,7 +62,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1125X2436.png",
+ "filename": "11pro.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -72,7 +72,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2436X1125.png",
+ "filename": "2436_1125.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -82,7 +82,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242X2208.png",
+ "filename": "1242_2208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -92,7 +92,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "750X1334.png",
+ "filename": "750_1334.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -102,7 +102,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2208X1242.png",
+ "filename": "2208_1242.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -112,7 +112,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "2048X2732.png",
+ "filename": "2048_2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -121,7 +121,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640_960.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -130,7 +130,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640_1136.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -140,7 +140,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768_1024.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -149,7 +149,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536_2048.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -158,7 +158,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024_768.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -167,7 +167,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048_1536.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -175,7 +175,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "320X480.png",
+ "filename": "320_480.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -183,7 +183,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X960.png",
+ "filename": "640_960-1.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -191,7 +191,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640X1136.png",
+ "filename": "640_1136-1.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -200,7 +200,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "768X1004.png",
+ "filename": "768_1004.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -208,7 +208,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "1536X2008.png",
+ "filename": "1536_2008.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -216,7 +216,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768X1024.png",
+ "filename": "768_1024-1.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -224,7 +224,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536X2048.png",
+ "filename": "1536_2048-1.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -232,7 +232,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "1024X748.png",
+ "filename": "1024_748.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -240,7 +240,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "2048X1496.png",
+ "filename": "2048_1496.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -248,7 +248,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024X768.png",
+ "filename": "1024_768-1.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -256,7 +256,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048X1536.png",
+ "filename": "2048_1536-1.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index d8838be..c220b43 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -131,6 +131,7 @@
</Compile>
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
+ <Compile Include="ZXingOverlayView.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
@@ -141,48 +142,57 @@
<ItemGroup>
<ImageAsset Include="Assets.xcassets\.DS_Store" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-83.5%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-76.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-1024.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-60%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%403x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x-ipad.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-20%402x.png" />
- <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\icon-29-ipad.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X960.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920X1080.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125X2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1496.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1334.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2008.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1024.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840X2160.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436X1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640X1136.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208X1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828X1792.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242X2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768X1004.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792X828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024X748.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320X480.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536X2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688X1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11 Pro Max.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11pro.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60*60.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87*87.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20*20.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29*29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58*58-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40*40-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76*76.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152*152.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167*167.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024*1024.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80*80-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120*120-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180*180.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -349,16 +359,20 @@
<BundleResource Include="Resources\Phone\RollerShade\Open.png" />
<BundleResource Include="Resources\Phone\RollerShade\CloseSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Close.png" />
- <BundleResource Include="Resources\Phone\SceneIcon\8.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\9.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\4.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\5.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\7.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\6.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\2.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\3.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\1.jpg" />
- <BundleResource Include="Resources\Phone\SceneIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\SceneIcon\8.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\9.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\12.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\13.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\11.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\10.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\4.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\5.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\7.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\6.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\2.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\3.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\1.png" />
+ <BundleResource Include="Resources\Phone\SceneIcon\0.png" />
<BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" />
<BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
<BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" />
@@ -809,12 +823,28 @@
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Left_1.png" />
<BundleResource Include="Resources\Phone\Floor\SelectFloor_Right_3.png" />
<BundleResource Include="Resources\Phone\Floor\Floor.png" />
- <BundleResource Include="Resources\Phone\RoomIcon\4.JPG" />
- <BundleResource Include="Resources\Phone\RoomIcon\5.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\8.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\9.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\14.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\15.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\17.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\16.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\12.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\13.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\11.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\10.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\21.jpg" />
+ <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\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\Account\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
@@ -945,6 +975,7 @@
<BundleResource Include="Resources\Phone\RealDevice\SensorWater.png" />
<BundleResource Include="Resources\Phone\Gateway\WiredGatewaySearching.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGatewaySearching.png" />
+ <BundleResource Include="Resources\Phone\Gateway\GatewayIcon_6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway6.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\RealGateway1.png" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index 5b348d2..61e3e18 100755
--- a/ZigbeeApp/Home.Ios/Info.plist
+++ b/ZigbeeApp/Home.Ios/Info.plist
@@ -74,5 +74,7 @@
<string>weixin</string>
<string>weixinULAPI</string>
</array>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>zh_CN</string>
</dict>
</plist>
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 9c7a3d0..d6137cf 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -245,7 +245,6 @@
238=闀挎寜5绉掞紙鎸夐敭锛�
239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-240= S-one
241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
242=鐢甸噺
243=甯稿紑妯″紡宸插紑鍚�
@@ -271,7 +270,9 @@
263=鍖�
264=涓�
265=瑗�
-266=褰撳墠璁惧涓嶆敮鎸佽鍔熻兘
+266=褰撳墠璁惧涓嶅湪绾�
+267=鑾峰彇闊抽噺澶辫触
+268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
5097=鍙栨秷
5098=纭畾
@@ -527,6 +528,7 @@
5378=鎺ㄩ�佸唴瀹逛笉鑳戒负绌�.
5379=鏆傛棤鑱斿姩浜嬩欢{\r\n} 璇风偣鍑诲彸涓婅娣诲姞
5380=甯稿紑妯″紡
+5381=娣诲姞鏉′欢鎴栬�呮坊鍔犲姛鑳戒负绌�
@@ -1737,6 +1739,12 @@
16072=鑳屽厜鐏寒搴�
16073=鎵撳紑
16074=鏃ョ珛绌鸿皟妯″潡
+16075=瀹夎浣嶇疆
+16076=鎵�灞炰綇瀹�
+16077=涓嶅垎閰�
+16078=瀹ゅ唴鏈�
+16079=鎸夐敭
+16080=鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1822,7 +1830,7 @@
;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
30000=绱ф�ユ寜閽�
30001=鐕冩皵浼犳劅鍣�
30002=鐑熼浘浼犳劅鍣�
@@ -1860,6 +1868,7 @@
30034=绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
30035=绠�绾�2璺獥甯橀潰鏉�
30036=鏂规偊/2璺獥甯橀潰鏉�-Z
+30037=S-one
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -1876,4 +1885,60 @@
40011=娓╂箍搴︿紶鎰熷櫒
40012=娓╁害浼犳劅鍣�
40013=婀垮害浼犳劅鍣�
-40014=骞叉帴鐐�
\ No newline at end of file
+40014=寮�鍏�
+40015=鎻掑骇
+40016=鐏厜
+40017=骞叉帴鐐�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+50000=绱ф�ユ寜閽�
+50001=Zigbee鐕冩皵浼犳劅鍣�
+50002=Zigbee鐕冩皵浼犳劅鍣�
+50003=Zigbee姘存蹈浼犳劅鍣�
+50004=閽ュ寵鎵�
+50005=Zigbee闂ㄧ獥浼犳劅鍣�
+50006=Zigbee鏅鸿兘绌哄紑
+50007=Zigbee寮�鍚堝笜鐢垫満
+50008=Zigbee 4鎸夐敭闈㈡澘
+50009=Zigbee鍚搁《寮忎汉浣撶Щ鍔ㄤ紶鎰熷櫒
+50010=Zigbee澧欒缃戝叧
+50011=Zigbee 3鎸夐敭闈㈡澘
+50012=Zigbee 2鎸夐敭闈㈡澘
+50013=Zigbee 3璺�10A缁х數鍣�
+50014=Zigbee妗岄潰缃戝叧
+50015=璋冭瘯璁惧
+50016=Zigbee鍗峰笜鐢垫満
+50017=Zigbee涓户鍣�
+50018=Zigbee 12鎸夐敭闈㈡澘
+50019=Zigbee 4鎸夐敭闈㈡澘
+50020=Zigbee浜轰綋绉诲姩浼犳劅鍣�(鐞冨舰)
+50021=Zigbee 1璺�1.5A璋冨厜鍣�
+50022=Zigbee杞珺uspro鍗忚杞崲鍣�
+50023=Zigbee杞�485鍗忚杞崲鍣�
+50024=Zigbee绌鸿皟缃戝叧妯″潡
+50025=Zigbee鏅鸿兘闂ㄩ攣
+50026=Zigbee绠�绾�4鎸夐敭闈㈡澘
+50027=Zigbee绠�绾�3鎸夐敭闈㈡澘
+50028=Zigbee绠�绾�2鎸夐敭闈㈡澘
+50029=Zigbee鏂规偊鍗曞紑鍙屾帶闈㈡澘
+50030=Zigbee鏂规偊鍙屽紑鍥涙帶闈㈡澘
+50031=Zigbee鏂规偊鍥涘紑鍏帶闈㈡澘
+50032=Zigbee鏂规偊鏂伴闈㈡澘
+50033=Zigbee鏂规偊鐜闈㈡澘
+50034=Zigbee绠�绾�4鎸夐敭闈㈡澘
+50035=Zigbee绠�绾�2璺潰鏉�
+50036=Zigbee鏂规偊2璺獥甯橀潰鏉�
+50037=Zigbee鏅鸿兘闂ㄩ攣
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
+60000=浼犳劅鍣�
+60001=寮�鍏虫ā鍧�
+60002=閬槼妯″潡
+60003=鏅鸿兘闈㈡澘
+60004=鏅鸿兘缃戝叧
+60005=璋冭瘯璁惧
+60006=绯荤粺璁惧
+60007=璋冨厜妯″潡
+60008=杞崲鍣�
+60009=绌鸿皟妯″潡
+60010=鏅鸿兘闂ㄩ攣
\ No newline at end of file
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon1.png b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon1.png
index f11d3c7..4e66c42 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon1.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon6.png b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon6.png
index 8100032..f11d3c7 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon6.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon6.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon_6.png b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon_6.png
new file mode 100755
index 0000000..8100032
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Gateway/GatewayIcon_6.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
index 9856d91..0c0417d 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/0.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/1.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/1.JPG
index 57d12a3..9e3b447 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/1.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/1.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/10.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/10.jpg
new file mode 100755
index 0000000..7c9d697
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/10.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/11.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/11.jpg
new file mode 100755
index 0000000..0db80d1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/11.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/12.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/12.jpg
new file mode 100755
index 0000000..f3078c4
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/12.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/13.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/13.jpg
new file mode 100755
index 0000000..9eda99f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/13.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/14.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/14.jpg
new file mode 100755
index 0000000..aa48b13
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/14.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/15.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/15.jpg
new file mode 100755
index 0000000..f97c0c4
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/15.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/16.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/16.jpg
new file mode 100755
index 0000000..ec735b2
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/16.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/17.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/17.jpg
new file mode 100755
index 0000000..eb83b2b
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/17.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/18.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/18.jpg
new file mode 100755
index 0000000..786212f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/18.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/19.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/19.jpg
new file mode 100755
index 0000000..5ce4d02
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/19.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/2.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/2.JPG
index 3fd5092..e3dd8a7 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/2.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/2.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/20.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/20.jpg
new file mode 100755
index 0000000..689d58e
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/20.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/21.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/21.jpg
new file mode 100755
index 0000000..cc30bcf
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/21.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/3.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/3.JPG
index f067431..f687c2f 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/3.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/3.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/4.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/4.JPG
index 783119c..ccd4c22 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/4.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/4.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/5.JPG b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/5.JPG
index 11acf8a..fcfe099 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/5.JPG
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/5.JPG
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/6.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/6.jpg
new file mode 100755
index 0000000..ced08fc
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/6.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/7.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/7.jpg
new file mode 100755
index 0000000..e921b5f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/7.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/8.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/8.jpg
new file mode 100755
index 0000000..fef83e1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/8.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/9.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/9.jpg
new file mode 100755
index 0000000..6307eb3
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RoomIcon/9.jpg
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg
deleted file mode 100755
index 842fbdb..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.png
new file mode 100755
index 0000000..291e99a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/0.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg
deleted file mode 100755
index 85a2df1..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.png
new file mode 100755
index 0000000..7cb8a39
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/10.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/10.png
new file mode 100755
index 0000000..229952e
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/10.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/11.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/11.png
new file mode 100755
index 0000000..b20b362
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/11.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/12.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/12.png
new file mode 100755
index 0000000..75a0a18
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/12.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/13.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/13.png
new file mode 100755
index 0000000..3910ba3
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/13.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg
deleted file mode 100755
index 8d969d8..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.png
new file mode 100755
index 0000000..60ba5d0
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg
deleted file mode 100755
index e65a012..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.png
new file mode 100755
index 0000000..8114692
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg
deleted file mode 100755
index 01bdaa4..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.png
new file mode 100755
index 0000000..39173d5
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/4.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg
deleted file mode 100755
index 12fa10b..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.png
new file mode 100755
index 0000000..fdbfba0
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/5.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg
deleted file mode 100755
index c4f8c1c..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.png
new file mode 100755
index 0000000..cfe616b
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/6.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg
deleted file mode 100755
index 5404baa..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.png
new file mode 100755
index 0000000..281b3fa
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/7.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg
deleted file mode 100755
index c82a229..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.png
new file mode 100755
index 0000000..02cebe0
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/8.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg
deleted file mode 100755
index 0a90bf0..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.jpg
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.png b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.png
new file mode 100755
index 0000000..3d478a4
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SceneIcon/9.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/ZXingOverlayView.cs b/ZigbeeApp/Home.Ios/ZXingOverlayView.cs
new file mode 100755
index 0000000..e7bc553
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/ZXingOverlayView.cs
@@ -0,0 +1,168 @@
+锘縰sing System;
+using System.Collections.Generic;
+using AVFoundation;
+using CoreGraphics;
+using UIKit;
+
+namespace Home.IOS
+{
+ public class ZXingOverlayView : UIView
+ {
+ public UILabel textBottom;
+ UIView redLine;
+ public Action OnCancel;
+ public Action OnTorch;
+ public UIBarButtonItem cancelButton;
+ public UIBarButtonItem torchButton;
+ public string cancelText = "鍙栨秷";
+ public string flashText = "闂厜鐏�";
+ public string bottomText = "鎵竴鎵�";
+
+ CGSize screenSize = UIScreen.MainScreen.Bounds.Size;
+
+ public ZXingOverlayView(string cancelText = "鍙栨秷", string flashText = "闂厜鐏�", string titleText = "鎵竴鎵�") : base()
+ {
+ this.cancelText = cancelText;
+ this.flashText = flashText;
+ this.bottomText = titleText;
+
+ Opaque = false;
+ BackgroundColor = UIColor.Clear;
+
+ textBottom = new UILabel()
+ {
+ Frame = new CGRect(0, (screenSize.Height - 44 + screenSize.Width * 0.75f) / 2, screenSize.Width, 40f),
+ Text = bottomText,
+ Font = UIFont.SystemFontOfSize(13),
+ TextAlignment = UITextAlignment.Center,
+ TextColor = UIColor.White,
+ Lines = 0,
+ BackgroundColor = UIColor.Clear
+ };
+ this.AddSubview(textBottom);
+
+ var captureDevice = AVCaptureDevice.GetDefaultDevice(AVMediaType.Video);
+
+ bool hasTorch = false;
+
+ if (captureDevice != null)
+ hasTorch = captureDevice.TorchAvailable;
+
+ InvokeOnMainThread(delegate {
+ // Setting tool bar
+ var toolBar = new UIToolbar(new CGRect(0, Frame.Height - 44, Frame.Width, 44));
+
+ var buttons = new List<UIBarButtonItem>();
+ cancelButton = new UIBarButtonItem(cancelText, UIBarButtonItemStyle.Done, delegate { OnCancel?.Invoke(); });
+ cancelButton.SetTitleTextAttributes(new UITextAttributes { TextColor = UIColor.White }, UIControlState.Normal);
+ buttons.Add(cancelButton);
+ if (hasTorch)
+ {
+ buttons.Add(new UIBarButtonItem(UIBarButtonSystemItem.FlexibleSpace));
+
+ torchButton = new UIBarButtonItem(flashText, UIBarButtonItemStyle.Done, delegate { OnTorch?.Invoke(); });
+ torchButton.SetTitleTextAttributes(new UITextAttributes { TextColor = UIColor.White }, UIControlState.Normal);
+ buttons.Add(torchButton);
+ }
+
+ toolBar.Items = buttons.ToArray();
+ toolBar.BarTintColor = UIColor.Clear;
+ toolBar.Translucent = true;
+ toolBar.TintColor = UIColor.Black;
+ toolBar.AutoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleTopMargin;
+ Add(toolBar);
+ });
+
+ }
+
+ public override void Draw(CGRect rect)
+ {
+ CGRect screenDrawRect = new CGRect(0, 0, screenSize.Width, screenSize.Height - 44);
+
+ //涓棿娓呯┖鐨勭煩褰㈡
+ CGRect clearDrawRect = new CGRect(screenDrawRect.Size.Width * 0.125f, (screenDrawRect.Size.Height - screenDrawRect.Size.Width * 0.75f) / 2,
+ screenDrawRect.Size.Width * 0.75f, screenDrawRect.Size.Width * 0.75f);
+
+ CGContext ctx = UIGraphics.GetCurrentContext();
+ AddScreenFillRect(ctx, screenDrawRect);
+ AddCenterClearRect(ctx, clearDrawRect);
+ AddWhiteRect(ctx, clearDrawRect);
+ AddCornerLineWithContext(ctx, clearDrawRect);
+ }
+ //娣诲姞灞忓箷鍗婇�忔槑濉厖鑹�
+ private void AddScreenFillRect(CGContext ctx, CGRect rect)
+ {
+ ctx.SetFillColor(new CGColor(0, 0, 0, 0.5f));
+ ctx.FillRect(rect);
+ }
+ //娣诲姞涓績鍏ㄩ�忔槑濉厖鑹�
+ private void AddCenterClearRect(CGContext ctx, CGRect rect)
+ {
+ ctx.ClearRect(rect);
+ }
+ //鏍规嵁鐐圭敾绾�
+ private void AddLine(CGPoint[] pointA, CGPoint[] pointB, CGContext ctx)
+ {
+ ctx.SetLineWidth(2f);
+ ctx.AddLines(pointA);
+ ctx.AddLines(pointB);
+ }
+ //娣诲姞鐧借壊鏂规
+ private void AddWhiteRect(CGContext ctx, CGRect rect)
+ {
+ ctx.StrokeRect(rect);
+ ctx.SetStrokeColor(new CGColor(1, 1, 1, 1));
+ ctx.SetLineWidth(0.8f);
+ ctx.AddRect(rect);
+ ctx.StrokePath();
+ }
+ //娣诲姞鍥涗釜瑙掔殑钃濊壊
+ private void AddCornerLineWithContext(CGContext ctx, CGRect rect)
+ {
+ //鐢诲洓涓竟瑙�
+ ctx.SetLineWidth(2f);
+ ctx.SetStrokeColor(UIColor.FromRGB(22, 118, 188).CGColor);
+
+ //宸︿笂瑙�
+ CGPoint[] poinsTopLeftA = new CGPoint[] { new CGPoint(rect.Location.X + 0.7f, rect.Location.Y), new CGPoint(rect.Location.X + 0.7f, rect.Location.Y + 15f) };
+
+ CGPoint[] poinsTopLeftB = new CGPoint[] { new CGPoint(rect.Location.X, rect.Location.Y + 0.7f), new CGPoint(rect.Location.X + 15f, rect.Location.Y + 0.7f) };
+
+ AddLine(poinsTopLeftA, poinsTopLeftB, ctx);
+
+ //宸︿笅瑙�
+ CGPoint[] poinsBottomLeftA = new CGPoint[] { new CGPoint(rect.Location.X + 0.7f, rect.Location.Y + rect.Size.Height - 15f), new CGPoint(rect.Location.X + 0.7f, rect.Location.Y + rect.Size.Height) };
+
+ CGPoint[] poinsBottomLeftB = new CGPoint[] { new CGPoint(rect.Location.X, rect.Location.Y + rect.Size.Height - 0.7f), new CGPoint(rect.Location.X + 0.7f + 15f, rect.Location.Y + rect.Size.Height - 0.7f) };
+
+ AddLine(poinsBottomLeftA, poinsBottomLeftB, ctx);
+
+ //鍙充笂瑙�
+ CGPoint[] poinsTopRightA = new CGPoint[] { new CGPoint(rect.Location.X + rect.Size.Width - 15f, rect.Location.Y + 0.7f), new CGPoint(rect.Location.X + rect.Size.Width, rect.Location.Y + 0.7) };
+
+ CGPoint[] poinsTopRightB = new CGPoint[] { new CGPoint(rect.Location.X + rect.Size.Width - 0.7f, rect.Location.Y), new CGPoint(rect.Location.X + rect.Size.Width - 0.7f, rect.Location.Y + 15 + 0.7) };
+
+ AddLine(poinsTopRightA, poinsTopRightB, ctx);
+
+ CGPoint[] poinsBottomRightA = new CGPoint[] { new CGPoint(rect.Location.X + rect.Size.Width - 0.7f, rect.Location.Y + rect.Size.Height - 15f), new CGPoint(rect.Location.X - 0.7f + rect.Size.Width, rect.Location.Y + rect.Size.Height) };
+
+ CGPoint[] poinsBottomRightB = new CGPoint[] { new CGPoint(rect.Location.X + rect.Size.Width - 15f, rect.Location.Y + rect.Size.Height - 0.7f), new CGPoint(rect.Location.X + rect.Size.Width, rect.Location.Y + rect.Size.Height - 0.7f) };
+
+ AddLine(poinsBottomRightA, poinsBottomRightB, ctx);
+
+ ctx.StrokePath();
+ }
+
+ public void Destroy()
+ {
+ InvokeOnMainThread(() => {
+ textBottom.RemoveFromSuperview();
+ redLine.RemoveFromSuperview();
+
+ textBottom = null;
+ redLine = null;
+ });
+ }
+
+ }
+}
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index e4507bc..db37ad4 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -52,12 +52,12 @@
public static int SoftSmsType = 0;
public static string LogoString = @"Logo/Logo.png";
public static string RegisterLogoString = @"Logo/Register_logo.png";
- public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
- //public static string RequestHttpsHost = "http://172.16.2.192:13061";
+ //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
+ public static string RequestHttpsHost = "https://global.hdlcontrol.com/ProposedProductionApi";
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.20032001";
+ public static string CodeIDString = "1.0.20040201";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index c59d1e3..aeef774 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -62,9 +62,9 @@
/// </summary>
public const string deviceModelIdName = "uDeviceModelId";
/// <summary>
- /// R鏂囦欢閲岄潰璁惧榛樿鍚嶅瓧鐨処D
+ /// R鏂囦欢閲岄潰鎵�鏈夎澶囧悕瀛楃殑ID
/// </summary>
- public Dictionary<string, int> dicDeviceDefultNameID = null;
+ public Dictionary<string, int> dicDeviceAllNameID = null;
/// <summary>
/// 璁惧鐨勬ā鍧桰D鐨勬灇涓�(keys:妯″潡ID value:璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
/// </summary>
@@ -306,6 +306,7 @@
}
//濡傛灉鏈湴鍜岀綉鍏崇殑璁惧涓嶄竴鑷寸殑鏃跺�欙紝鍒犻櫎鏈湴鐨勮澶�
+ var listDeleteMac = new List<string>();
foreach (var device in dicExist.Values)
{
if (device is OTADevice)
@@ -316,6 +317,16 @@
{
this.DeleteMemmoryDevice(device, true);
}
+ if (listDeleteMac.Contains(device.DeviceAddr) == false)
+ {
+ //鏀堕泦琚垹闄ょ殑Mac
+ listDeleteMac.Add(device.DeviceAddr);
+ }
+ }
+ if (listDeleteMac.Count > 0)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(listDeleteMac);
}
return statu;
@@ -394,7 +405,7 @@
#region 鈻� 淇敼璁惧___________________________
/// <summary>
- /// 鏇存敼鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
+ /// 鏇存敼绔偣鍚嶅瓧骞朵笖鍒锋柊缂撳瓨(淇敼澶辫触鏃讹紝浼氭樉绀轰俊鎭�)
/// </summary>
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="newName">鏂板悕瀛�</param>
@@ -585,7 +596,7 @@
/// <param name="deleteRoom">鏄惁浠庢埧闂村垹闄�</param>
public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
{
- if (deleteRoom == true && HdlRoomLogic.Current.CurrentRoom != null)
+ if (deleteRoom == true)
{
//浠庢埧闂翠腑鍒犻櫎
HdlRoomLogic.Current.DeleteDevice(device);
@@ -947,41 +958,40 @@
{
return dName;
}
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- var tempValue = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
- var arry = tempValue.Split(new string[] { "(" }, StringSplitOptions.RemoveEmptyEntries);
- dName = arry[0].Trim();
-
- //濡傛灉鏄櫄鎷熻澶�
- if (device.DriveCode > 0)
+ //濡傛灉杩欎釜璁惧鍙湁涓�涓洖璺殑璇�,杩斿洖Mac鍚嶅瓧缁欏畠
+ if (this.GetDevicesCountByMac(device.DeviceAddr) <= 1)
{
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- return dName;
+ return this.GetDeviceMacName(device);
}
+ if (device.Type == DeviceType.OnOffOutput
+ || device.Type == DeviceType.DimmableLight || device.Type == DeviceType.ColorDimmableLight)
+ {
+ //缁х數鍣�,鎺夊厜鍣ㄩ兘鍙洖璺�
+ return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + device.DeviceEpoint;
+ }
+ else if (device.Type == DeviceType.Thermostat)
+ {
+ //绌鸿皟閮藉彨瀹ゅ唴鏈�
+ return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + device.DeviceEpoint;
+ }
//鑾峰彇璁惧绫诲瀷
var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- if (deviceInfoType.BeloneType == Common.DeviceBeloneType.A鎸夐敭闈㈡澘 && device.Type == DeviceType.TemperatureSensor)
+ if (device.Type == DeviceType.OnOffSwitch)
{
- //闈㈡澘鐨勬渶鍚庝竴涓洖璺槸娓╁害浼犳劅鍣�
- dName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId11);
- }
- else if (deviceInfoType.ConcreteType == Common.DeviceConcreteType.Sensor_Pir)
- {
- //pir浼犳劅鍣�,瀹冨張鎼炵壒娈婁笢瑗�,浼犳劅鍣ㄨ嚜韬敤鑷繁鐨勫悕瀛�,缁х數鍣ㄥ洖璺殑璇濃�︹��
- if (device.Type == DeviceType.OnOffOutput)
+ //闈㈡澘鐨勫共鎺ョ偣鍙寜閿�
+ if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
{
- dName += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2300);
+ return Language.StringByID(R.MyInternationalizationString.uPanelButton) + device.DeviceEpoint;
+ }
+ //鍏朵粬鐨勫共鎺ョ偣鍙共鎺ョ偣
+ else
+ {
+ return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + device.DeviceEpoint;
}
}
- else if (this.dicDeviceEpoint.ContainsKey(device.DeviceAddr) == true && this.dicDeviceEpoint[device.DeviceAddr].Count > 1)
- {
- //XXXXX(N鍥炶矾)
- dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- }
-
- return dName;
+ //鍏朵粬鎯呭喌,浣跨敤瀹冪殑榛樿鍚嶇О
+ return Language.StringByID(deviceInfoType.DefultNameId) + device.DeviceEpoint;
}
/// <summary>
@@ -997,52 +1007,9 @@
return dName;
}
- //鏄惁鎷ユ湁閰嶇疆鐨勬ā鍧桰D
- if (this.dicDeviceModelIdEnum.ContainsKey(device.ModelIdentifier) == true)
- {
- //鑾峰彇妯″潡ID鍚嶅瓧
- return this.GetNameByModelId(device);
- }
- else
- {
- //鑾峰彇绗笁鏂硅澶囩殑缈昏瘧鍚嶅瓧
- var myDeviceType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- return Language.StringByID(myDeviceType.ConcreteTextId);
- }
- }
-
- /// <summary>
- /// 鏍规嵁妯″潡ID锛岃幏鍙栫炕璇戝悕瀛�
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- private string GetNameByModelId(CommonDevice device)
- {
- if (device.ModelIdentifier == string.Empty)
- {
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
- }
-
- string modelKeys = device.ModelIdentifier;
- if (this.dicDeviceModelIdEnum.ContainsKey(modelKeys) == false)
- {
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
- }
-
- string[] strValue = this.dicDeviceModelIdEnum[modelKeys].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
- int ConcreteValue = Convert.ToInt32(strValue[0]);
-
- string keyName = deviceModelIdName + ConcreteValue;
- if (this.dicDeviceDefultNameID.ContainsKey(keyName) == true)
- {
- //R鏂囦欢閲岄潰璁剧疆鐨勫悕瀛�
- return Language.StringByID(this.dicDeviceDefultNameID[keyName]);
- }
-
- //鏈煡璁惧
- return Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ //鑾峰彇璁惧绫诲瀷
+ var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ return Language.StringByID(deviceInfoType.DefultNameId);
}
/// <summary>
@@ -1092,11 +1059,11 @@
/// </summary>
private void InitDeviceDefultNameIDList()
{
- if (this.dicDeviceDefultNameID != null)
+ if (this.dicDeviceAllNameID != null)
{
return;
}
- this.dicDeviceDefultNameID = new Dictionary<string, int>();
+ this.dicDeviceAllNameID = new Dictionary<string, int>();
Type type = typeof(R.MyInternationalizationString);
var PropertyList = type.GetFields();
@@ -1105,7 +1072,7 @@
if (item.Name.StartsWith(deviceModelIdName) == true
|| item.Name.StartsWith("uDeviceBelongId") == true)
{
- this.dicDeviceDefultNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
+ this.dicDeviceAllNameID[item.Name] = Convert.ToInt32(item.GetValue(null));
}
}
@@ -1398,28 +1365,39 @@
checkDevice = temp;
}
}
+ //鑾峰彇鑷畾涔夎澶囩被鍨�
+ var myInfoType = this.GetMyDeviceEnumInfo(listDevice);
+ //鑾峰彇璁惧绫诲瀷鐨勭炕璇戝悕瀛�
+ string strName = Language.StringByID(myInfoType.ObjectTypeNameId);
+ if (strName == string.Empty)
+ {
+ //鍔犱竴灞備繚闄�,鏈煡璁惧
+ strName = Language.StringByID(R.MyInternationalizationString.UnknowDevice);
+ }
- string strName = string.Empty;
- if (this.dicDeviceModelIdEnum.ContainsKey(checkDevice.ModelIdentifier) == true)
+ if (ApendFalge == true)
{
- //鏍规嵁妯″潡ID锛岃幏鍙栬澶囧悕瀛�
- strName = this.GetNameByModelId(checkDevice);
- }
- else
- {
- //鑾峰彇绗笁鏂硅澶囩殑銆愯澶囩被鍨嬨��
- var myDeviceType = this.GetNotHdlMyDeviceEnumInfo(listDevice);
- strName = Language.StringByID(myDeviceType.ConcreteTextId);
- }
- if (ApendFalge == true && listDevice[0].DriveCode > 0)
- {
- //铏氭嫙璁惧鍔犱釜鏍囪瘑
- strName += "鉁�";
- }
- else if (ApendFalge == true && this.IsHdlDevice(checkDevice) == false)
- {
- //绗笁鏂硅澶囧姞涓爣璇�
- strName += "鈽�";
+ if (listDevice[0].DriveCode > 0)
+ {
+ //铏氭嫙璁惧鍔犱釜鏍囪瘑
+ strName += "鉁�";
+ }
+ else
+ {
+ foreach (var temp in listDevice)
+ {
+ //鎷挎嫢鏈夋ā鍧桰D鐨勯偅涓洖璺潵鍒ゆ柇
+ if (temp.ModelIdentifier != string.Empty)
+ {
+ if (this.IsHdlDevice(checkDevice) == false)
+ {
+ //绗笁鏂硅澶囧姞涓爣璇�
+ strName += "鈽�";
+ break;
+ }
+ }
+ }
+ }
}
return strName;
}
@@ -1457,10 +1435,10 @@
int BeloneValue = Convert.ToInt32(strValue[1]);
//璁剧疆璁惧鐨勩�愯澶囨墍灞炵被鍨嬨��
info.BeloneType = (DeviceBeloneType)BeloneValue;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + BeloneValue) == true)
+ if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + BeloneValue) == true)
{
//璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + BeloneValue];
+ info.BeloneTextId = dicDeviceAllNameID["uDeviceBelongId" + BeloneValue];
}
//璁惧鍏蜂綋绫诲瀷
@@ -1469,6 +1447,16 @@
{
info.ConcreteType = DeviceConcreteType.UnKownDevice;
}
+ string keyName = deviceModelIdName + ConcreteValue;
+ if (this.dicDeviceAllNameID.ContainsKey(keyName) == true)
+ {
+ //璁惧鐨勫畼鏂瑰悕绉�
+ info.ConcreteTextId = this.dicDeviceAllNameID[keyName];
+ }
+
+ //璁惧鐨勭被鍨嬬炕璇戝悕绉�
+ info.ObjectTypeNameId = Convert.ToInt32(strValue[2]);
+
return info;
}
@@ -1491,12 +1479,13 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId15;
info.BeloneType = DeviceBeloneType.A鐏厜;
info.ConcreteType = DeviceConcreteType.Light;
+ info.ObjectTypeNameId = 60007;//璋冨厜妯″潡
int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+ if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
{
//璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+ info.BeloneTextId = dicDeviceAllNameID["uDeviceBelongId" + value];
}
}
else if (info.BeloneType == DeviceBeloneType.A浼犳劅鍣�
@@ -1506,12 +1495,13 @@
info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
info.ConcreteType = DeviceConcreteType.Sensor;
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
+ info.ObjectTypeNameId = 60000;//浼犳劅鍣�
int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+ if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
{
//璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+ info.BeloneTextId = dicDeviceAllNameID["uDeviceBelongId" + value];
}
}
@@ -1550,6 +1540,7 @@
info.BeloneType = DeviceBeloneType.A骞叉帴鐐�;
info.ConcreteType = DeviceConcreteType.DryContact;
}
+ info.ObjectTypeNameId = 60003;//鏅鸿兘闈㈡澘
}
//3鍖呭惈绐楀笜鐨勮瘽,褰撶獥甯樺鐞�
else if (dicType.ContainsKey(DeviceType.WindowCoveringDevice) == true)
@@ -1557,6 +1548,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId100;
info.BeloneType = DeviceBeloneType.A绐楀笜;
info.ConcreteType = DeviceConcreteType.Curtain;
+ info.ObjectTypeNameId = 60002;//閬槼妯″潡
}
//4绌烘皵寮�鍏�
else if (dicType.ContainsKey(DeviceType.AirSwitch) == true)
@@ -1565,6 +1557,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4100;
info.BeloneType = DeviceBeloneType.A鏅鸿兘绌哄紑;
info.ConcreteType = DeviceConcreteType.AirSwitch;
+ info.ObjectTypeNameId = 60001;//寮�鍏虫ā鍧�
if (dicType[DeviceType.AirSwitch].DfunctionType == DeviceFunctionType.A寮�鍏�)
{
@@ -1592,6 +1585,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2300;
info.BeloneType = DeviceBeloneType.A缁х數鍣�;
info.ConcreteType = DeviceConcreteType.Relay;
+ info.ObjectTypeNameId = 60001;//寮�鍏虫ā鍧�
if (dicType[DeviceType.OnOffOutput].DfunctionType == DeviceFunctionType.A寮�鍏�)
{
@@ -1618,6 +1612,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2500;
info.BeloneType = DeviceBeloneType.A璋冨厜鍣�;
info.ConcreteType = DeviceConcreteType.DimmableLight;
+ info.ObjectTypeNameId = 60007;//璋冨厜妯″潡
}
//7褰╃伅
else if (dicType.ContainsKey(DeviceType.ColorDimmableLight) == true)
@@ -1625,6 +1620,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId9;
info.BeloneType = DeviceBeloneType.A褰╃伅;
info.ConcreteType = DeviceConcreteType.ColorLight;
+ info.ObjectTypeNameId = 60007;//璋冨厜妯″潡
}
//8绌鸿皟
else if (dicType.ContainsKey(DeviceType.Thermostat) == true)
@@ -1632,6 +1628,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3600;
info.BeloneType = DeviceBeloneType.A绌鸿皟;
info.ConcreteType = DeviceConcreteType.AirConditioner;
+ info.ObjectTypeNameId = 60009;//绌鸿皟妯″潡
}
//9涓户鍣�
else if (dicType.ContainsKey(DeviceType.Repeater) == true)
@@ -1639,6 +1636,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId3900;
info.BeloneType = DeviceBeloneType.A涓户鍣�;
info.ConcreteType = DeviceConcreteType.Repeater;
+ info.ObjectTypeNameId = 60006;//绯荤粺璁惧
}
//10杞崲鍣�
else if (dicType.ContainsKey(DeviceType.Transverter) == true)
@@ -1646,6 +1644,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId4200;
info.BeloneType = DeviceBeloneType.A杞崲鍣�;
info.ConcreteType = DeviceConcreteType.Converter;
+ info.ObjectTypeNameId = 60008;//杞崲鍣�
}
//11鏅鸿兘闂ㄩ攣
else if (dicType.ContainsKey(DeviceType.DoorLock) == true)
@@ -1653,6 +1652,7 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId2800;
info.BeloneType = DeviceBeloneType.A鏅鸿兘闂ㄩ攣;
info.ConcreteType = DeviceConcreteType.IntelligentLocks;
+ info.ObjectTypeNameId = 60010;//鏅鸿兘闂ㄩ攣
}
//12鍖呭惈浼犳劅鍣ㄧ殑璇�,褰撲紶鎰熷櫒澶勭悊
else if (dicType.ContainsKey(DeviceType.IASZone) == true)
@@ -1660,6 +1660,7 @@
info.BeloneType = DeviceBeloneType.A浼犳劅鍣�;
info.ConcreteType = DeviceConcreteType.Sensor;
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId1200;
+ info.ObjectTypeNameId = 60000;//浼犳劅鍣�
//璁剧疆浼犳劅鍣ㄥ叿浣撶殑绫诲瀷
this.SetSensorDeviceSpecificType(ref info, listdevice);
}
@@ -1707,13 +1708,14 @@
info.ConcreteTextId = R.MyInternationalizationString.uDeviceBelongId12;
info.ConcreteType = DeviceConcreteType.Sensor_Humidity;
}
+ info.ObjectTypeNameId = 60000;//浼犳劅鍣�
}
int value = (int)info.BeloneType;
- if (dicDeviceDefultNameID.ContainsKey("uDeviceBelongId" + value) == true)
+ if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)
{
//璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧
- info.BeloneTextId = dicDeviceDefultNameID["uDeviceBelongId" + value];
+ info.BeloneTextId = dicDeviceAllNameID["uDeviceBelongId" + value];
}
return info;
@@ -1808,7 +1810,15 @@
{
if (listDevice != null)
{
- this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ if (roomId == string.Empty)
+ {
+ //閫夋嫨鐨勬槸鏈垎閰�
+ this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
+ }
+ else
+ {
+ this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+ }
}
//淇濆瓨璁板綍
@@ -1863,6 +1873,34 @@
return null;
}
return HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="device">闅忎究涓�涓洖璺�</param>
+ public void DeleteRealDeviceFromRoom(CommonDevice device)
+ {
+ //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ this.DeleteRealDeviceFromRoom(new List<string>() { device.DeviceAddr });
+ }
+
+ /// <summary>
+ /// 灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+ /// </summary>
+ /// <param name="listMac">璁惧Mac鍦板潃</param>
+ public void DeleteRealDeviceFromRoom(List<string> listMac)
+ {
+ foreach (var deviceMacAddr in listMac)
+ {
+ this.dicDeviceRoomId.Remove(deviceMacAddr);
+ }
+ //淇濆瓨璁板綍
+ string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
+ UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
+
+ //娣诲姞鑷姩澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
}
#endregion
@@ -1942,6 +1980,35 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ樉绀哄湪涓婚〉
+ /// </summary>
+ /// <param name="i_device"></param>
+ /// <returns></returns>
+ public bool CanShowInHomeHomeMainPage(CommonDevice i_device)
+ {
+ if (i_device == null || i_device.Type == DeviceType.OnOffSwitch)//骞叉帴鐐�
+ {
+ //杩欎釜璁惧涓嶈浜�
+ return false;
+ }
+ if (i_device.Type == DeviceType.OnOffOutput && i_device.DfunctionType == DeviceFunctionType.A鏈畾涔�)
+ {
+ //2020.03.23杩藉姞寮忔牱:鏈寚瀹氱被鍨嬬殑缁х數鍣�,涓嶆樉绀�
+ return false;
+ }
+ //2020.03.30杩藉姞寮忔牱:濡傛灉鏄潰鏉跨殑娓╁害鎺㈠ご,涓嶆樉绀�
+ else if (i_device.Type == DeviceType.TemperatureSensor && ((TemperatureSensor)i_device).SensorDiv == 1)
+ {
+ var myInfoType = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
+ if (myInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
/// <summary>
/// 鍒ゆ柇鏄笉鏄渤涓滅殑璁惧
@@ -2190,8 +2257,10 @@
statu = 2;
}
}
-
- statu = 1;
+ else
+ {
+ statu = 1;
+ }
return listDevice;
}
@@ -2303,6 +2372,15 @@
mainDevice.IconPath = "Device/Light.png";
}
}
+ //濡傛灉鏄┖姘斿紑鍏崇殑璇�
+ else if (mainDevice.Type == DeviceType.AirSwitch)
+ {
+ //绌烘皵寮�鍏抽粯璁や负寮�鍏�
+ if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
+ {
+ mainDevice.DfunctionType = DeviceFunctionType.A寮�鍏�;
+ }
+ }
//濡傛灉鏄僵鐏殑璇�
else if (mainDevice.Type == DeviceType.ColorDimmableLight)
{
@@ -2376,74 +2454,84 @@
}
this.dicDeviceModelIdEnum = new Dictionary<string, string>();
- //瀹氫箟瑙勫垯锛氭ā鍧桰D(宸茬炕璇�)=璁惧鍏蜂綋绫诲瀷鍊�-璁惧鎵�灞炵被鍨嬪��(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互)
- //绗竴涓�兼槸:DeviceConcreteType 绗簩涓�兼槸:DeviceBeloneType
-
//*********************************************************************
//鏂拌澶囨坊鍔犳柟娉曪細
- //1銆佸湪杩欓噷濉啓涓婃ā鍧桰D锛岀劧鍚庢槸 DeviceConcreteType 锛岀劧鍚庢槸 DeviceBeloneType
+ //1銆佸湪杩欓噷濉啓涓婃ā鍧桰D锛岀劧鍚庢槸 DeviceConcreteType 锛岀劧鍚庢槸 DeviceBeloneType , 鐒跺悗鏄� 璁惧绫诲瀷鐨勭炕璇慖D
//2銆佺劧鍚庡湪鏈�涓嬮潰鐨勩�愯嚜瀹氫箟璁惧绫诲瀷銆戞姌鍙犳爮閲屾坊鍔犮�愯澶囩殑鍏蜂綋绫诲瀷銆戯紝銆愯澶囩殑鎵�灞炵被鍨嬨��
//3銆佷互璁惧鐨勫叿浣撶被鍨嬩负鍚嶅瓧(鍘绘帀銆�-銆�)娣诲姞璁惧鐨勩�愭墍灞炲浘鐗囥�戯紝銆愮湡瀹炵墿鐞嗗浘鐗囥�戙�傚洖璺浘鐗囬渶瑕佺壒娈婂鐞�
//4銆佹坊鍔燫鏂囦欢(uDeviceModelId),娣诲姞Language鏂囦欢
//5銆佸鏋滈渶瑕佸叡鏈夊浘鐗�,鍒欏湪杩欎釜鍑芥暟鐨勬渶搴曚笅娣诲姞
//*********************************************************************
+ //鍓嶈█锛氬洜涓簔igbeehome鐨勮澶囨嫢鏈夊洓绉嶅悕瀛楋細
+ //1銆佽澶囧畼鏂瑰悕绉� ----瀹冪敱DeviceConcreteType鐨勬暟鍊兼墍鍐冲畾(涓汉涓績涓撶敤)
+ //2銆佽澶囧叆缃戝悗鐨勯粯璁ゅ悕绉� ----瀹冧笉闇�瑕佸啀浠ｇ爜閲岄潰瀹氫箟,瀹冪洿鎺ュ湪Language鏂囦欢閲岄潰瀹氫箟
+ // 鑼冨洿锛�50000寮�濮�,瀹冪殑瑙勫垯鏄疍eviceConcreteType瀵瑰簲鐨凴鏂囦欢閲岄潰鐨処D鐨勬暟鍊�+20000,
+ //3銆佽澶囨墍灞炲悕绉� ----瀹冩湁DeviceBeloneType鐨勬暟鍊兼墍鍐冲畾
+ //4銆佽澶囩被鍨嬪悕绉� ----瀹冪敱銆愯澶囩被鍨嬬殑缈昏瘧ID銆戞墍鍐冲畾,杩欎釜鍊兼槸涓汉涓績涓撶敤,
+ // 瀹冩槸Language鏂囦欢閲岄潰鐨� 60000涔嬪悗鐨勯偅浜涘��
+
+ //瀹氫箟瑙勫垯锛氭ā鍧桰D(宸茬炕璇�) = 璁惧鍏蜂綋绫诲瀷鍊� - 璁惧鎵�灞炵被鍨嬪�� - 璁惧绫诲瀷鐨勭炕璇慖D
+ //璁惧鍏蜂綋绫诲瀷鍊硷細DeviceConcreteType(鍦ㄨ繖涓枃浠舵渶涓嬮潰杩涜瀹氫箟)
+ //璁惧鎵�灞炵被鍨嬪��: DeviceBeloneType(鑷畾涔夌殑鍊�,鍢�,鍙涓嶉噸澶嶅氨鍙互,鍦ㄨ繖涓枃浠舵渶涓嬮潰杩涜瀹氫箟)
+ //璁惧绫诲瀷鐨勭炕璇慖D:杩欎釜鍊兼槸涓汉涓績涓撶敤,瀹冩槸Language鏂囦欢閲岄潰鐨� 60000涔嬪悗鐨勯偅浜涘��
+
//=========鈽呪槄寮�鍚堝笜绫�(100-199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100";//鏅鸿兘寮�鍚堝笜鐢垫満
- this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100";//鏅鸿兘绠＄姸鐢垫満
+ this.dicDeviceModelIdEnum["MWM65B-ZB.20"] = "100-100-60002";//鏅鸿兘寮�鍚堝笜鐢垫満
+ this.dicDeviceModelIdEnum["MVSM35B-ZB.20"] = "101-100-60002";//鏅鸿兘绠＄姸鐢垫満
//=========鈽呪槄鎸夐敭闈㈡澘绫�(200-1199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPT4/R4-ZB.18"] = "200-200";//4鎸夐敭瑙︽懜闈㈡澘(甯�4璺户鐢靛櫒搴曞骇)
- this.dicDeviceModelIdEnum["MPT3/R3-ZB.18"] = "201-200";//3鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200";//2鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200";//12鎸夐敭瑙︽懜闈㈡澘
- this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
- this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200";//绠�绾�4鎸夐敭闈㈡澘
- this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200";//绠�绾�3鎸夐敭闈㈡澘
- this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200";//绠�绾�2鎸夐敭闈㈡澘
- this.dicDeviceModelIdEnum["MPT4SC/S-ZB.18"] = "224-200";//绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
- this.dicDeviceModelIdEnum["MPT2W/S-ZB.18"] = "226-200";//绠�绾�2璺獥甯橀潰鏉�
- this.dicDeviceModelIdEnum["MP2B/TILE-ZB.18"] = "240-200";//鏂规偊鍗曞紑鍙屾帶闈㈡澘
- this.dicDeviceModelIdEnum["MP4B/TILE-ZB.18"] = "241-200";//鏂规偊鍙屽紑鍥涙帶闈㈡澘
- this.dicDeviceModelIdEnum["MP8B/TILE-ZB.18"] = "242-200";//鏂规偊鍥涘紑鍏帶闈㈡澘
- this.dicDeviceModelIdEnum["MPFA/TILE-ZB.18"] = "250-200";//鏂规偊鏂伴闈㈡澘
- this.dicDeviceModelIdEnum["MPTE3/TILE-ZB.18"] = "253-200";//鏂规偊鐜闈㈡澘
- this.dicDeviceModelIdEnum["MP2W/TILE-ZB.18"] = "256-200";//绐楀笜闈㈡澘
+ this.dicDeviceModelIdEnum["MPT4/R4-ZB.18"] = "200-200-60003";//4鎸夐敭瑙︽懜闈㈡澘(甯�4璺户鐢靛櫒搴曞骇)
+ this.dicDeviceModelIdEnum["MPT3/R3-ZB.18"] = "201-200-60003";//3鎸夐敭瑙︽懜闈㈡澘
+ this.dicDeviceModelIdEnum["MPT2/R2-ZB.18"] = "202-200-60003";//2鎸夐敭瑙︽懜闈㈡澘
+ this.dicDeviceModelIdEnum["MPT1/R1-ZB.18"] = "203-200-60003";//12鎸夐敭瑙︽懜闈㈡澘
+ this.dicDeviceModelIdEnum["MPT4-ZB.18"] = "210-200-60003";//4鎸夐敭瑙︽懜闈㈡澘(鍙甫鐢垫簮搴曞骇)
+ this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200-60003";//绠�绾�4鎸夐敭闈㈡澘
+ this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200-60003";//绠�绾�3鎸夐敭闈㈡澘
+ this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200-60003";//绠�绾�2鎸夐敭闈㈡澘
+ this.dicDeviceModelIdEnum["MPT4SC/S-ZB.18"] = "224-200-60003";//绠�绾�4鎸夐敭鍦烘櫙闈㈡澘
+ this.dicDeviceModelIdEnum["MPT2W/S-ZB.18"] = "226-200-60003";//绠�绾�2璺獥甯橀潰鏉�
+ this.dicDeviceModelIdEnum["MP2B/TILE-ZB.18"] = "240-200-60003";//鏂规偊鍗曞紑鍙屾帶闈㈡澘
+ this.dicDeviceModelIdEnum["MP4B/TILE-ZB.18"] = "241-200-60003";//鏂规偊鍙屽紑鍥涙帶闈㈡澘
+ this.dicDeviceModelIdEnum["MP8B/TILE-ZB.18"] = "242-200-60003";//鏂规偊鍥涘紑鍏帶闈㈡澘
+ 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";//绐楀笜闈㈡澘
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
- this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir浼犳劅鍣�220
+ this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir浼犳劅鍣�220
//=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
- this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300";//鐕冩皵浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300";//闂ㄧ獥纾佷紶鎰熷櫒
- this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300";//鐑熼浘浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300";//绾㈠浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300";//姘存蹈浼犳劅鍣�
- this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300";//绱ф�ユ寜閿�
+ this.dicDeviceModelIdEnum["MULTI-GASE--EA07"] = "1300-1300-60000";//鐕冩皵浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-MECI--EA01"] = "1301-1300-60000";//闂ㄧ獥纾佷紶鎰熷櫒
+ this.dicDeviceModelIdEnum["MULTI-FIRE--EA05"] = "1302-1300-60000";//鐑熼浘浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-MOTI--EA04"] = "1303-1300-60000";//绾㈠浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-WATE--EA02"] = "1304-1300-60000";//姘存蹈浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MULTI-BURO--EA06"] = "1305-1300-60000";//绱ф�ユ寜閿�
//=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300";//3璺户鐢靛櫒灏忔ā鍧�
- this.dicDeviceModelIdEnum["MFA01-ZB1.0"] = "2310-2300";//鏂规偊鏂伴灏忔ā鍧�
+ this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3璺户鐢靛櫒灏忔ā鍧�
+ this.dicDeviceModelIdEnum["MFA01-ZB1.0"] = "2310-2300-60001";//鏂规偊鏂伴灏忔ā鍧�
//=========鈽呪槄璋冨厜鍣ㄧ被(2500-2799)鈽呪槄=========
- this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500";//1璺皟鍏夊櫒灏忔ā鍧�
+ this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500-60007";//1璺皟鍏夊櫒灏忔ā鍧�
//=========鈽呪槄鏅鸿兘闂ㄩ攣绫�(2800-????)鈽呪槄=========
- this.dicDeviceModelIdEnum["H06C"] = "2800-2800";//鏅鸿兘闂ㄩ攣(H06C)
- this.dicDeviceModelIdEnum["S-one"] = "2802-2800";//鏅鸿兘闂ㄩ攣(S-one)
+ this.dicDeviceModelIdEnum["H06C"] = "2800-2800-60010";//鏅鸿兘闂ㄩ攣(H06C)
+ this.dicDeviceModelIdEnum["S-one"] = "2802-2800-60010";//鏅鸿兘闂ㄩ攣(S-one)
//=========鈽呪槄绌鸿皟绫�(3600-3899)鈽呪槄=========
- this.dicDeviceModelIdEnum["MAC/GW-ZB.10"] = "3600-3600";//zigbee绌鸿皟缃戝叧妯″潡
+ this.dicDeviceModelIdEnum["MAC/GW-ZB.10"] = "3600-3600-60009";//zigbee绌鸿皟缃戝叧妯″潡
//=========鈽呪槄涓户鍣ㄧ被(3900-3999)鈽呪槄=========
- this.dicDeviceModelIdEnum["MSR-ZB.10"] = "3900-3900"; //zigbee涓户鍣�
+ this.dicDeviceModelIdEnum["MSR-ZB.10"] = "3900-3900-60006"; //zigbee涓户鍣�
//=========鈽呪槄绌烘皵寮�鍏崇被(4100-4199)鈽呪槄=========
- this.dicDeviceModelIdEnum["MBCI01-ZB.10"] = "4100-4100";//zigbee寰柇浜戞帶鍒跺櫒
+ this.dicDeviceModelIdEnum["MBCI01-ZB.10"] = "4100-4100-60001";//zigbee寰柇浜戞帶鍒跺櫒
//=========鈽呪槄杞崲鍣ㄧ被(4200-4699)鈽呪槄=========
- this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200";//zigbee杞琤uspro鍗忚杞崲鍣�
- this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200";//zigbee杞�485鍗忚杞崲鍣�
+ this.dicDeviceModelIdEnum["MBUS/GW-ZB.10"] = "4200-4200-60008";//zigbee杞琤uspro鍗忚杞崲鍣�
+ this.dicDeviceModelIdEnum["M485/GW-ZB.10"] = "4201-4200-60008";//zigbee杞�485鍗忚杞崲鍣�
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 0f8ae04..d8a2c06 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -55,6 +55,10 @@
/// 绾害
/// </summary>
public double Latitude = 0;
+ /// <summary>
+ /// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
+ /// </summary>
+ public string ResidenceAddressName = string.Empty;
/// <summary>
/// 鎴块棿鍒楄〃(鎴块棿鐨処D)
@@ -278,11 +282,7 @@
{
//娓呯┖褰撳墠浣忓畢鍒楄〃
Config.Instance.HomeFilePathList.Clear();
- if (Config.Instance.HomeId == string.Empty && responseDataObj.PageData.Count > 0)
- {
- //璧嬩竴涓垵濮嬪��
- Config.Instance.HomeId = responseDataObj.PageData[0].Id;
- }
+ var listHouse = new List<House>();
foreach (var residence in responseDataObj.PageData)
{
Config.Instance.HomeFilePathList.Add($"House_{residence.Id}.json");
@@ -312,11 +312,23 @@
}
Global.CreateHomeDirectory(residence.Id);
house.Save(false);
+ listHouse.Add(house);
}
- //鍖归厤褰撳墠浣忓畢
- if (Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
+ //濡傛灉鍒囨崲浜嗚处鍙�,鎴栬�呭師鏉ョ殑id涓嶅瓨鍦�,鍒欓噸缃綇瀹匢D
+ if (UserCenterResourse.ResidenceOption.TheSameLoginAccount == false ||
+ Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
{
- Config.Instance.HomeId = GetHouseIdByFilePath(Config.Instance.HomeFilePathList[0]);
+ Config.Instance.HomeId = listHouse[0].Id;
+ foreach (var house in listHouse)
+ {
+ //鍒濆閫夋嫨瀹冭嚜宸辩殑浣忓畢
+ if (house.IsOthreShare == false)
+ {
+ Config.Instance.HomeId = house.Id;
+ Config.Instance.Home = House.GetHouseByHouseId(house.Id);
+ break;
+ }
+ }
}
Config.Instance.Save();
}
@@ -431,7 +443,7 @@
{
if (Config.Instance.Home.FloorDics.Count == 0)
{
- return null;
+ return string.Empty;
}
foreach (var floor in Config.Instance.Home.FloorDics)
@@ -440,8 +452,8 @@
{
return floor.Value;
}
- }
- return null;
+ }
+ return string.Empty;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Common/ZigbeeColor.cs b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
index 5010dce..409e662 100755
--- a/ZigbeeApp/Shared/Common/ZigbeeColor.cs
+++ b/ZigbeeApp/Shared/Common/ZigbeeColor.cs
@@ -46,13 +46,13 @@
public uint XMInVisibleLine = 0x00000000;
public uint XMRowLine = 0x66CCCCCC;
/// <summary>
- /// 0xFF232323
- /// </summary>
- public uint XMSeekBarBackgroundColor = 0xFF232323;
- /// <summary>
/// 0xFFECECEC
/// </summary>
- public uint XMProgressBarColor = 0xFFECECEC;
+ public uint XMSeekBarBackgroundColor = 0xFFECECEC;
+ /// <summary>
+ /// 0xFF232323
+ /// </summary>
+ public uint XMProgressBarColor = 0xFF232323;
/// <summary>
/// 0xFFF5F6FA
/// </summary>
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index 56238f6..2340d99 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 5cb2f79..0af2312 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index f20443e..4c3e379 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 3413a8b..bef7c33 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
new file mode 100755
index 0000000..a21fac5
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -0,0 +1,239 @@
+锘縰sing Shared.Common;
+using Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace Shared.Phone.Category
+{
+ /// <summary>
+ /// 娣诲姞鎴栬�呯紪杈戝満鏅殑鐣岄潰
+ /// </summary>
+ public class AddOrEditorSceneForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 淇敼鐨勫満鏅�
+ /// </summary>
+ private SceneUI editorScene = null;
+ /// <summary>
+ /// 鍏嬮殕鐨勫満鏅�(涓存椂缂栬緫鐢�)
+ /// </summary>
+ private SceneUI cloneScene = null;
+ /// <summary>
+ /// 鍦烘櫙褰撳墠鐨勬埧闂碔D
+ /// </summary>
+ private string nowRoomId = string.Empty;
+ /// <summary>
+ /// 鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠�
+ /// </summary>
+ private VerticalFrameControl listBodyControl = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_editorScene">缂栬緫鐨勫満鏅璞�</param>
+ public void ShowForm(SceneUI i_editorScene)
+ {
+ this.ScrollEnabled = false;
+ this.editorScene = i_editorScene;
+
+ //鍏嬮殕涓�涓复鏃剁紪杈戠殑鍙橀噺
+ this.cloneScene = new SceneUI();
+ if (i_editorScene != null)
+ {
+ cloneScene.Name = i_editorScene.Name;
+ cloneScene.IconPath = i_editorScene.IconPath;
+ cloneScene.IconPathType = i_editorScene.IconPathType;
+ var room = HdlRoomLogic.Current.GetRoomBySceneId(i_editorScene.Id);
+ if (room != null)
+ {
+ //褰撳墠鐨勬埧闂�
+ this.nowRoomId = room.Id;
+ }
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.EditorScene));
+ }
+ else
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.AddScence));
+ }
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ this.listBodyControl = new VerticalFrameControl();
+ listBodyControl.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listBodyControl);
+
+ //鍦烘櫙鍥剧墖杩欓儴鍒嗙殑鐧借壊鑳屾櫙
+ var framePicBack = new FrameLayout();
+ framePicBack.Height = Application.GetRealHeight(559);
+ framePicBack.BackgroundColor = UserCenterColor.Current.White;
+ listBodyControl.frameTable.AddChidren(framePicBack);
+
+ //鍦烘櫙鍥剧墖搴曢儴闃村奖
+ var btnShadow = new PicViewControl(916, 487);
+ btnShadow.Y = Application.GetRealHeight(46);
+ btnShadow.Gravity = Gravity.CenterHorizontal;
+ btnShadow.UnSelectedImagePath = "Room/Room_Rectangle.png";
+ framePicBack.AddChidren(btnShadow);
+ //鍦烘櫙鍥剧墖
+ var btnPic = new ImageView();
+ btnPic.Y = Application.GetRealHeight(46);
+ btnPic.Width = Application.GetMinRealAverage(887);
+ btnPic.Height = Application.GetMinRealAverage(444);
+ btnPic.Radius = (uint)Application.GetRealHeight(17);
+ btnPic.Gravity = Gravity.CenterHorizontal;
+ if (this.editorScene == null)
+ {
+ btnPic.ImagePath = "SceneIcon/0.png";
+ }
+ else if (this.editorScene.IconPathType == 0)
+ {
+ btnPic.ImagePath = this.editorScene.IconPath;
+ }
+ else
+ {
+ btnPic.ImageBytes = Global.ReadFileByHomeId(this.editorScene.IconPath);
+ }
+ framePicBack.AddChidren(btnPic);
+ //鍥剧墖閬僵
+ var btnZhezhao = new FrameLayout();
+ btnZhezhao.Width = btnPic.Width;
+ btnZhezhao.Height = btnPic.Height;
+ btnZhezhao.Y = btnPic.Y;
+ btnZhezhao.Gravity = Gravity.CenterHorizontal;
+ btnZhezhao.Radius = btnPic.Radius;
+ framePicBack.AddChidren(btnZhezhao);
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
+ {
+ //鎴块棿鍥剧墖閫夋嫨
+ this.ScenePictrueSelect(btnPic);
+ };
+
+ //鍒濆鍖栦俊鎭紪杈戞帶浠�
+ this.InitInfoEditorControl();
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栦俊鎭紪杈慱____________________
+
+ /// <summary>
+ /// 鍒濆鍖栦俊鎭紪杈戞帶浠�
+ /// </summary>
+ private void InitInfoEditorControl()
+ {
+ //鐧借壊鑳屾櫙妗�
+ var frameBack = new FrameLayout();
+ frameBack.Y = Application.GetRealHeight(582);
+ frameBack.Height = Application.GetRealHeight(429);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ this.listBodyControl.frameTable.AddChidren(frameBack);
+
+ //淇℃伅缂栬緫
+ var btnTitle = new NormalViewControl(300, 60, true);
+ btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.Y = Application.GetRealHeight(46);
+ btnTitle.TextSize = 15;
+ btnTitle.TextID = R.MyInternationalizationString.uInfoEditor;
+ btnTitle.TextColor = UserCenterColor.Current.TextColor2;
+ frameBack.AddChidren(btnTitle);
+
+ //鍦烘櫙鍚嶇О
+ var rowScene = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.SceneName), this.cloneScene.Name);
+ rowScene.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.PleaseInputSceneName);
+ rowScene.Y = btnTitle.Bottom + Application.GetRealHeight(23);
+ frameBack.AddChidren(rowScene);
+ //搴曠嚎
+ rowScene.AddBottomLine();
+
+ //鎵�灞炲尯鍩�
+ var rowBelong = new BelongAreaControl();
+ //rowBelong.Y= rowScene.Bottom+
+ }
+
+ #endregion
+
+ #region 鈻� 鍦烘櫙鍥剧墖閫夋嫨_______________________
+
+ /// <summary>
+ /// 鍦烘櫙鍥剧墖閫夋嫨
+ /// </summary>
+ /// <param name="imageContr"></param>
+ private void ScenePictrueSelect(ImageView imageContr)
+ {
+ var menuContr = new BottomMenuSelectForm();
+ menuContr.AddForm(3);
+ //榛樿鍥惧簱
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.LocalPicture), () =>
+ {
+ var localPic = new Device.Room.AddRoomSelectPicByLocal();
+ UserView.HomePage.Instance.AddChidren(localPic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ localPic.Show();
+ localPic.action = (imgPath) =>
+ {
+ if (string.IsNullOrEmpty(imgPath) == true)
+ {
+ return;
+ }
+ this.cloneScene.IconPathType = 0;
+ this.cloneScene.IconPath = imgPath;
+ imgPath = IO.FileUtils.GetImageFilePath(imgPath);
+ imageContr.ImageBytes = IO.FileUtils.ReadFile(imgPath);
+ };
+ });
+ //鎷嶇収
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.Photograph), () =>
+ {
+ //閫氳繃鐩告満鎷嶇収瑁佸壀
+ CropImage.TakePicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.cloneScene.IconPathType = 1;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+ }, "HdlPic", 2, 1);
+ });
+ //鎴戠殑鐩稿唽
+ menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.MyAblums), () =>
+ {
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ CropImage.SelectPicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath) == true)
+ {
+ return;
+ }
+ this.cloneScene.IconPathType = 2;
+ imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ System.IO.File.Delete(imagePath);
+
+ }, "HdlPic", 2, 1);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
old mode 100644
new mode 100755
index f582b6d..67d8217
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -1,1472 +1,967 @@
-锘縰sing System;
-using System.Collections.Generic;
-using Shared.Common;
-using Shared.Phone.UserView;
-using Shared.R;
-using Shared.Phone.Device.CommonForm;
-using Shared.Phone.UserCenter;
-using ZigBee.Device;
-
-namespace Shared.Phone.Category
-{
- /// <summary>
- /// 鍒嗙被鐨勪富鐣岄潰
- /// </summary>
- public class CategoryMainForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// The instance.
- /// </summary>
- public static CategoryMainForm instance;
- /// <summary>
- /// 鍦烘櫙鍔熻兘涓儴鑳屾櫙bodyView(楂樺害涓鸿澶囪彍鍗曠殑閭ｄ釜鐧借壊鑳屾櫙鐨勪笂閮ㄥ埌灞忓箷搴曢儴)
- /// </summary>
- public FrameLayout functionSceneBodyView;
- /// <summary>
- /// 涓儴鑳屾櫙bodyView(楂樺害涓哄満鏅姛鑳藉垏鎹㈡帶浠剁殑搴曢儴鍒板睆骞曞簳閮�)
- /// </summary>
- public FrameLayout functionSceneAutoBodyView;
- /// <summary>
- /// 鍙充笂瑙掓坊鍔犳寜閽�
- /// </summary>
- private IconViewControl btnTopRightAdd = null;
- /// <summary>
- /// 妤煎眰鎺т欢
- /// </summary>
- private NormalViewControl btnFloorName = null;
- /// <summary>
- /// 妤煎眰鍥炬爣鎺т欢
- /// </summary>
- private IconViewControl btnFloorIcon = null;
- /// <summary>
- /// 璁惧琛屾帶浠�
- /// </summary>
- private Dictionary<string, Controls.DeviceRowCommon> dicDeviceRowControl = new Dictionary<string, Controls.DeviceRowCommon>();
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鏋勯�犳柟娉�
- /// </summary>
- public CategoryMainForm()
- {
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- instance = this;
- }
-
- /// <summary>
- /// 鏄剧ず鐣岄潰--榛樿鍦烘櫙鐣岄潰
- /// </summary>
- public void ShowForm()
- {
- //鍏堟竻闄ゅ惂
- this.RemoveAll();
- //鍒濆鍖栧ご閮ㄦ帶浠�
- this.InitTopControl();
- //鍒濆鍖栦腑闂存帶浠�
- this.InitMidControls();
- //娣诲姞璁惧鐘舵�佷笂鎶ヤ簨浠�
- this.AddNormalDeviceReportEvent();
- //娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
- this.AddSensorDeviceReportEvent();
- }
-
- /// <summary>
- /// 鍒濆鍖栧ご閮ㄦ帶浠�
- /// </summary>
- private void InitTopControl()
- {
- //澶撮儴FrameLayout
- this.topFrameLayout = new FrameLayout();
- topFrameLayout.Y = Application.GetRealHeight(104);
- topFrameLayout.Height = Application.GetRealHeight(127);
- topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- this.AddChidren(topFrameLayout);
- //鏍囬鍒嗙被
- var btnTitle = new NormalViewControl(300, 95, true);
- btnTitle.X = ControlCommonResourse.XXLeft;
- btnTitle.Gravity = Gravity.CenterVertical;
- btnTitle.TextID = R.MyInternationalizationString.Category;
- btnTitle.TextSize = 24;
- btnTitle.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
- btnTitle.IsBold = true;
- topFrameLayout.AddChidren(btnTitle);
-
- //鍙充笂瑙掓坊鍔犳寜閽�
- this.btnTopRightAdd = new IconViewControl(104);
- btnTopRightAdd.X = Application.GetRealWidth(953);
- btnTopRightAdd.Gravity = Gravity.CenterVertical;
- btnTopRightAdd.UnSelectedImagePath = "Item/Add_Category.png";
- topFrameLayout.AddChidren(btnTopRightAdd);
- btnTopRightAdd.ButtonClickEvent += (sender, e) =>
- {
- if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
- {
- //娣诲姞鍦烘櫙
- Add_Scene();
- }
- else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
- {
- //娣诲姞鑷姩鍖�
- Add_Automation();
- }
- };
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑闂存帶浠�
- /// </summary>
- private void InitMidControls()
- {
- //搴旇鏄痓ody鍚�
- this.bodyFrameLayout = new FrameLayout();
- bodyFrameLayout.Y = topFrameLayout.Bottom;
- bodyFrameLayout.Height = Application.GetRealHeight(1549);
- bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- this.AddChidren(bodyFrameLayout);
-
- //鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢鐨勫鍣�
- var frameSwitchBack = new FrameLayout();
- frameSwitchBack.Height = Application.GetRealHeight(127);
- bodyFrameLayout.AddChidren(frameSwitchBack);
-
- //鎷ユ湁妤煎眰鏃�
- this.btnFloorName = null;
- this.btnFloorIcon = null;
- if (Config.Instance.Home.FloorDics.Count > 0)
- {
- //妤煎眰鍚�
- this.btnFloorName = new NormalViewControl(200, 69, true);
- btnFloorName.X = frameSwitchBack.Width - Application.GetRealWidth(200 + 120);
- btnFloorName.Y = Application.GetRealHeight(17);
- btnFloorName.TextAlignment = TextAlignment.CenterRight;
- btnFloorName.IsBold = true;
- btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
- frameSwitchBack.AddChidren(btnFloorName);
- btnFloorName.ButtonClickEvent += (sender, e) =>
- {
- var floors = new Device.Category.SelectFloor();
- AddChidren(floors);
- floors.Init(580, 330, Direction.Right);
- floors.changeFloor = true;
- floors.FloorAction += (floorId) =>
- {
- btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
- HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
- //鍒锋柊bodyView
- this.RefreshBodyView();
- };
- };
- //妤煎眰鍥炬爣
- this.btnFloorIcon = new IconViewControl(69);
- btnFloorIcon.X = Application.GetRealWidth(950);
- btnFloorIcon.Y = btnFloorName.Y;
- btnFloorIcon.UnSelectedImagePath = "Item/Drop_Down.png";
- frameSwitchBack.AddChidren(btnFloorIcon);
- btnFloorIcon.ButtonClickEvent += (sender, e) =>
- {
- btnFloorName.ButtonClickEvent?.Invoke(sender, e);
- };
- }
-
- //鐩墠涓嶇煡閬撻儹闆煄鐨勮繖涓叿浣撴斁鍦ㄥ摢涓殑浣嶇疆
- this.functionSceneAutoBodyView = new FrameLayout();
- functionSceneAutoBodyView.Y = frameSwitchBack.Bottom;
- functionSceneAutoBodyView.Height = Application.GetRealHeight(1423);
- bodyFrameLayout.AddChidren(functionSceneAutoBodyView);
-
- //鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢
- var switchContr = new SceneFunctionSwitchControl();
- switchContr.Width = Application.GetRealWidth(650);
- switchContr.Gravity = Gravity.CenterVertical;
- frameSwitchBack.AddChidren(switchContr);
- var listTitle = new List<string>();
- listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
- listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
- {
- //鎴愬憳娌℃湁鑷姩鍖�
- listTitle.Add(Language.StringByID(R.MyInternationalizationString.Automation));
- }
- //璁剧疆鍒濆鍊�
- switchContr.SetDefultIndex(UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex);
- //閫夋嫨浜嬩欢
- switchContr.SelectTabEvent += (selectIndex) =>
- {
- UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = selectIndex;
- //鍒锋柊bodyView
- this.RefreshBodyView();
- };
- //寮�濮嬪垵濮嬪寲
- switchContr.InitControl(listTitle);
- }
-
- /// <summary>
- /// 鍒锋柊bodyView
- /// </summary>
- public void RefreshBodyView()
- {
- this.functionSceneAutoBodyView.RemoveAll();
-
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- bool floorVisible = true;
- //鍦烘櫙
- if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
- {
- //鍒濆鍖栨埧闂磋彍鍗�
- this.InitRoomMenuControl();
- //鏄剧ず鍙充笂瑙掔殑鍔犲彿
- this.btnTopRightAdd.Visible = true;
- }
- //鍔熻兘
- else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
- {
- //鍒濆鍖栨埧闂磋彍鍗�
- this.InitRoomMenuControl();
- //闅愯棌鍙充笂瑙掔殑鍔犲彿
- this.btnTopRightAdd.Visible = false;
- }
- //鑷姩鍖�
- else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
- {
- this.ShowAutotion();
- //闅愯棌妤煎眰
- floorVisible = false;
- //鏄剧ず鍙充笂瑙掔殑鍔犲彿
- this.btnTopRightAdd.Visible = true;
- }
-
- //淇敼妤煎眰鐨勬樉绀烘晥鏋�
- if (this.btnFloorName != null)
- {
- this.btnFloorName.Visible = floorVisible;
- this.btnFloorIcon.Visible = floorVisible;
- }
- });
- }
-
- #endregion
-
- #region 鈻� 鎴块棿鑿滃崟鎺т欢_______________________
-
- /// <summary>
- /// 鍒濆鍖栨埧闂磋彍鍗曟帶浠�
- /// </summary>
- private void InitRoomMenuControl()
- {
- //褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
- var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
- //鎴块棿鑿滃崟鎺т欢
- var roomSwitchContr = new RoomDeviceGroupMenuControl(lisrRoom);
- roomSwitchContr.Y = Application.GetRealHeight(-55);
- this.functionSceneAutoBodyView.AddChidren(roomSwitchContr);
- //璁剧疆鍒濆鍊�
- roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.CurrentRoom.Id);
- //閫夋嫨浜嬩欢
- roomSwitchContr.SelectRoomEvent += (selectRoom) =>
- {
- HdlRoomLogic.Current.CurrentRoom = selectRoom;
- //鍦烘櫙
- if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
- {
- //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
- this.functionSceneBodyView.RemoveAll();
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- //鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
- this.RefreshSceneView(selectRoom);
- });
- }
- //鍔熻兘
- else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
- {
- //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
- this.functionSceneBodyView.RemoveAll();
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- //鍒锋柊璁惧鍒嗘敮鎺т欢
- this.RefreshFunctionView(selectRoom);
- });
- }
- };
-
- //鍔熻兘鍜屽満鏅痓odyView
- this.functionSceneBodyView = new FrameLayout();
- functionSceneBodyView.Y = roomSwitchContr.Bottom;
- functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
- functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
-
- //鎵ц鍒濆鍖�
- roomSwitchContr.InitControl();
- }
-
- #endregion
-
- #region 鈻� 鍔熻兘鍒嗘敮___________________________
-
- /// <summary>
- /// 鍒锋柊鍔熻兘鍒嗘敮鎺т欢
- /// </summary>
- /// <param name="room"></param>
- private void RefreshFunctionView(Common.Room room)
- {
- //鑾峰彇鍒嗙粍鍚庣殑璁惧
- var dicGroupDevice = this.GetAllGroupDevice(room);
- if (dicGroupDevice.Count == 0)
- {
- this.ShowNoFunctionTip();
- return;
- }
-
- //璁惧鑿滃崟鐨勭櫧鑹茶儗鏅�
- var functionBack1 = new FrameLayout();
- functionBack1.X = ControlCommonResourse.XXLeft;
- functionBack1.Height = Application.GetRealHeight(160);
- functionBack1.Width = Application.GetRealWidth(1028);
- functionBack1.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
- functionSceneBodyView.AddChidren(functionBack1);
- functionBack1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
- var functionBack2 = new FrameLayout();
- functionBack2.X = ControlCommonResourse.XXLeft;
- functionBack2.Y = functionBack1.Bottom - Application.GetRealHeight(50);
- functionBack2.Height = Application.GetRealHeight(279 - 160 + 50);
- functionBack2.Width = Application.GetRealWidth(1028);
- functionBack2.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
- functionSceneBodyView.AddChidren(functionBack2);
- functionBack2.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
-
- //璁惧鑿滃崟鐨勫乏鍙虫粦鍔ㄧ殑鎺т欢
- var HorizontalView = new HorizontalScrolViewLayout();
- HorizontalView.X = Application.GetRealWidth(CommonFormResouce.X_Left);
- HorizontalView.Height = Application.GetRealHeight(279);
- HorizontalView.Width = Application.GetRealWidth(1028);
- functionSceneBodyView.AddChidren(HorizontalView);
-
- //璁惧鐨勮儗鏅鍣�
- var frameDeviceBack = new FrameLayout();
- frameDeviceBack.X = ControlCommonResourse.XXLeft;
- frameDeviceBack.Y = HorizontalView.Bottom + Application.GetRealHeight(35);
- frameDeviceBack.BackgroundColor = UserCenterColor.Current.White;
- frameDeviceBack.Width = bodyFrameLayout.Width;
- frameDeviceBack.Height = functionSceneBodyView.Height - HorizontalView.Bottom - Application.GetRealHeight(35);
- frameDeviceBack.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
- functionSceneBodyView.AddChidren(frameDeviceBack);
-
- //璁惧鍒楄〃鎺т欢
- var listDeviceView = new VerticalListControl(35);
- listDeviceView.Y = Application.GetRealHeight(11);
- listDeviceView.Width = Application.GetRealWidth(1022);
- listDeviceView.Height = frameDeviceBack.Height - Application.GetRealHeight(11);
- listDeviceView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
- frameDeviceBack.AddChidren(listDeviceView);
-
- //涓婁竴娆￠�夋嫨鐨勮彍鍗�
- MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
- DeviceRowInfo nowSelectDeviceInfo = null;
- foreach (int Textid in dicGroupDevice.Keys)
- {
- var rowInfo = dicGroupDevice[Textid];
-
- //璁惧绫诲瀷鐨勫鍣�
- var devieFrame = new FrameLayout();
- devieFrame.Width = Application.GetRealWidth(220);
- HorizontalView.AddChidren(devieFrame);
-
- //鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
- devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(Language.StringByID(Textid), rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
- deviceObjContr.ButtonClickEvent += (sender, e) =>
- {
- //閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
- if (nowSelectDeviceInfo.TextId != rowInfo.TextId)
- {
- //涓婁竴娆＄殑鑿滃崟鍙栨秷,鏈鑿滃崟閫夋嫨
- oldSelectContr.SetSelectStatu(false);
- deviceObjContr.SetSelectStatu(true);
- oldSelectContr = deviceObjContr;
-
- nowSelectDeviceInfo = rowInfo;
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- //鍒濆鍖栬澶囧垪琛ㄦ帶浠�
- this.InitListDeviceControls(listDeviceView, rowInfo);
- });
- }
- };
-
- if (nowSelectDeviceInfo == null)
- {
- //璁剧疆鍒濆閫夋嫨
- nowSelectDeviceInfo = rowInfo;
- //璁板綍鍒濆閫夋嫨鐨勮彍鍗曟帶浠�
- oldSelectContr = deviceObjContr;
- deviceObjContr.SetSelectStatu(true);
- }
- }
- if (nowSelectDeviceInfo != null)
- {
- //鍒濆鍖栭粯璁ょ殑璁惧鍒楄〃鎺т欢
- this.InitListDeviceControls(listDeviceView, nowSelectDeviceInfo);
- }
- }
-
- /// <summary>
- /// 鎻愮ず娌℃湁鍔熻兘
- /// </summary>
- private void ShowNoFunctionTip()
- {
- var noFunction = new Button()
- {
- Y = Application.GetRealHeight(320),
- Width = Application.GetMinRealAverage(757),
- Height = Application.GetMinRealAverage(435),
- UnSelectedImagePath = "Item/NoFunction.png",
- Gravity = Gravity.CenterHorizontal
- };
- functionSceneBodyView.AddChidren(noFunction);
-
- var noFunctionTip = new Button()
- {
- Y = noFunction.Bottom + Application.GetRealHeight(32),
- Height = Application.GetRealHeight(200),
- Width = Application.GetRealWidth(700),
- Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- functionSceneBodyView.AddChidren(noFunctionTip);
- }
-
- #endregion
-
- #region 鈻� 鍒濆鍖栬澶囧垪琛ㄦ帶浠禵________________
-
- /// <summary>
- /// 鍒濆鍖栬澶囧垪琛ㄦ帶浠�
- /// </summary>
- /// <param name="listView"></param>
- /// <param name="rowInfo"></param>
- private void InitListDeviceControls(VerticalListControl listView, DeviceRowInfo rowInfo)
- {
- //鍏堟竻绌�
- listView.RemoveAll();
-
- var listDevice = new List<CommonDevice>();
- foreach (var mainkeys in rowInfo.listDeviceKeys)
- {
- var device = LocalDevice.Current.GetDevice(mainkeys);
- if (device != null)
- {
- listDevice.Add(device);
- }
- }
-
- HdlThreadLogic.Current.RunMain(() =>
- {
- var listContr = new List<Controls.DeviceRowCommon>();
- foreach (var device in listDevice)
- {
- Controls.DeviceRowCommon cardContr = null;
- //绐楀笜
- if (device.Type == DeviceType.WindowCoveringDevice)
- {
- cardContr = new Controls.DeviceCurtainRowControl(listView.rowSpace / 2);
- }
- //缁х數鍣�
- else if (device.Type == DeviceType.OnOffOutput)
- {
- cardContr = new Controls.DeviceRelayRowControl(listView.rowSpace / 2);
- }
- //绌烘皵寮�鍏�
- else if (device.Type == DeviceType.AirSwitch)
- {
- cardContr = new Controls.DeviceAirSwitchRowControl(listView.rowSpace / 2);
- }
- //绌鸿皟
- else if (device.Type == DeviceType.Thermostat)
- {
- cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
- }
- //褰╃伅(璋冨厜鍣�)
- else if (device.Type == DeviceType.DimmableLight)
- {
- cardContr = new Controls.DeviceColorLightRowControl(listView.rowSpace / 2);
- }
- //浼犳劅鍣�
- else if (device.Type == DeviceType.IASZone)
- {
- cardContr = new Controls.DeviceSensorRowControl(listView.rowSpace / 2);
- }
- //娓╂箍搴�
- else if (device.Type == DeviceType.TemperatureSensor)
- {
- cardContr = new Controls.DeviceTemperatureRowControl(listView.rowSpace / 2);
- }
- //闂ㄩ攣
- else if (device.Type == DeviceType.DoorLock)
- {
- cardContr = new Controls.DeviceDoorLockRowControl(listView.rowSpace / 2);
- }
- //鏃犳硶璇嗗埆
- else
- {
- cardContr = new Controls.DeviceRowCommon(listView.rowSpace / 2);
- //娌℃湁鐘舵�佸姛鑳�
- cardContr.hadStatuFunction = false;
- }
-
- //鍒濆鍖栧崱鐗�
- listView.AddChidren(cardContr);
- cardContr.InitControl(device);
- //鎺т欢璁板綍鍒扮紦瀛樹腑
- this.dicDeviceRowControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
- //鍔犵紦瀛�,鐒跺悗鍙戝懡浠�
- listContr.Add(cardContr);
- }
- HdlThreadLogic.Current.RunThread(() =>
- {
- for (int i = 0; i < listContr.Count; i++)
- {
- if (listView.Parent == null)
- {
- return;
- }
- System.Threading.Thread.Sleep(20);
- //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
- listContr[i].SendStatuComand();
- }
-
- }, ShowErrorMode.NO);
- });
- }
-
- #endregion
-
- #region 鈻� 鍦烘櫙鍒嗘敮___________________________
-
- /// <summary>
- /// 鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
- /// </summary>
- /// <param name="room"></param>
- private void RefreshSceneView(Room room)
- {
- var listScene = new List<SceneUI>();
- foreach (var sceneId in room.ListSceneId)
- {
- var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
- if (scene != null)
- {
- listScene.Add(scene);
- }
- }
- if (listScene.Count == 0)
- {
- this.ShowNoSceneTip();
- return;
- }
-
- var dicSceneContr = new Dictionary<int, SceneCategoryView>();
- var listview = new VerticalListControl();
- functionSceneBodyView.AddChidren(listview);
- foreach (var scene in listScene)
- {
- //鍦烘櫙鍗＄墖鎺т欢
- var sceneView = new SceneCategoryView();
- listview.AddChidren(sceneView);
- sceneView.InitControl(scene, room);
-
- dicSceneContr[scene.Id] = sceneView;
- }
- HdlThreadLogic.Current.RunThread(() =>
- {
- //鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
- this.GetAllDelayScene(dicSceneContr, listview);
- }, ShowErrorMode.NO);
- }
-
- /// <summary>
- /// 鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
- /// </summary>
- /// <param name="dicSceneContr"></param>
- private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, VerticalListControl listview)
- {
- //璇诲彇鍏ㄩ儴鐨勫欢鏃舵椂闂�
- var result = await Scene.CatDelaySceneAsync();
- if (result == null || result.catDelaySceneResponseData == null ||
- result.catDelaySceneResponseData.DelayScenesList.Count == 0)
- {
- //鍑洪敊涓嶉笩瀹�
- return;
- }
-
- string hourText = Language.StringByID(R.MyInternationalizationString.Hour);
- string minuText = Language.StringByID(R.MyInternationalizationString.Minute);
- string secondText = Language.StringByID(R.MyInternationalizationString.Second);
-
- foreach (var data in result.catDelaySceneResponseData.DelayScenesList)
- {
- if (dicSceneContr.ContainsKey(data.ScenesId) == false)
- {
- //褰撳墠鐨勭晫闈㈡病鏈夋樉绀鸿繖涓満鏅�
- continue;
- }
- var seceneContr = dicSceneContr[data.ScenesId];
- //淇濆瓨缂撳瓨鏃堕棿
- seceneContr.scene.RemainTime = data.RemainTime;
- int remainTime = data.RemainTime;
- if (remainTime <= 0)
- {
- continue;
- }
- HdlThreadLogic.Current.RunThread(() =>
- {
- //寮�鍚唴閮ㄥ欢鏃舵椂闂寸嚎绋�(鏃ㄥ湪鍏ㄩ儴鍦版柟鐨勫悓涓�鍦烘櫙鏃堕棿鍚屾)
- HdlSceneLogic.Current.StartDelayTimeThread(seceneContr.scene);
- while (remainTime > 0 && this.Parent != null)
- {
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
- {
- seceneContr.SetTimeText(this.GetTimeString(remainTime, hourText, minuText, secondText));
- });
- remainTime--;
- }
- Application.RunOnMainThread(() =>
- {
- if (listview.Parent != null)
- {
- seceneContr.SetTimeImage();
- //寮�鍚疞oading鐗规晥
- seceneContr.StartLoadingApreal();
- }
- });
- });
- }
- }
-
- /// <summary>
- /// 鏄剧ず娌℃湁鍦烘櫙
- /// </summary>
- private void ShowNoSceneTip()
- {
- var noFunction = new Button()
- {
- Y = Application.GetRealHeight(320),
- Width = Application.GetMinRealAverage(757),
- Height = Application.GetMinRealAverage(435),
- UnSelectedImagePath = "Item/NoFunction.png",
- Gravity = Gravity.CenterHorizontal
- };
- functionSceneBodyView.AddChidren(noFunction);
-
- var noScenceTip = new Button()
- {
- Y = noFunction.Bottom + Application.GetRealHeight(32),
- Height = Application.GetRealHeight(200),
- Width = Application.GetRealWidth(700),
- Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true
- };
- functionSceneBodyView.AddChidren(noScenceTip);
- }
-
-
- #endregion
-
- #region 鈻� 涓�鑸澶囩姸鎬佷笂鎶__________________
-
- /// <summary>
- /// 娣诲姞涓�鑸澶囩姸鎬佷笂鎶ヤ簨浠�
- /// </summary>
- private void AddNormalDeviceReportEvent()
- {
- //璁惧灞炴�т笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //澶勭悊涓�鑸澶囩殑涓婃姤鏁版嵁
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
- {
- //鍒锋柊鍗＄墖淇℃伅
- var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
- }
- }, ShowErrorMode.NO);
- });
-
- //璁惧鍦ㄧ嚎涓婃姤(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
- {
- //鍒锋柊鍗＄墖鐘舵��
- this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(report.IsOnline == 1);
- return;
- }
-
- }, ShowErrorMode.NO);
- });
-
- //璁惧鎺у埗鍙嶉涓婃姤
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
- {
- //璁惧鍗＄墖
- var deviceCardContr = this.dicDeviceRowControl[mainKeys];
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- deviceCardContr.SetHadGetResponeResultStatu();
- }
-
- }, ShowErrorMode.NO);
- });
- }
-
- #endregion
-
- #region 鈻� 浼犳劅鍣ㄧ姸鎬佷笂鎶____________________
-
- /// <summary>
- /// 娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
- /// </summary>
- private void AddSensorDeviceReportEvent()
- {
- //浼犳劅鍣ㄤ笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
- HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //澶勭悊浼犳劅鍣ㄤ笂鎶ユ暟鎹�
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
- if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
- {
- //鏈湴璁惧瀵硅薄
- var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- //鍒锋柊鍗＄墖淇℃伅
- this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
- }
-
- }, ShowErrorMode.NO);
- });
- }
-
- #endregion
-
- #region 鈻� 鏁村悎璁惧___________________________
-
- /// <summary>
- /// 鑾峰彇鍒嗙粍鍚庣殑璁惧
- /// </summary>
- /// <returns></returns>
- private Dictionary<int, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
- {
- //鍏ㄩ儴鐨勮澶�
- var listDevice = HdlRoomLogic.Current.GetRoomListDevice(room);
- //鏍规嵁璁惧鎵�灞炵被鍨嬫帓搴�
- listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);
- var dic = new Dictionary<int, DeviceRowInfo>();
- foreach (var device in listDevice)
- {
- var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
- //鎸夋墍灞濱D鍒嗙粍
- if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
- {
- dic[typeInfo.BeloneTextId] = new DeviceRowInfo();
- string path1 = string.Empty;
- string path2 = string.Empty;
- //鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
- dic[typeInfo.BeloneTextId].IconPath = path1;
- dic[typeInfo.BeloneTextId].IconPathSelected = path2;
- dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
- }
- dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
- }
- return dic;
- }
-
- #endregion
-
- #region 鈻� 鐣岄潰鍏抽棴___________________________
-
- /// <summary>
- /// 鐣岄潰鍏抽棴
- /// </summary>
- public override void CloseFormBefore()
- {
- //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
- instance = null;
-
- base.CloseFormBefore();
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鑾峰彇鏃堕棿鐨勭炕璇戞枃鏈�
- /// </summary>
- /// <param name="second"></param>
- /// <param name="hourText">灏忔椂鐨勬枃鏈�</param>
- /// <param name="minuText">鍒嗙殑鏂囨湰</param>
- /// <param name="secondText">绉掔殑鏂囨湰</param>
- /// <returns></returns>
- private string GetTimeString(int second, string hourText, string minuText, string secondText)
- {
- string timeStr = string.Empty;
- int hour = second / 3600;
- int minu = second % 3600 / 60;
- int sec = second % 60;
- if (hour > 0)
- {
- timeStr += hour + hourText;
- }
- if (minu > 0)
- {
- timeStr += minu + minuText;
- }
- if (sec > 0)
- {
- timeStr += sec + secondText;
- }
- return timeStr;
- }
-
- /// <summary>
- /// 娣诲姞鍦烘櫙(閮洩鍩庣殑浠ｇ爜)
- /// </summary>
- private void Add_Scene()
- {
- var scene = new Device.Category.CategoryAddScene();
- UserView.HomePage.Instance.AddChidren(scene);
- UserView.HomePage.Instance.PageIndex += 1;
- scene.Show();
- scene.AddAction = () =>
- {
- //鍒锋柊bodyView
- this.RefreshBodyView();
- };
- }
-
- /// <summary>
- /// 娣诲姞鑷姩鍖�(閮洩鍩庣殑浠ｇ爜)
- /// </summary>
- private void Add_Automation()
- {
- //new涓�涓柊閫昏緫瀵硅薄锛�
- Common.Logic.CurrentLogic = new Common.Logic();
- Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
- var addLogicPage = new Shared.Phone.Device.Logic.AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
-
- #endregion
-
- #region 鈻� 缁撴瀯浣揰____________________________
-
- /// <summary>
- /// 璁惧琛屼俊鎭�
- /// </summary>
- private class DeviceRowInfo
- {
- /// <summary>
- /// 鏂囨湰ID,鐩墠鐢ㄦ潵鍋氫富閿�
- /// </summary>
- public int TextId = 0;
- /// <summary>
- /// 鍥炬爣
- /// </summary>
- public string IconPath = string.Empty;
- /// <summary>
- /// 鍥炬爣
- /// </summary>
- public string IconPathSelected = string.Empty;
- /// <summary>
- /// 璁惧鍥炶矾涓婚敭
- /// </summary>
- public List<string> listDeviceKeys = new List<string>();
- }
-
- #endregion
-
- #region 鈼� 鑷姩鍖朹_________________________
-
- /// <summary>
- /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
- /// </summary>
- private void ShowAutotion()
- {
- // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- #region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
- //鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
- var bjFrameLayout = new FrameLayout
- {
- Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(170),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(58),
- //Radius = (uint)Application.GetRealHeight(50),
- Y = Application.GetRealHeight(30),
-
- };
- functionSceneAutoBodyView.AddChidren(bjFrameLayout);
- bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
- //鍥炬爣鎺т欢
- var sigBtn = new Button
- {
- Width = Application.GetMinRealAverage(84),
- Height = Application.GetMinRealAverage(84),
- UnSelectedImagePath = "ZigeeLogic/sign.png",
- X = Application.GetRealWidth(58),
- Gravity = Gravity.CenterVertical,
- };
- bjFrameLayout.AddChidren(sigBtn);
- //鎺ㄨ崘妯℃澘鏂囨湰鎺т欢
- var recommendtextBtn = new Button
- {
- Width = Application.GetMinRealAverage(300),
- Height = Application.GetMinRealAverage(84),
- X = sigBtn.Right + Application.GetRealWidth(35),
- TextAlignment = TextAlignment.CenterLeft,
- //Text = "鎺ㄨ崘妯℃澘",
- TextID = MyInternationalizationString.logictemplate,
- Gravity = Gravity.CenterVertical,
- TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
- TextSize = 15,
- };
- bjFrameLayout.AddChidren(recommendtextBtn);
- //鎺ㄨ崘妯℃澘寮�鍏虫帶浠�
- var recommendswitchBtn = new Button
- {
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
- UnSelectedImagePath = "ZigeeLogic/logicclose.png",
- SelectedImagePath = "ZigeeLogic/logicopen.png",
- X = bjFrameLayout.Width - Application.GetRealWidth(104 + 58),
- Gravity = Gravity.CenterVertical,
- };
- bjFrameLayout.AddChidren(recommendswitchBtn);
- #endregion
- //榛樿鎺ㄨ崘妯℃澘宸﹀彸鍙粦鎺т欢
- var scenehorizontalScrol = new HorizontalScrolViewLayout
- {
- Width = Application.GetRealWidth(1080 - 58),
- X = Application.GetRealWidth(58),
- Y = bjFrameLayout.Bottom + Application.GetRealHeight(30),
- Height = Application.GetRealHeight(0),
- };
- functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
- //鏄剧ず鑷姩鍖栧垪琛ㄤ笂涓嬪彲婊戞帶浠�
- var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
- {
- Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
- //BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,/
- X = Application.GetRealWidth(58),
- Y = scenehorizontalScrol.Bottom,
- };
- functionSceneAutoBodyView.AddChidren(logicScrolView);
- logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
- bool no = false;
- //鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
- recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
- {
- int Yheight = 0;
- recommendswitchBtn.IsSelected = !recommendswitchBtn.IsSelected;
- scenehorizontalScrol.RemoveAll();
- if (recommendswitchBtn.IsSelected)
- {
- no = true;
- scenehorizontalScrol.Height = Application.GetRealHeight(246);
- Yheight = 20;
- for (int i = 1; i < 4; i++)
- {
-
- var frameLayout = new FrameLayout
- {
- Width = Application.GetMinRealAverage(369 + 46),
- Height = Application.GetMinRealAverage(246),
- };
- scenehorizontalScrol.AddChidren(frameLayout);
- var logiciocnBtn = new Button
- {
- Width = Application.GetMinRealAverage(369),
- Height = Application.GetMinRealAverage(246),
- UnSelectedImagePath = "ZigeeLogic/" + i + ".png",
- Tag = i,
- };
- frameLayout.AddChidren(logiciocnBtn);
-
- var logicnameBtn = new Button
- {
- Width = Application.GetMinRealAverage(250),
- Height = Application.GetMinRealAverage(80),
- X = Application.GetRealWidth(23),
- Y = Application.GetRealHeight(246 - 23 - 80),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- TextSize = 14,
- };
- frameLayout.AddChidren(logicnameBtn);
-
- if (i == 1)
- {
- logicnameBtn.Text = Language.StringByID(MyInternationalizationString.onlight);
- }
- else if (i == 2)
- {
- logicnameBtn.Text = Language.StringByID(MyInternationalizationString.offlight);
- }
- else if (i == 3)
- {
- logicnameBtn.Text = Language.StringByID(MyInternationalizationString.automation1);
- }
-
-
- EventHandler<MouseEventArgs> iconclick = (sender1, e1) =>
- {
- Common.Logic.CurrentLogic = new Common.Logic();
- Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- if (logiciocnBtn.Tag.ToString() == "3")
- {
- Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
- //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
- var addLogicPage = new Device.Logic.AddLogicPage();
- HomePage.Instance.AddChidren(addLogicPage);
- HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
- else
- {
-
- Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
- //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
- Device.Logic.TemplatePage templatePage = new Device.Logic.TemplatePage();
- Device.Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
- HomePage.Instance.AddChidren(templatePage);
- HomePage.Instance.PageIndex += 1;
- templatePage.Show();
- }
- };
- logiciocnBtn.MouseUpEventHandler += iconclick;
- logicnameBtn.MouseUpEventHandler += iconclick;
- }
- }
- else
- {
- no = false;
- scenehorizontalScrol.Height = Application.GetRealHeight(0);
- Yheight = 0;
- }
- logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
- logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
- Automationview(logicScrolView, no);
- };
- //涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
- logicScrolView.BeginHeaderRefreshingAction += () =>
- {
- //閲嶆柊鍒锋柊logic鍒楄〃
- Common.Logic.LogicList.Clear();
- Read(logicScrolView, no);
- //鍏抽棴鍒锋柊View锛�
- logicScrolView.EndHeaderRefreshing();
- };
-
- Read(logicScrolView, no);
-
- }
- /// <summary>
- /// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
- /// </summary>
- /// <param name="logicScrolView"></param>
- private async void Read(VerticalRefreshLayout logicScrolView, bool no)
- {
- CommonPage.Loading.Start();
- if (Common.Logic.LogicList.Count == 0)
- {
- var Idlist = await Device.Logic.Send.GetLogicId(0);
- if (Idlist.Count != 0)
- {
- var listlogic = await Device.Logic.Send.ReadList(Idlist.Count, 0);
- //foreach鍙兘闆嗗悎宸茶淇敼,鏋氫妇鎿嶄綔鍙兘涓嶄細鎵ц,鍙兘鍑虹幇宕╂簝(寤鸿for)銆�
- for (int j = 0; j < listlogic.Count; j++)
- {
- var logic = listlogic[j];
- if (logic.LogicType != 0)
- {
- continue;
- }
- Common.Logic.LogicList.Add(logic);
- }
- }
- }
- //鑷姩鍖�
- Automationview(logicScrolView, no);
- CommonPage.Loading.Hide();
- }
- /// <summary>
- /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
- /// </summary>
- /// <param name="refresview">Refresview.</param>
- private async void Automationview(VerticalRefreshLayout refresview, bool no)
- {
- refresview.RemoveAll();
- if (Common.Logic.LogicList.Count == 0 && no == false)
- {
- //灏辨槸涓轰簡鏄剧ず寮曞娣诲姞鍥炬爣;
- refresview.BackgroundColor = 0x00000000;
- var noFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(434 + 200 + 32 + 160),
- //BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
- refresview.AddChidren(noFrameLayout);
-
-
- var noIconBtn = new Button
- {
- Y = Application.GetRealHeight(160),
- Width = Application.GetMinRealAverage(756),
- Height = Application.GetMinRealAverage(434),
- UnSelectedImagePath = "Item/NoFunction.png",
- X = Application.GetRealWidth(104),
- };
- noFrameLayout.AddChidren(noIconBtn);
-
- var noTextBtn = new Button()
- {
- Y = noIconBtn.Bottom,
- Height = Application.GetRealHeight(200) + Application.GetRealHeight(32),
- Width = Application.GetRealWidth(700),
- //Gravity = Gravity.CenterHorizontal,
- Text = Language.StringByID(MyInternationalizationString.automationaddtext).Replace("{\\r\\n}", "\r\n"),
- TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextAlignment = TextAlignment.Center,
- IsMoreLines = true,
- X = Application.GetRealWidth(190 - 58),
- };
- noFrameLayout.AddChidren(noTextBtn);
-
- }
- else
- {
-
- if (Common.Logic.LogicList.Count == 0 && no == true)
- {
- ///鏀瑰彉婊戝姩view鐨勯鑹诧紱
- refresview.BackgroundColor = 0x00000000;
- }
- else
- {
- refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- }
- }
-
- foreach (var logic in Common.Logic.LogicList)
- {
- var fLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(190 + 30),
- Width = Application.GetRealWidth(1080 - 58),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- refresview.AddChidren(fLayout);
-
- var logicRowlayout = new RowLayout
- {
- Height = Application.GetRealHeight(190 + 30),
- Width = Application.GetRealWidth(1080 - 58),
- LineColor = ZigbeeColor.Current.LogicBackgroundColor,
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
-
- };
- fLayout.AddChidren(logicRowlayout);
-
- var logicnameBtn = new Button
- {
- Height = Application.GetRealHeight(58),
- Width = Application.GetRealWidth(350),
- Text = logic.LogicName,
- X = Application.GetRealWidth(12 + 46),
- Y = Application.GetRealHeight(30),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextSize = 14,
- };
- logicRowlayout.AddChidren(logicnameBtn);
-
- var logicswitchBtn = new Button
- {
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
- UnSelectedImagePath = "ZigeeLogic/logicclose.png",
- SelectedImagePath = "ZigeeLogic/logicopen.png",
- X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
- Y = Application.GetRealHeight(58 + 30 + 9 + 30),
-
- };
- logicRowlayout.AddChidren(logicswitchBtn);
-
- logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
- {
- logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
- if (logicswitchBtn.IsSelected)
- {
- //閫昏緫寮�
- logic.IsEnable = 1;
- StatusColor(logic, logicRowlayout, 1);
- }
- else
- {
- //閫昏緫鍏�
- logic.IsEnable = 0;
- StatusColor(logic, logicRowlayout, 0);
- }
- Device.Logic.Send.LogicControlSwitch(logic);
- //Logic.Send.AddModifyLogic(logic);
- };
- if (logic.IsEnable == 1)
- {
- logicswitchBtn.IsSelected = true;
- StatusColor(logic, logicRowlayout, 1);
- }
- else if (logic.IsEnable == 0)
- {
- logicswitchBtn.IsSelected = false;
- StatusColor(logic, logicRowlayout, 0);
- }
- ///缂栬緫
- var edit = new Button
- {
- BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
- Text = Language.StringByID(MyInternationalizationString.edit),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- };
- logicRowlayout.AddRightView(edit);
- edit.MouseUpEventHandler += (sender, e) =>
- {
- Common.Logic.CurrentLogic = logic;
- var logicCommunalPage = new Device.Logic.LogicCommunalPage();
- HomePage.Instance.AddChidren(logicCommunalPage);
- HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
-
- };
-
- ///鍒犻櫎
- var del = new Button
- {
- BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
- Text = Language.StringByID(MyInternationalizationString.del),
- TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
- };
- logicRowlayout.AddRightView(del);
- del.MouseUpEventHandler += (sender, e) =>
- {
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
- {
- if (e1)
- {
- Common.Logic.LogicList.Remove(logic);
- Automationview(refresview, no);
- Device.Logic.Send.DelLogic(logic.LogicId);
- }
- };
- alert.Show();
-
- };
- var line = new Button
- {
- Y = fLayout.Height - 1,
- Height = 1,
- X = Application.GetRealWidth(58),
- Width = Application.GetRealWidth(1080 - 58),
- BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- fLayout.AddChidren(line);
- }
-
- }
- /// <summary>
- /// 鏄剧ず鑷姩鍖栬緭鍑哄姛鑳芥ā鍧楀浘鏍囩殑棰滆壊
- /// </summary>
- /// <param name="logic"></param>
- /// <param name="logicRowlayout"></param>
- /// <param name="intvalue"></param>
- private void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
- {
-
- var logictimeBtn = new Button
- {
- Height = Application.GetRealHeight(58),
- Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350),
- Y = Application.GetRealHeight(30),
- X = Application.GetRealWidth(365),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
- };
- logicRowlayout.AddChidren(logictimeBtn);
-
- ///鏄剧ず鎵ц鍛ㄦ湡
- Device.Logic.Method.UpdateWeek(logictimeBtn, logic);
-
-
- List<string> indexlist = new List<string>();
- List<string> iconIndexlist = new List<string>();
- for (int i = 0; i < logic.Actions.Count; i++)
- {
- var linkType = logic.Actions[i]["LinkType"].ToString();
- var d = indexlist.Find((value) => { return value == linkType; });
- if (d == null)
- {
- indexlist.Add(linkType);
- }
- }
- if (indexlist.Contains("0"))
- {
- iconIndexlist.Add("0");
- }
- if (indexlist.Contains("2"))
- {
- iconIndexlist.Add("2");
- }
- if (indexlist.Contains("6"))
- {
- iconIndexlist.Add("6");
- }
- if (indexlist.Contains("7"))
- {
- iconIndexlist.Add("7");
- }
- for (int i = 0; i < iconIndexlist.Count; i++)
- {
- var iconindex = iconIndexlist[i];
- var typebjBtn = new FrameLayout
- {
- Width = Application.GetMinRealAverage(82),
- Height = Application.GetMinRealAverage(82),
- X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
- Y = Application.GetRealHeight(58 + 30 + 30),
- Radius = (uint)Application.GetRealHeight(41),
- BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
- };
- logicRowlayout.AddChidren(typebjBtn);
-
- var typeIconBtn = new Button
- {
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
- Gravity = Gravity.Center,
-
- };
- typebjBtn.AddChidren(typeIconBtn);
-
- var connectIconBtn = new Button
- {
- Y = typebjBtn.Y + Application.GetRealHeight(35),
- X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
- Width = Application.GetRealWidth(48),
- Height = Application.GetRealHeight(15),
- UnSelectedImagePath = "ZigeeLogic/connect.png",
- };
- logicRowlayout.AddChidren(connectIconBtn);
- if (iconIndexlist.Count - 1 == i)
- {
- connectIconBtn.Visible = false;
- }
- switch (iconindex)
- {
- case "0":
- {
- if (intvalue == 1)
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/function1.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicFunction1Color;
- }
- else
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- }
- }
- break;
- case "2":
- {
-
- if (intvalue == 1)
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/scene1.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicScene1Color;
- }
- else
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/noscene.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- }
-
- }
- break;
- case "6":
- {
- if (intvalue == 1)
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/security1.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicSecurity1Color;
-
- }
- else
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nosecurity.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- }
-
- }
- break;
- case "7":
- {
- if (intvalue == 1)
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/delay1.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicDelay1Color;
- }
- else
- {
- typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nodelay.png";
- typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- }
-
- }
- break;
-
- }
- }
- }
-
- #endregion
- }
-}
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.Phone.UserView;
+using Shared.R;
+using Shared.Phone.Device.CommonForm;
+using Shared.Phone.UserCenter;
+using ZigBee.Device;
+
+namespace Shared.Phone.Category
+{
+ /// <summary>
+ /// 鍒嗙被鐨勪富鐣岄潰
+ /// </summary>
+ public class CategoryMainForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// The instance.
+ /// </summary>
+ public static CategoryMainForm instance;
+ /// <summary>
+ /// 鍦烘櫙鍔熻兘涓儴鑳屾櫙bodyView(楂樺害涓鸿澶囪彍鍗曠殑閭ｄ釜鐧借壊鑳屾櫙鐨勪笂閮ㄥ埌灞忓箷搴曢儴)
+ /// </summary>
+ public FrameLayout functionSceneBodyView;
+ /// <summary>
+ /// 涓儴鑳屾櫙bodyView(楂樺害涓哄満鏅姛鑳藉垏鎹㈡帶浠剁殑搴曢儴鍒板睆骞曞簳閮�)
+ /// </summary>
+ public FrameLayout functionSceneAutoBodyView;
+ /// <summary>
+ /// 鍙充笂瑙掓坊鍔犳寜閽�
+ /// </summary>
+ private IconViewControl btnTopRightAdd = null;
+ /// <summary>
+ /// 妤煎眰鎺т欢
+ /// </summary>
+ private NormalViewControl btnFloorName = null;
+ /// <summary>
+ /// 妤煎眰鍥炬爣鎺т欢
+ /// </summary>
+ private IconViewControl btnFloorIcon = null;
+ /// <summary>
+ /// 璁惧琛屾帶浠�
+ /// </summary>
+ private Dictionary<string, Controls.DeviceRowCommon> dicDeviceRowControl = new Dictionary<string, Controls.DeviceRowCommon>();
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鏋勯�犳柟娉�
+ /// </summary>
+ public CategoryMainForm()
+ {
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
+ instance = this;
+ }
+
+ /// <summary>
+ /// 鏄剧ず鐣岄潰--榛樿鍦烘櫙鐣岄潰
+ /// </summary>
+ public void ShowForm()
+ {
+ //鍏堟竻闄ゅ惂
+ this.RemoveAll();
+ //鍒濆鍖栧ご閮ㄦ帶浠�
+ this.InitTopControl();
+ //鍒濆鍖栦腑闂存帶浠�
+ this.InitMidControls();
+ //娣诲姞璁惧鐘舵�佷笂鎶ヤ簨浠�
+ this.AddNormalDeviceReportEvent();
+ //娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
+ this.AddSensorDeviceReportEvent();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栧ご閮ㄦ帶浠�
+ /// </summary>
+ private void InitTopControl()
+ {
+ //澶撮儴FrameLayout
+ this.topFrameLayout = new FrameLayout();
+ topFrameLayout.Y = Application.GetRealHeight(104);
+ topFrameLayout.Height = Application.GetRealHeight(127);
+ topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
+ this.AddChidren(topFrameLayout);
+ //鏍囬鍒嗙被
+ var btnTitle = new NormalViewControl(300, 95, true);
+ btnTitle.X = ControlCommonResourse.XXLeft;
+ btnTitle.Gravity = Gravity.CenterVertical;
+ btnTitle.TextID = R.MyInternationalizationString.Category;
+ btnTitle.TextSize = 24;
+ btnTitle.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
+ btnTitle.IsBold = true;
+ topFrameLayout.AddChidren(btnTitle);
+
+ //鍙充笂瑙掓坊鍔犳寜閽�
+ this.btnTopRightAdd = new IconViewControl(104);
+ btnTopRightAdd.X = Application.GetRealWidth(953);
+ btnTopRightAdd.Gravity = Gravity.CenterVertical;
+ btnTopRightAdd.UnSelectedImagePath = "Item/Add_Category.png";
+ topFrameLayout.AddChidren(btnTopRightAdd);
+ btnTopRightAdd.ButtonClickEvent += (sender, e) =>
+ {
+ if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
+ {
+ //娣诲姞鍦烘櫙
+ Add_Scene();
+ }
+ else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
+ {
+ //娣诲姞鑷姩鍖�
+ Add_Automation();
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑闂存帶浠�
+ /// </summary>
+ private void InitMidControls()
+ {
+ //搴旇鏄痓ody鍚�
+ this.bodyFrameLayout = new FrameLayout();
+ bodyFrameLayout.Y = topFrameLayout.Bottom;
+ bodyFrameLayout.Height = Application.GetRealHeight(1549);
+ bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
+ this.AddChidren(bodyFrameLayout);
+
+ //鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢鐨勫鍣�
+ var frameSwitchBack = new FrameLayout();
+ frameSwitchBack.Height = Application.GetRealHeight(127);
+ bodyFrameLayout.AddChidren(frameSwitchBack);
+
+ //鎷ユ湁妤煎眰鏃�
+ this.btnFloorName = null;
+ this.btnFloorIcon = null;
+ if (Config.Instance.Home.FloorDics.Count > 0)
+ {
+ //妤煎眰鍚�
+ this.btnFloorName = new NormalViewControl(200, 69, true);
+ btnFloorName.X = frameSwitchBack.Width - Application.GetRealWidth(200 + 120);
+ btnFloorName.Y = Application.GetRealHeight(17);
+ btnFloorName.TextAlignment = TextAlignment.CenterRight;
+ btnFloorName.IsBold = true;
+ btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
+ frameSwitchBack.AddChidren(btnFloorName);
+ btnFloorName.ButtonClickEvent += (sender, e) =>
+ {
+ var floors = new Device.Category.SelectFloor();
+ AddChidren(floors);
+ floors.Init(580, 330, Direction.Right);
+ floors.changeFloor = true;
+ floors.FloorAction += (floorId) =>
+ {
+ btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
+ HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
+ //鍒锋柊bodyView
+ this.RefreshBodyView();
+ };
+ };
+ //妤煎眰鍥炬爣
+ this.btnFloorIcon = new IconViewControl(69);
+ btnFloorIcon.X = Application.GetRealWidth(950);
+ btnFloorIcon.Y = Application.GetRealHeight(17);
+ btnFloorIcon.UnSelectedImagePath = "Item/Drop_Down.png";
+ frameSwitchBack.AddChidren(btnFloorIcon);
+ btnFloorIcon.ButtonClickEvent += (sender, e) =>
+ {
+ btnFloorName.ButtonClickEvent?.Invoke(sender, e);
+ };
+ }
+
+ //鐩墠涓嶇煡閬撻儹闆煄鐨勮繖涓叿浣撴斁鍦ㄥ摢涓殑浣嶇疆
+ this.functionSceneAutoBodyView = new FrameLayout();
+ functionSceneAutoBodyView.Y = frameSwitchBack.Bottom;
+ functionSceneAutoBodyView.Height = Application.GetRealHeight(1423);
+ bodyFrameLayout.AddChidren(functionSceneAutoBodyView);
+
+ //鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢
+ var switchContr = new SceneFunctionSwitchControl();
+ switchContr.Width = Application.GetRealWidth(650);
+ switchContr.Gravity = Gravity.CenterVertical;
+ frameSwitchBack.AddChidren(switchContr);
+ var listTitle = new List<string>();
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ {
+ //鎴愬憳娌℃湁鑷姩鍖�
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.Automation));
+ }
+ //璁剧疆鍒濆鍊�
+ switchContr.SetDefultIndex(UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex);
+ //閫夋嫨浜嬩欢
+ switchContr.SelectTabEvent += (selectIndex) =>
+ {
+ UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex = selectIndex;
+ if (selectIndex == 2)
+ {
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ }
+ //鍒锋柊bodyView
+ this.RefreshBodyView();
+ };
+ //寮�濮嬪垵濮嬪寲
+ switchContr.InitControl(listTitle);
+ }
+
+ /// <summary>
+ /// 鍒锋柊bodyView
+ /// </summary>
+ public void RefreshBodyView()
+ {
+ this.functionSceneAutoBodyView.RemoveAll();
+
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ bool floorVisible = true;
+ //鍦烘櫙
+ if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
+ {
+ //鍒濆鍖栨埧闂磋彍鍗�
+ this.InitRoomMenuControl();
+ //鏄剧ず鍙充笂瑙掔殑鍔犲彿
+ this.btnTopRightAdd.Visible = true;
+ }
+ //鍔熻兘
+ else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
+ {
+ //鍒濆鍖栨埧闂磋彍鍗�
+ this.InitRoomMenuControl();
+ //闅愯棌鍙充笂瑙掔殑鍔犲彿
+ this.btnTopRightAdd.Visible = false;
+ }
+ //鑷姩鍖�
+ else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
+ {
+ this.ShowAutotion();
+ //闅愯棌妤煎眰
+ floorVisible = false;
+ //鏄剧ず鍙充笂瑙掔殑鍔犲彿
+ this.btnTopRightAdd.Visible = true;
+ }
+
+ //淇敼妤煎眰鐨勬樉绀烘晥鏋�
+ if (this.btnFloorName != null)
+ {
+ this.btnFloorName.Visible = floorVisible;
+ this.btnFloorIcon.Visible = floorVisible;
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鎴块棿鑿滃崟鎺т欢_______________________
+
+ /// <summary>
+ /// 鍒濆鍖栨埧闂磋彍鍗曟帶浠�
+ /// </summary>
+ private void InitRoomMenuControl()
+ {
+ //褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
+ var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ //鎴块棿鑿滃崟鎺т欢
+ var roomSwitchContr = new RoomDeviceGroupMenuControl(lisrRoom);
+ roomSwitchContr.Y = Application.GetRealHeight(-55);
+ this.functionSceneAutoBodyView.AddChidren(roomSwitchContr);
+ //璁剧疆鍒濆鍊�
+ roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.CurrentRoom.Id);
+ //閫夋嫨浜嬩欢
+ roomSwitchContr.SelectRoomEvent += (selectRoom) =>
+ {
+ HdlRoomLogic.Current.CurrentRoom = selectRoom;
+ //鍦烘櫙
+ if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
+ {
+ //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
+ this.functionSceneBodyView.RemoveAll();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
+ this.RefreshSceneView(selectRoom);
+ });
+ }
+ //鍔熻兘
+ else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 1)
+ {
+ //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
+ this.functionSceneBodyView.RemoveAll();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鍒锋柊璁惧鍒嗘敮鎺т欢
+ this.RefreshFunctionView(selectRoom);
+ });
+ }
+ };
+
+ //鍔熻兘鍜屽満鏅痓odyView
+ this.functionSceneBodyView = new FrameLayout();
+ functionSceneBodyView.Y = roomSwitchContr.Bottom;
+ functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
+ functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
+
+ //鎵ц鍒濆鍖�
+ roomSwitchContr.InitControl();
+ }
+
+ #endregion
+
+ #region 鈻� 鍔熻兘鍒嗘敮___________________________
+
+ /// <summary>
+ /// 鍒锋柊鍔熻兘鍒嗘敮鎺т欢
+ /// </summary>
+ /// <param name="room"></param>
+ private void RefreshFunctionView(Common.Room room)
+ {
+ //鑾峰彇鍒嗙粍鍚庣殑璁惧
+ var dicGroupDevice = this.GetAllGroupDevice(room);
+ if (dicGroupDevice.Count == 0)
+ {
+ this.ShowNoFunctionTip();
+ return;
+ }
+
+ //璁惧鑿滃崟鐨勭櫧鑹茶儗鏅�
+ var functionBack1 = new FrameLayout();
+ functionBack1.X = ControlCommonResourse.XXLeft;
+ functionBack1.Height = Application.GetRealHeight(160);
+ functionBack1.Width = Application.GetRealWidth(1028);
+ functionBack1.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ functionSceneBodyView.AddChidren(functionBack1);
+ functionBack1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
+ var functionBack2 = new FrameLayout();
+ functionBack2.X = ControlCommonResourse.XXLeft;
+ functionBack2.Y = functionBack1.Bottom - Application.GetRealHeight(50);
+ functionBack2.Height = Application.GetRealHeight(279 - 160 + 50);
+ functionBack2.Width = Application.GetRealWidth(1028);
+ functionBack2.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ functionSceneBodyView.AddChidren(functionBack2);
+ functionBack2.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+
+ //璁惧鑿滃崟鐨勫乏鍙虫粦鍔ㄧ殑鎺т欢
+ var HorizontalView = new HorizontalScrolViewLayout();
+ HorizontalView.X = Application.GetRealWidth(CommonFormResouce.X_Left);
+ HorizontalView.Height = Application.GetRealHeight(279);
+ HorizontalView.Width = Application.GetRealWidth(1028);
+ functionSceneBodyView.AddChidren(HorizontalView);
+
+ //璁惧鐨勮儗鏅鍣�
+ var frameDeviceBack = new FrameLayout();
+ frameDeviceBack.X = ControlCommonResourse.XXLeft;
+ frameDeviceBack.Y = HorizontalView.Bottom + Application.GetRealHeight(35);
+ frameDeviceBack.BackgroundColor = UserCenterColor.Current.White;
+ frameDeviceBack.Width = bodyFrameLayout.Width;
+ frameDeviceBack.Height = functionSceneBodyView.Height - HorizontalView.Bottom - Application.GetRealHeight(35);
+ frameDeviceBack.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ functionSceneBodyView.AddChidren(frameDeviceBack);
+
+ //璁惧鍒楄〃鎺т欢
+ var listDeviceView = new VerticalListControl(35);
+ listDeviceView.Y = Application.GetRealHeight(11);
+ listDeviceView.Width = Application.GetRealWidth(1022);
+ listDeviceView.Height = frameDeviceBack.Height - Application.GetRealHeight(11);
+ listDeviceView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ frameDeviceBack.AddChidren(listDeviceView);
+
+ //涓婁竴娆￠�夋嫨鐨勮彍鍗�
+ MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
+ DeviceRowInfo nowSelectDeviceInfo = null;
+ foreach (int Textid in dicGroupDevice.Keys)
+ {
+ var rowInfo = dicGroupDevice[Textid];
+
+ //璁惧绫诲瀷鐨勫鍣�
+ var devieFrame = new FrameLayout();
+ devieFrame.Width = Application.GetRealWidth(220);
+ HorizontalView.AddChidren(devieFrame);
+
+ //鑿滃崟鍥剧墖鎺т欢
+ var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
+ devieFrame.AddChidren(deviceObjContr);
+ deviceObjContr.InitControl(Language.StringByID(Textid), rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.ButtonClickEvent += (sender, e) =>
+ {
+ //閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
+ if (nowSelectDeviceInfo.TextId != rowInfo.TextId)
+ {
+ //涓婁竴娆＄殑鑿滃崟鍙栨秷,鏈鑿滃崟閫夋嫨
+ oldSelectContr.SetSelectStatu(false);
+ deviceObjContr.SetSelectStatu(true);
+ oldSelectContr = deviceObjContr;
+
+ nowSelectDeviceInfo = rowInfo;
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鍒濆鍖栬澶囧垪琛ㄦ帶浠�
+ this.InitListDeviceControls(listDeviceView, rowInfo, room);
+ });
+ }
+ };
+
+ if (nowSelectDeviceInfo == null)
+ {
+ //璁剧疆鍒濆閫夋嫨
+ nowSelectDeviceInfo = rowInfo;
+ //璁板綍鍒濆閫夋嫨鐨勮彍鍗曟帶浠�
+ oldSelectContr = deviceObjContr;
+ deviceObjContr.SetSelectStatu(true);
+ }
+ }
+ if (nowSelectDeviceInfo != null)
+ {
+ //鍒濆鍖栭粯璁ょ殑璁惧鍒楄〃鎺т欢
+ this.InitListDeviceControls(listDeviceView, nowSelectDeviceInfo, room);
+ }
+ }
+
+ /// <summary>
+ /// 鎻愮ず娌℃湁鍔熻兘
+ /// </summary>
+ private void ShowNoFunctionTip()
+ {
+ var noFunction = new Button()
+ {
+ Y = Application.GetRealHeight(320),
+ Width = Application.GetMinRealAverage(757),
+ Height = Application.GetMinRealAverage(435),
+ UnSelectedImagePath = "Item/NoFunction.png",
+ Gravity = Gravity.CenterHorizontal
+ };
+ functionSceneBodyView.AddChidren(noFunction);
+
+ var noFunctionTip = new Button()
+ {
+ Y = noFunction.Bottom + Application.GetRealHeight(32),
+ Height = Application.GetRealHeight(200),
+ Width = Application.GetRealWidth(700),
+ Gravity = Gravity.CenterHorizontal,
+ Text = Language.StringByID(R.MyInternationalizationString.NoFunction).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true
+ };
+ functionSceneBodyView.AddChidren(noFunctionTip);
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栬澶囧垪琛ㄦ帶浠禵________________
+
+ /// <summary>
+ /// 鍒濆鍖栬澶囧垪琛ㄦ帶浠�
+ /// </summary>
+ /// <param name="listView"></param>
+ /// <param name="rowInfo"></param>
+ private void InitListDeviceControls(VerticalListControl listView, DeviceRowInfo rowInfo, Room i_room)
+ {
+ //鍏堟竻绌�
+ listView.RemoveAll();
+
+ var listDevice = new List<CommonDevice>();
+ for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)
+ {
+ var device = LocalDevice.Current.GetDevice(rowInfo.listDeviceKeys[i]);
+ if (device != null)
+ {
+ listDevice.Add(device);
+ }
+ else
+ {
+ rowInfo.listDeviceKeys.RemoveAt(i);
+ i--;
+ }
+ }
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var listContr = new List<Controls.DeviceRowCommon>();
+ foreach (var device in listDevice)
+ {
+ Controls.DeviceRowCommon cardContr = null;
+ //绐楀笜
+ if (device.Type == DeviceType.WindowCoveringDevice)
+ {
+ cardContr = new Controls.DeviceCurtainRowControl(listView.rowSpace / 2);
+ }
+ //缁х數鍣�
+ else if (device.Type == DeviceType.OnOffOutput)
+ {
+ cardContr = new Controls.DeviceRelayRowControl(listView.rowSpace / 2);
+ }
+ //绌烘皵寮�鍏�
+ else if (device.Type == DeviceType.AirSwitch)
+ {
+ cardContr = new Controls.DeviceAirSwitchRowControl(listView.rowSpace / 2);
+ }
+ //绌鸿皟
+ else if (device.Type == DeviceType.Thermostat)
+ {
+ cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
+ }
+ //褰╃伅(璋冨厜鍣�)
+ else if (device.Type == DeviceType.DimmableLight)
+ {
+ cardContr = new Controls.DeviceColorLightRowControl(listView.rowSpace / 2);
+ }
+ //浼犳劅鍣�
+ else if (device.Type == DeviceType.IASZone)
+ {
+ cardContr = new Controls.DeviceSensorRowControl(listView.rowSpace / 2);
+ }
+ //娓╂箍搴�
+ else if (device.Type == DeviceType.TemperatureSensor)
+ {
+ cardContr = new Controls.DeviceTemperatureRowControl(listView.rowSpace / 2);
+ }
+ //闂ㄩ攣
+ else if (device.Type == DeviceType.DoorLock)
+ {
+ cardContr = new Controls.DeviceDoorLockRowControl(listView.rowSpace / 2);
+ }
+ //鏃犳硶璇嗗埆
+ else
+ {
+ cardContr = new Controls.DeviceRowCommon(listView.rowSpace / 2);
+ //娌℃湁鐘舵�佸姛鑳�
+ cardContr.hadStatuFunction = false;
+ }
+
+ //鍒濆鍖栧崱鐗�
+ listView.AddChidren(cardContr);
+ cardContr.InitControl(device);
+ //鎺т欢璁板綍鍒扮紦瀛樹腑
+ this.dicDeviceRowControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
+ //鍔犵紦瀛�,鐒跺悗鍙戝懡浠�
+ listContr.Add(cardContr);
+ //鎺т欢琚Щ闄ょ殑鍥炶皟鍑芥暟
+ cardContr.RowNeedRemoveEvent += () =>
+ {
+ string myKeys = LocalDevice.Current.GetDeviceMainKeys(cardContr.device);
+ rowInfo.listDeviceKeys.Remove(myKeys);
+ this.dicDeviceRowControl.Remove(myKeys);
+
+ if (rowInfo.listDeviceKeys.Count == 0)
+ {
+ //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
+ this.functionSceneBodyView.RemoveAll();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鍒锋柊璁惧鍒嗘敮鎺т欢
+ this.RefreshFunctionView(i_room);
+ });
+ }
+ };
+ }
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ for (int i = 0; i < listContr.Count; i++)
+ {
+ if (listView.Parent == null)
+ {
+ return;
+ }
+ System.Threading.Thread.Sleep(200);
+ //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
+ listContr[i].SendStatuComand();
+ }
+
+ }, ShowErrorMode.NO);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鍦烘櫙鍒嗘敮___________________________
+
+ /// <summary>
+ /// 鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
+ /// </summary>
+ /// <param name="room"></param>
+ private void RefreshSceneView(Room room)
+ {
+ var listScene = new List<SceneUI>();
+ foreach (var sceneId in room.ListSceneId)
+ {
+ var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+ if (scene != null)
+ {
+ listScene.Add(scene);
+ }
+ }
+ if (listScene.Count == 0)
+ {
+ this.ShowNoSceneTip();
+ return;
+ }
+
+ var dicSceneContr = new Dictionary<int, SceneCategoryView>();
+ var listview = new VerticalListControl();
+ functionSceneBodyView.AddChidren(listview);
+ foreach (var scene in listScene)
+ {
+ //鍦烘櫙鍗＄墖鎺т欢
+ var sceneView = new SceneCategoryView();
+ listview.AddChidren(sceneView);
+ sceneView.InitControl(scene, room);
+
+ dicSceneContr[scene.Id] = sceneView;
+ }
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
+ this.GetAllDelayScene(dicSceneContr, listview);
+ }, ShowErrorMode.NO);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍦烘櫙鐨勫欢鏃舵椂闂�
+ /// </summary>
+ /// <param name="dicSceneContr"></param>
+ private async void GetAllDelayScene(Dictionary<int, SceneCategoryView> dicSceneContr, VerticalListControl listview)
+ {
+ //璇诲彇鍏ㄩ儴鐨勫欢鏃舵椂闂�
+ var result = await Scene.CatDelaySceneAsync();
+ if (result == null || result.catDelaySceneResponseData == null ||
+ result.catDelaySceneResponseData.DelayScenesList.Count == 0)
+ {
+ //鍑洪敊涓嶉笩瀹�
+ return;
+ }
+
+ string hourText = Language.StringByID(R.MyInternationalizationString.Hour);
+ string minuText = Language.StringByID(R.MyInternationalizationString.Minute);
+ string secondText = Language.StringByID(R.MyInternationalizationString.Second);
+
+ foreach (var data in result.catDelaySceneResponseData.DelayScenesList)
+ {
+ if (dicSceneContr.ContainsKey(data.ScenesId) == false)
+ {
+ //褰撳墠鐨勭晫闈㈡病鏈夋樉绀鸿繖涓満鏅�
+ continue;
+ }
+ var seceneContr = dicSceneContr[data.ScenesId];
+ //淇濆瓨缂撳瓨鏃堕棿
+ seceneContr.scene.RemainTime = data.RemainTime;
+ int remainTime = data.RemainTime;
+ if (remainTime <= 0)
+ {
+ continue;
+ }
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //寮�鍚唴閮ㄥ欢鏃舵椂闂寸嚎绋�(鏃ㄥ湪鍏ㄩ儴鍦版柟鐨勫悓涓�鍦烘櫙鏃堕棿鍚屾)
+ HdlSceneLogic.Current.StartDelayTimeThread(seceneContr.scene);
+ while (remainTime > 0 && this.Parent != null)
+ {
+ System.Threading.Thread.Sleep(1000);
+ Application.RunOnMainThread(() =>
+ {
+ seceneContr.SetTimeText(this.GetTimeString(remainTime, hourText, minuText, secondText));
+ });
+ remainTime--;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ if (listview.Parent != null)
+ {
+ seceneContr.SetTimeImage();
+ //寮�鍚疞oading鐗规晥
+ seceneContr.StartLoadingApreal();
+ }
+ });
+ });
+ }
+ }
+
+ /// <summary>
+ /// 鏄剧ず娌℃湁鍦烘櫙
+ /// </summary>
+ private void ShowNoSceneTip()
+ {
+ var noFunction = new Button()
+ {
+ Y = Application.GetRealHeight(320),
+ Width = Application.GetMinRealAverage(757),
+ Height = Application.GetMinRealAverage(435),
+ UnSelectedImagePath = "Item/NoFunction.png",
+ Gravity = Gravity.CenterHorizontal
+ };
+ functionSceneBodyView.AddChidren(noFunction);
+
+ var noScenceTip = new Button()
+ {
+ Y = noFunction.Bottom + Application.GetRealHeight(32),
+ Height = Application.GetRealHeight(200),
+ Width = Application.GetRealWidth(700),
+ Gravity = Gravity.CenterHorizontal,
+ Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true
+ };
+ functionSceneBodyView.AddChidren(noScenceTip);
+ }
+
+
+ #endregion
+
+ #region 鈻� 涓�鑸澶囩姸鎬佷笂鎶__________________
+
+ /// <summary>
+ /// 娣诲姞涓�鑸澶囩姸鎬佷笂鎶ヤ簨浠�
+ /// </summary>
+ private void AddNormalDeviceReportEvent()
+ {
+ //璁惧灞炴�т笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceStatus", ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //澶勭悊涓�鑸澶囩殑涓婃姤鏁版嵁
+ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
+ {
+ //鍒锋柊鍗＄墖淇℃伅
+ var locadevice = LocalDevice.Current.GetDevice(mainKeys);
+ if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)
+ {
+ //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
+ }
+ this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
+ }
+ }, ShowErrorMode.NO);
+ });
+
+ //璁惧鍦ㄧ嚎涓婃姤(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceOnline", ReceiveComandDiv.A璁惧鍦ㄧ嚎涓婃姤, (report) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
+ {
+ //鍒锋柊鍗＄墖鐘舵��
+ this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(report.IsOnline == 1);
+ return;
+ }
+
+ }, ShowErrorMode.NO);
+ });
+
+ //璁惧鎺у埗鍙嶉涓婃姤
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
+ {
+ //璁惧鍗＄墖
+ var deviceCardContr = this.dicDeviceRowControl[mainKeys];
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ deviceCardContr.SetHadGetResponeResultStatu();
+ }
+
+ }, ShowErrorMode.NO);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 浼犳劅鍣ㄧ姸鎬佷笂鎶____________________
+
+ /// <summary>
+ /// 娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
+ /// </summary>
+ private void AddSensorDeviceReportEvent()
+ {
+ //浼犳劅鍣ㄤ笂鎶�(缂撳瓨鐨勪慨鏀逛氦鐢� HdlGatewayReceiveLogic 澶勭悊)
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewSensor", ReceiveComandDiv.A浼犳劅鍣ㄤ笂鎶�, (report) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //澶勭悊浼犳劅鍣ㄤ笂鎶ユ暟鎹�
+ string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
+ {
+ //鏈湴璁惧瀵硅薄
+ var locadevice = LocalDevice.Current.GetDevice(mainKeys);
+ //鍒锋柊鍗＄墖淇℃伅
+ this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
+ }
+
+ }, ShowErrorMode.NO);
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鏁村悎璁惧___________________________
+
+ /// <summary>
+ /// 鑾峰彇鍒嗙粍鍚庣殑璁惧
+ /// </summary>
+ /// <returns></returns>
+ private Dictionary<int, DeviceRowInfo> GetAllGroupDevice(Common.Room room)
+ {
+ //鍏ㄩ儴鐨勮澶�
+ var listDeviceTemp = HdlRoomLogic.Current.GetRoomListDevice(room);
+ var listDevice = new List<CommonDevice>();
+ foreach (var device in listDeviceTemp)
+ {
+ //鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪鍒嗙被
+ if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
+ {
+ continue;
+ }
+ listDevice.Add(device);
+ }
+
+ //鏍规嵁璁惧鎵�灞炵被鍨嬫帓搴�
+ listDevice = LocalDevice.Current.SortDeviceByBelongType(listDevice);
+ var dic = new Dictionary<int, DeviceRowInfo>();
+ foreach (var device in listDevice)
+ {
+ var typeInfo = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ //鎸夋墍灞濱D鍒嗙粍
+ if (dic.ContainsKey(typeInfo.BeloneTextId) == false)
+ {
+ dic[typeInfo.BeloneTextId] = new DeviceRowInfo();
+ string path1 = string.Empty;
+ string path2 = string.Empty;
+ //鑾峰彇鍥剧墖
+ LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ dic[typeInfo.BeloneTextId].IconPath = path1;
+ dic[typeInfo.BeloneTextId].IconPathSelected = path2;
+ dic[typeInfo.BeloneTextId].TextId = typeInfo.BeloneTextId;
+ }
+ dic[typeInfo.BeloneTextId].listDeviceKeys.Add(LocalDevice.Current.GetDeviceMainKeys(device));
+ }
+ return dic;
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ //鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
+ instance = null;
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鑾峰彇鏃堕棿鐨勭炕璇戞枃鏈�
+ /// </summary>
+ /// <param name="second"></param>
+ /// <param name="hourText">灏忔椂鐨勬枃鏈�</param>
+ /// <param name="minuText">鍒嗙殑鏂囨湰</param>
+ /// <param name="secondText">绉掔殑鏂囨湰</param>
+ /// <returns></returns>
+ private string GetTimeString(int second, string hourText, string minuText, string secondText)
+ {
+ string timeStr = string.Empty;
+ int hour = second / 3600;
+ int minu = second % 3600 / 60;
+ int sec = second % 60;
+ if (hour > 0)
+ {
+ timeStr += hour + hourText;
+ }
+ if (minu > 0)
+ {
+ timeStr += minu + minuText;
+ }
+ if (sec > 0)
+ {
+ timeStr += sec + secondText;
+ }
+ return timeStr;
+ }
+
+ /// <summary>
+ /// 娣诲姞鍦烘櫙(閮洩鍩庣殑浠ｇ爜)
+ /// </summary>
+ private void Add_Scene()
+ {
+ var scene = new Device.Category.CategoryAddScene();
+ UserView.HomePage.Instance.AddChidren(scene);
+ UserView.HomePage.Instance.PageIndex += 1;
+ scene.Show();
+ scene.AddAction = () =>
+ {
+ //鍒锋柊bodyView
+ this.RefreshBodyView();
+ };
+ }
+
+ /// <summary>
+ /// 娣诲姞鑷姩鍖�(閮洩鍩庣殑浠ｇ爜)
+ /// </summary>
+ private void Add_Automation()
+ {
+ Shared.Phone.Device.Logic.SkipView.SkipAddLogic(0);
+ }
+
+ #endregion
+
+ #region 鈻� 缁撴瀯浣揰____________________________
+
+ /// <summary>
+ /// 璁惧琛屼俊鎭�
+ /// </summary>
+ private class DeviceRowInfo
+ {
+ /// <summary>
+ /// 鏂囨湰ID,鐩墠鐢ㄦ潵鍋氫富閿�
+ /// </summary>
+ public int TextId = 0;
+ /// <summary>
+ /// 鍥炬爣
+ /// </summary>
+ public string IconPath = string.Empty;
+ /// <summary>
+ /// 鍥炬爣
+ /// </summary>
+ public string IconPathSelected = string.Empty;
+ /// <summary>
+ /// 璁惧鍥炶矾涓婚敭
+ /// </summary>
+ public List<string> listDeviceKeys = new List<string>();
+ }
+
+ #endregion
+
+ #region 鈼� 鑷姩鍖朹_________________________
+
+ /// <summary>
+ /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
+ /// </summary>
+ private void ShowAutotion()
+ {
+ Shared.Phone.Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 89f1059..4dc0ec2 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -109,6 +109,7 @@
{
//娌℃湁鐘舵�佸姛鑳�,鍒欐妸璁惧鍚嶅瓧鎺т欢涓�
this.btnDeviceName.Gravity = Gravity.CenterVertical;
+ btnDeviceName.Y += this.chidrenYaxis;
}
//鎷ユ湁鐘舵�佸姛鑳�
if (this.hadStatuFunction == true)
@@ -143,30 +144,28 @@
{
//鍏抽棴宸︽粦鑿滃崟
this.HideMenu();
- var detailInfo = new Device.CommonForm.DeviceDetailInfo { };
- UserView.HomePage.Instance.AddChidren(detailInfo);
- UserView.HomePage.Instance.PageIndex += 1;
- detailInfo.Show(i_device, HdlRoomLogic.Current.CurrentRoom);
- detailInfo.EditAction += (curDevice, curRoom) =>
+ var detailInfo = new MainPage.DeviceDetailInfoForm();
+ detailInfo.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom);
+ detailInfo.FormCloseEvent += (curDevice, curRoom) =>
{
if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
{
//褰撳墠鏄枩鐖辨埧闂存椂
if (HdlRoomLogic.Current.IsCollectInRoom(this.device) == false)
{
- //鎴块棿鏀瑰彉浜�
- this.RemoveFromParent();
//鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
this.RowNeedRemoveEvent?.Invoke();
+ //鎴块棿鏀瑰彉浜�
+ this.RemoveFromParent();
return;
}
}
else if (HdlRoomLogic.Current.CurrentRoom.Id != curRoom.Id)
{
- //鎴块棿鏀瑰彉浜�
- this.RemoveFromParent();
//鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
this.RowNeedRemoveEvent?.Invoke();
+ //鎴块棿鏀瑰彉浜�
+ this.RemoveFromParent();
return;
}
//鍒锋柊鎺т欢鐘舵��
@@ -189,9 +188,9 @@
//浠庢埧闂翠腑绉婚櫎
HdlRoomLogic.Current.DeleteDevice(i_device);
}
- this.RemoveFromParent();
//鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
this.RowNeedRemoveEvent?.Invoke();
+ this.RemoveFromParent();
};
};
}
@@ -233,6 +232,12 @@
this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
+ if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
+ {
+ //濡傛灉杩欎釜鍗＄墖鏈夊紑鍏冲姛鑳�,骞朵笖缃戝叧杩樻病鏈夊洖澶嶄箣鍓�,榛樿鏄叧闂姸鎬�
+ //绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
+ isOpen = false;
+ }
this.SetRowOpenStatu(isOpen);
}
@@ -346,6 +351,8 @@
//宸茬粡鍙栨秷鐨勬敹钘�
if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)
{
+ //鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
+ this.RowNeedRemoveEvent?.Invoke();
//绉婚櫎杩欎釜鎺т欢
this.RemoveFromParent();
return;
@@ -357,6 +364,8 @@
var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
{
+ //鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
+ this.RowNeedRemoveEvent?.Invoke();
//绉婚櫎杩欎釜鎺т欢
this.RemoveFromParent();
return;
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
index 60a2c59..89474f2 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
@@ -69,12 +69,10 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var acControl = new Phone.Device.AC.ACControl();
- UserView.HomePage.Instance.AddChidren(acControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- acControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- acControl.action += this.CardDetailInfoBackEvent;
+ //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new MainPage.ControlForm.DeviceAcDetailCardForm();
+ form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
index 8577c0e..9db3b47 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
@@ -68,11 +68,24 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Device.Light.AirSwitchControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ int backHeight = 0;
+ if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ backHeight = 1290;
+ }
+ else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ backHeight = 1290;
+ }
+ else
+ {
+ backHeight = 1316;
+ }
+
+ //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
index b1a3dad..a3ab47f 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
@@ -68,12 +68,10 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
- UserView.HomePage.Instance.AddChidren(dimmableLightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- dimmableLightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- dimmableLightControl.action += this.CardDetailInfoBackEvent;
+ //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
+ var form = new MainPage.ControlForm.DeviceColorLightDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -103,7 +101,7 @@
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
if (this.CheckCanSendStatuComand() == true)
{
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendLightStatuComand(this.device);
+ Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(this.device);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
index ef83e6e..b23860a 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
@@ -104,12 +104,10 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
- UserView.HomePage.Instance.AddChidren(rollerShadeControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- rollerShadeControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- rollerShadeControl.action += this.CardDetailInfoBackEvent;
+ //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new MainPage.ControlForm.DeviceCurtainDetailCardForm();
+ form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -183,6 +181,7 @@
//鏃犻渶鍙樻洿
return;
}
+ this.WcdType = wcdType;
if (this.WcdType == 0)
{
btnOpen.UnSelectedImagePath = "RollerShade/Up.png";
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
index 30bc99c..69a2494 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
@@ -68,11 +68,24 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Phone.Device.Light.OnOffControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ int backHeight = 0;
+ if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ backHeight = 1290;
+ }
+ else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ backHeight = 1290;
+ }
+ else
+ {
+ backHeight = 1316;
+ }
+
+ //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
index 6a2f0d2..c9767d5 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
@@ -21,6 +21,10 @@
/// </summary>
public bool CloseFormByClickBack = true;
/// <summary>
+ /// 璋冪敤AddForm鍑芥暟鏃�,鏄惁鑷姩璋冪敤ShowForm鍑芥暟,,榛樿鑷姩璋冪敤
+ /// </summary>
+ public bool AutoLoadShowFormMethord = true;
+ /// <summary>
/// 鍘熸潵鐨勬粦鍔ㄦ爣璇�
/// </summary>
private bool oldScrollEnabled = false;
@@ -82,8 +86,11 @@
//鍒濆鍖栫晫闈㈡鏋�
this.InitForm();
- //鎵цShowForm()鏂规硶
- this.LoadShowFormMethod(parameter);
+ if (this.AutoLoadShowFormMethord == true)
+ {
+ //鎵цShowForm()鏂规硶
+ this.LoadShowFormMethod(parameter);
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index cc8fe56..92435b1 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -31,7 +31,7 @@
/// </summary>
private bool m_ScrollEnabled = true;
/// <summary>
- /// 宸︽粦浣胯兘
+ /// 宸︽粦浣胯兘(鐣岄潰鍏抽棴鏃�,搴曞眰浼氳繕鍘�,鏃犻渶鍐嶅鐞�)
/// </summary>
public bool ScrollEnabled
{
@@ -380,7 +380,11 @@
{
return;
}
- bodyFrameLayout?.RemoveAll();
+ if (bodyFrameLayout == null || bodyFrameLayout.Parent == null)
+ {
+ return;
+ }
+ bodyFrameLayout.RemoveAll();
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
index ba9b610..0e65470 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategoryAddScene.cs
@@ -1,1911 +1,1912 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Globalization;
-using Shared.Common;
-using Shared.Phone.Device.CommonForm;
-using Shared.Phone.Device.Room;
-using Shared.Phone.UserCenter;
+锘縰sing System;
+using System.Collections.Generic;
+using System.Globalization;
+using Shared.Common;
+using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.Room;
+using Shared.Phone.UserCenter;
using ZigBee.Device;
-using static ZigBee.Device.Scene;
-
-namespace Shared.Phone.Device.Category
-{
- public class CategoryAddScene : FrameLayout
- {
- #region 鈼� 鍙橀噺____________________________
- /// <summary>
- /// bodyFrameLayout
- /// </summary>
- private FrameLayout bodyFrameLayout;
- ///// <summary>
- ///// floorIds
- ///// </summary>
- //List<string> floorIds = new List<string> { };
- ///// <summary>
- ///// floorNames
- ///// </summary>
- //List<string> floorNames = new List<string> { };
- ///// <summary>
- ///// roomNames
- ///// </summary>
- //List<List<string>> roomNames = new List<List<string>> { };
- ///// <summary>
- ///// roomNames
- ///// </summary>
- //List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
- /// <summary>
- /// ImagePath
- /// </summary>
- private string ImagePath="SceneIcon/1.png";
- /// <summary>
- /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
- /// </summary>
- public int IconPathType = 0;
- /// <summary>
- /// curRoom
- /// </summary>
- private Common.Room curRoom;
- /// <summary>
- /// sceneTargetDevicesList
- /// </summary>
- private List<SceneTargetDeviceUI> sceneTargetDevicesList = new List<SceneTargetDeviceUI> { };
- /// <summary>
- /// 娣诲姞鐩爣鍚庣殑灞曠ず鍒楄〃
- /// </summary>
- public FrameLayout TargetListScrolView;
- /// <summary>
- /// The confirm button.
- /// </summary>
- private CommonForm.CompleteButton confirmBtn;
-
- /// <summary>
- /// backGround
- /// </summary>
- private ImageView backGround;
-
- /// <summary>
- /// 鏄惁淇敼
- /// </summary>
- public bool isModify;
- /// <summary>
- /// 淇敼鐨勫満鏅�
- /// </summary>
- public SceneUI modifySceneUI;
- /// <summary>
- /// 璁板綍缂栬緫鍓嶇殑璁惧鍒楄〃
- /// </summary>
- public List<SceneTargetDeviceUI> modifySceneTargetDevicesList;
- /// <summary>
- /// modifyRoom
- /// </summary>
- public Common.Room modifyRoom;
-
- /// <summary>
- /// OldBackgroundImagePath
- /// </summary>
- private string OldBackgroundImagePath;
- /// <summary>
- /// OldIconPathType
- /// </summary>
- public int OldIconPathType;
-
- /// <summary>
- /// selectedTimeAction
- /// </summary>
- private Action<SceneTargetDeviceUI> selectedAction;
- /// <summary>
- /// 淇敼鍦烘櫙action
- /// </summary>
- public Action<SceneUI, Common.Room> EditorAction;
- /// <summary>
- /// 娣诲姞鍦烘櫙action
- /// </summary>
- public Action AddAction;
-
- #endregion
-
- /// <summary>
- /// CategoryAddScene
- /// </summary>
- public CategoryAddScene()
- {
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
- }
- /// <summary>
- /// RemoveFromParent
- /// </summary>
- public override void RemoveFromParent()
- {
- UserView.HomePage.Instance.ScrollEnabled = true;
- base.RemoveFromParent();
- }
- /// <summary>
- ///鍒锋柊娣诲姞鐩爣鍚庣殑灞曠ず鍒楄〃
- /// </summary>
- public void RefreshTargetListView()
- {
- UserView.HomePage.Instance.ScrollEnabled = false;
- TargetListScrolView.RemoveAll();
- TargetListScrolView.Height = Application.GetRealHeight(173);
- var TargetListScrolBackView = new FrameLayout()
- {
- Height = Application.GetRealHeight(173),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- TargetListScrolView.AddChidren(TargetListScrolBackView);
-
- if (sceneTargetDevicesList.Count > 0)
- {
- if (sceneTargetDevicesList.Count > 1)
- {
- TargetListScrolView.Height = Application.GetRealHeight(140 * sceneTargetDevicesList.Count) + Application.GetRealHeight(200);
- TargetListScrolBackView.Height = Application.GetRealHeight(140 * sceneTargetDevicesList.Count + 13);
- }
-
- for (int i = 0; i < sceneTargetDevicesList.Count; i++)
- {
- var targetDevice = sceneTargetDevicesList[i];
- var targetRowLayout = new RowLayout()
- {
- Y = Application.GetRealHeight(i * 140),
- Height = Application.GetRealHeight(140),
- LineColor = ZigbeeColor.Current.GXCClearColor,
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- SubViewWidth = Application.GetRealWidth(184)
- };
- TargetListScrolView.AddChidren(targetRowLayout);
- string devImgPath = string.Empty;
- string devNameText = string.Empty;
- if (targetDevice.Type == 0)
- {
- if (targetDevice.DeviceUI == null ) continue;
- devImgPath = targetDevice.DeviceUI.IconPath;
- devNameText = Common.LocalDevice.Current.GetDeviceEpointName(targetDevice.DeviceUI);
-
- var targetRow = new SceneTargetFunctionRow(13);
- targetRow.Init();
- targetRow.SetIcon(devImgPath);
- targetRow.SetNameText(devNameText);
- targetRow.SetZoneText(HdlRoomLogic.Current.GetRoomNameByDevice(targetDevice.DeviceUI, ","));
- targetRow.SetStatuText(targetDevice.GetDeviceStatu());
- targetRowLayout.AddChidren(targetRow);
- if (i == sceneTargetDevicesList.Count - 1)
- {
- targetRow.HideLine(true);
- }
- }
- else if (targetDevice.Type == 2)
- {
- devNameText = CommonFormResouce.GetTimeString(targetDevice.DelayTime);
- devNameText += Language.StringByID(R.MyInternationalizationString.Later);
- var targetRow = new SceneTargetTimeRow(13);
- targetRow.Init();
- targetRow.SetTitle(devNameText);
- targetRowLayout.AddChidren(targetRow);
- if (i == sceneTargetDevicesList.Count - 1)
- {
- targetRow.HideLine(true);
- }
- }
- else if (targetDevice.Type == 1)
- {
- devImgPath = "Scene/SceneIcon.png";
- devNameText = targetDevice.SceneName;
-
- var targetRow = new SceneTargetFunctionRow(13);
- targetRow.Init();
- targetRow.SetIcon(devImgPath);
- targetRow.SetNameText(devNameText);
- targetRow.SetZoneText(HdlSceneLogic.Current.GetZoneById(targetDevice.SceneUI.Id));
- targetRowLayout.AddChidren(targetRow);
- if (i == sceneTargetDevicesList.Count - 1)
- {
- targetRow.HideLine(true);
- }
- }
-
- var editBtn = new RowLayoutEditButton();
- targetRowLayout.AddRightView(editBtn);
- //缂栬緫璁惧
- editBtn.MouseUpEventHandler += detailMouseUpEventHandler;
- var delBtn = new RowLayoutDeleteButton();
- targetRowLayout.AddRightView(delBtn);
- //鍒犻櫎璁惧
- delBtn.MouseUpEventHandler += (sender, e) =>
- {
- sceneTargetDevicesList.Remove(targetDevice);
- RefreshTargetListView();
- };
-
- //璁惧璇︾粏璁剧疆鐣岄潰
- void detailMouseUpEventHandler(object sender, MouseEventArgs e)
- {
- if (targetDevice.Type == 0)
- {
- if (targetDevice.DeviceUI == null)
- {
- return;
- }
-
- ShowSelectAction(targetDevice.DeviceUI, targetDevice);
- selectedAction = (selectedDevice) =>
- {
- var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == selectedDevice.SceneTargetDeviceUIID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.DeviceUI = selectedDevice.DeviceUI;
- targetDeviceUI.TaskList = selectedDevice.TaskList;
- }
- RefreshTargetListView();
- };
-
- }
- else if (targetDevice.Type == 2)
- {
- var delayTimeView = new SelectDelayTime();
- UserView.HomePage.Instance.AddChidren(delayTimeView);
- UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.sceneTargetDevice = targetDevice;
- delayTimeView.totalSecond = targetDevice.DelayTime;
- delayTimeView.Show();
- delayTimeView.selectedTimeAction = (second) =>
- {
- var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == second.SceneTargetDeviceUIID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.DelayTime = second.DelayTime;
- }
- RefreshTargetListView();
- };
- }
- else if (targetDevice.Type == 1)
- {
- var sceneView = new SelectScene();
- UserView.HomePage.Instance.AddChidren(sceneView);
- UserView.HomePage.Instance.PageIndex += 1;
- sceneView.sceneTargetDevice = targetDevice;
- sceneView.sceneUI = targetDevice.SceneUI;
- sceneView.currentSceneUI = modifySceneUI;
- sceneView.Show();
- sceneView.selectedAction = (selectedScene) =>
- {
- var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == selectedScene.SceneTargetDeviceUIID);
- if (targetDeviceUI != null)
- {
- targetDeviceUI.SceneName = selectedScene.SceneName;
- targetDevice.SceneUI = selectedScene.SceneUI;
- targetDevice.ElseScenesId = selectedScene.ElseScenesId;
- }
- RefreshTargetListView();
- };
- }
- }
- }
- }
- }
- /// <summary>
- /// Show this instance.
- /// </summary>
- public void Show()
- {
- Init();
-
- AddTop();
-
- AddBodyView();
-
- }
-
- #region Add____________________________________
-
- /// <summary>
- /// Init
- /// </summary>
- private void Init()
- {
-
- }
-
- /// <summary>
- /// AddTop
- /// </summary>
- private void AddTop()
- {
- var top = new TopFrameLayout();
- AddChidren(top);
- top.InitTopview();
- if(isModify)
- {
- top.SetTopTitle(R.MyInternationalizationString.EditorScene);
- }
- else
- {
- top.SetTopTitle(R.MyInternationalizationString.AddScence);
- }
- top.backButton.MouseUpEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
- }
-
- /// <summary>
- /// AddBodyView
- /// </summary>
- private void AddBodyView()
- {
- var bodyScrolView=new VerticalScrolViewLayout()
- {
- Y = Application.GetRealHeight(184),
- Height = Application.GetRealHeight(1737),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
- };
- AddChidren(bodyScrolView);
-
- bodyFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(1086+127),
- BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
- };
- bodyScrolView.AddChidren(bodyFrameLayout);
-
- var imgFL = new FrameLayout
- {
- Height = Application.GetRealHeight(556),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- bodyFrameLayout.AddChidren(imgFL);
-
- var backGround1 = new ImageView()
- {
- Y = Application.GetRealHeight(46),
- Width = Application.GetMinRealAverage(916),
- Height = Application.GetMinRealAverage(487),
- Gravity = Gravity.CenterHorizontal,
- ImagePath = "Room/Room_Rectangle.png"
- };
- imgFL.AddChidren(backGround1);
-
- backGround = new ImageView()
- {
- Y = Application.GetRealHeight(46),
- Width = Application.GetMinRealAverage(887),
- Height = Application.GetMinRealAverage(444),
- Gravity = Gravity.CenterHorizontal,
- Radius = (uint)Application.GetMinRealAverage(CommonFormResouce.BigFormRadius),
- ImagePath = "SceneIcon/3.jpg"
- };
- imgFL.AddChidren(backGround);
-
- var infoFL = new FrameLayout
- {
- Y = Application.GetRealHeight(588),
- Height = Application.GetRealHeight(429),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- bodyFrameLayout.AddChidren(infoFL);
-
- var infoEdit = new Button
- {
- X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Height = Application.GetRealHeight(130),
- Width = Application.GetRealWidth(700),
- TextID = R.MyInternationalizationString.EditInfo,
- TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = 15,
- //IsBold=true
- };
- infoFL.AddChidren(infoEdit);
-
-
- var nameRow = new DeviceInfoEditRow(130);
- nameRow.Init();
- nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.SceneName)}:");
- nameRow.SetPlaceHoldText(R.MyInternationalizationString.PleaseInputSceneName);
- infoFL.AddChidren(nameRow);
-
- var zoneRow = new DeviceInfoRow(257);
- zoneRow.Init();
- zoneRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongZone)}:");
- //zoneRow.SetTitle(curRoom.Name);
- infoFL.AddChidren(zoneRow);
- zoneRow.HideLine(true);
-
- var targetFL = new FrameLayout()
- {
- Y = Application.GetRealHeight(1040),
- Height = Application.GetRealHeight(346)
- };
- bodyFrameLayout.AddChidren(targetFL);
-
- var targetBG = new FrameLayout
- {
- Height = Application.GetRealHeight(334),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- targetFL.AddChidren(targetBG);
-
- var addTargetFL = new FrameLayout
- {
- Y=Application.GetRealHeight(46),
- Height = Application.GetRealHeight(127),
- };
- targetFL.AddChidren(addTargetFL);
-
- var target = new Button()
- {
- X = Application.GetRealWidth(CommonFormResouce.X_Left),
- Height = Application.GetRealHeight(127) - 1,
- Width = Application.GetRealWidth(600),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextID = R.MyInternationalizationString.AddScentTargetAction,
- Gravity = Gravity.CenterVertical,
- TextSize=15
- };
- addTargetFL.AddChidren(target);
-
- var targetAdd = new Button
- {
- X = Application.GetRealWidth(950),
- Y = Application.GetRealHeight(46),
- Width = Application.GetMinRealAverage(72),
- Height = Application.GetMinRealAverage(72),
- Gravity=Gravity.CenterVertical,
- UnSelectedImagePath = "Item/Add.png",
- };
- addTargetFL.AddChidren(targetAdd);
- var targetLine = new Button()
- {
- Y = target.Bottom,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- addTargetFL.AddChidren(targetLine);
-
- TargetListScrolView = new FrameLayout()
- {
- Height = Application.GetRealHeight(173)
- };
- bodyScrolView.AddChidren(TargetListScrolView);
-
-
-
- confirmBtn = new CommonForm.CompleteButton(1656, 907, 127);
- confirmBtn.TextID = R.MyInternationalizationString.uFinish;
- AddChidren(confirmBtn);
-
- if (isModify)
- {
- IconPathType = modifySceneUI.IconPathType;
- OldIconPathType = modifySceneUI.IconPathType;
- if (IconPathType != 0)
- {
- OldBackgroundImagePath = modifySceneUI.IconPath;
- }
- if (modifySceneUI.IconPathType == 0)
- {
- backGround.ImagePath = modifySceneUI.IconPath;
- }
- else
- {
- backGround.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, modifySceneUI.IconPath);
- }
- nameRow.SetTitle(modifySceneUI.Name);
- if (Config.Instance.Home.FloorDics.Count == 0)
- {
- zoneRow.SetTitle($"{modifyRoom.Name}");
- }
- else
- {
- zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(modifyRoom.FloorId)}锛寋modifyRoom.Name}");
- }
- curRoom = modifyRoom;
- sceneTargetDevicesList.AddRange(modifySceneTargetDevicesList);
- }
-
- RefreshTargetListView();
-
- #region event
-
- EventHandler<MouseEventArgs> backGroundIMGHander = (sender, e) =>
- {
- if (curRoom != null && curRoom.IsSharedRoom)
- {
- RoomCommon.ShowTipRoomIsShared();
- return;
- }
-
- int selectRow_Height = 150;
- int selectRow_Width = 1034;
- var selectFL = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
- };
- AddChidren(selectFL);
-
- var itemFL = new FrameLayout()
- {
- Y = Application.GetRealHeight(1276),
- Height = Application.GetRealHeight(450),
- Width = Application.GetRealWidth(selectRow_Width),
- Gravity = Gravity.CenterHorizontal,
- Radius = (uint)Application.GetRealHeight(35),
- BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
- };
- selectFL.AddChidren(itemFL);
- //itemFL.Animate = Animate.DownToUp;
-
- var selectLocalPicture = new Button()
- {
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.LocalPicture,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectLocalPicture);
- var selectLocalLine = new Button()
- {
- Y = selectLocalPicture.Bottom,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- itemFL.AddChidren(selectLocalLine);
-
- var selectPhotographBtn = new Button()
- {
- Y = selectLocalLine.Bottom,
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.Photograph,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectPhotographBtn);
- var selectPhotographLine = new Button()
- {
- Y = selectPhotographBtn.Bottom,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
- };
- itemFL.AddChidren(selectPhotographLine);
-
- var selectAblumsBtn = new Button()
- {
- Y = selectPhotographLine.Bottom,
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.MyAblums,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectAblumsBtn);
-
- var cancelBtn = new Button()
- {
- Y = Application.GetRealHeight(1742),
- Height = Application.GetRealHeight(selectRow_Height),
- Width = Application.GetRealWidth(selectRow_Width),
- Gravity = Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.Cancel,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
- Radius = (uint)Application.GetRealHeight(35),
- TextSize=17
- };
- selectFL.AddChidren(cancelBtn);
-
- selectLocalPicture.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var localPic = new CategorySceneSelectImgByLocal();
- Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- localPic.Show();
- localPic.action = (imgPath) =>
- {
- IconPathType = 0;
- backGround.ImageBytes = null;
- backGround.ImagePath = imgPath;
- };
- };
- selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"SceneIcon_{tradeTime}.png";
- //閫氳繃鐩告満鎷嶇収瑁佸壀
- CropImage.TakePicture((imagePath) =>
+using static ZigBee.Device.Scene;
+
+namespace Shared.Phone.Device.Category
+{
+ public class CategoryAddScene : FrameLayout
+ {
+ #region 鈼� 鍙橀噺____________________________
+ /// <summary>
+ /// bodyFrameLayout
+ /// </summary>
+ private FrameLayout bodyFrameLayout;
+ ///// <summary>
+ ///// floorIds
+ ///// </summary>
+ //List<string> floorIds = new List<string> { };
+ ///// <summary>
+ ///// floorNames
+ ///// </summary>
+ //List<string> floorNames = new List<string> { };
+ ///// <summary>
+ ///// roomNames
+ ///// </summary>
+ //List<List<string>> roomNames = new List<List<string>> { };
+ ///// <summary>
+ ///// roomNames
+ ///// </summary>
+ //List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
+ /// <summary>
+ /// ImagePath
+ /// </summary>
+ private string ImagePath = "SceneIcon/1.png";
+ /// <summary>
+ /// 鍥剧墖鏉ユ簮 0--鏈湴鍥惧簱 1--鎷嶇収 2--绯荤粺鍥惧簱
+ /// </summary>
+ public int IconPathType = 0;
+ /// <summary>
+ /// curRoom
+ /// </summary>
+ private Common.Room curRoom;
+ /// <summary>
+ /// sceneTargetDevicesList
+ /// </summary>
+ private List<SceneTargetDeviceUI> sceneTargetDevicesList = new List<SceneTargetDeviceUI> { };
+ /// <summary>
+ /// 娣诲姞鐩爣鍚庣殑灞曠ず鍒楄〃
+ /// </summary>
+ public FrameLayout TargetListScrolView;
+ /// <summary>
+ /// The confirm button.
+ /// </summary>
+ private CommonForm.CompleteButton confirmBtn;
+
+ /// <summary>
+ /// backGround
+ /// </summary>
+ private ImageView backGround;
+
+ /// <summary>
+ /// 鏄惁淇敼
+ /// </summary>
+ public bool isModify;
+ /// <summary>
+ /// 淇敼鐨勫満鏅�
+ /// </summary>
+ public SceneUI modifySceneUI;
+ /// <summary>
+ /// 璁板綍缂栬緫鍓嶇殑璁惧鍒楄〃
+ /// </summary>
+ public List<SceneTargetDeviceUI> modifySceneTargetDevicesList;
+ /// <summary>
+ /// modifyRoom
+ /// </summary>
+ public Common.Room modifyRoom;
+
+ /// <summary>
+ /// OldBackgroundImagePath
+ /// </summary>
+ private string OldBackgroundImagePath;
+ /// <summary>
+ /// OldIconPathType
+ /// </summary>
+ public int OldIconPathType;
+
+ /// <summary>
+ /// selectedTimeAction
+ /// </summary>
+ private Action<SceneTargetDeviceUI> selectedAction;
+ /// <summary>
+ /// 淇敼鍦烘櫙action
+ /// </summary>
+ public Action<SceneUI, Common.Room> EditorAction;
+ /// <summary>
+ /// 娣诲姞鍦烘櫙action
+ /// </summary>
+ public Action AddAction;
+
+ #endregion
+
+ /// <summary>
+ /// CategoryAddScene
+ /// </summary>
+ public CategoryAddScene()
+ {
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
+ }
+ /// <summary>
+ /// RemoveFromParent
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ base.RemoveFromParent();
+ }
+ /// <summary>
+ ///鍒锋柊娣诲姞鐩爣鍚庣殑灞曠ず鍒楄〃
+ /// </summary>
+ public void RefreshTargetListView()
+ {
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ TargetListScrolView.RemoveAll();
+ TargetListScrolView.Height = Application.GetRealHeight(173);
+ var TargetListScrolBackView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(173),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ TargetListScrolView.AddChidren(TargetListScrolBackView);
+
+ if (sceneTargetDevicesList.Count > 0)
+ {
+ if (sceneTargetDevicesList.Count > 1)
+ {
+ TargetListScrolView.Height = Application.GetRealHeight(140 * sceneTargetDevicesList.Count) + Application.GetRealHeight(200);
+ TargetListScrolBackView.Height = Application.GetRealHeight(140 * sceneTargetDevicesList.Count + 13);
+ }
+
+ for (int i = 0; i < sceneTargetDevicesList.Count; i++)
+ {
+ var targetDevice = sceneTargetDevicesList[i];
+ var targetRowLayout = new RowLayout()
{
- if (string.IsNullOrEmpty(imagePath))
- {
- return;
- }
- if (isModify)
- {
- if (IconPathType != 0)
- {
- Global.DeleteFilebyHomeId(backGround.ImagePath);
- HdlAutoBackupLogic.DeleteFile(backGround.ImagePath);
- }
- }
-
- IconPathType = 1;
- backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.ImagePath = imagePath;
- System.IO.File.Delete(imagePath);
-
- }, fileName, 2, 1);
- };
-
- selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"SceneIcon_{tradeTime}.png";
- //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
- CropImage.SelectPicture((imagePath) =>
+ Y = Application.GetRealHeight(i * 140),
+ Height = Application.GetRealHeight(140),
+ LineColor = ZigbeeColor.Current.GXCClearColor,
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
+ SubViewWidth = Application.GetRealWidth(184)
+ };
+ TargetListScrolView.AddChidren(targetRowLayout);
+ string devImgPath = string.Empty;
+ string devNameText = string.Empty;
+ if (targetDevice.Type == 0)
{
- if (string.IsNullOrEmpty(imagePath))
- {
- return;
- }
- if (isModify)
- {
- if (IconPathType != 0)
- {
- Global.DeleteFilebyHomeId(backGround.ImagePath);
- HdlAutoBackupLogic.DeleteFile(backGround.ImagePath);
- }
- }
-
- IconPathType = 2;
- backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
- backGround.ImagePath = imagePath;
- System.IO.File.Delete(imagePath);
-
- }, fileName, 2,1);
- };
-
- cancelBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- };
- selectFL.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- };
- };
- backGround.MouseUpEventHandler += backGroundIMGHander;
-
- //鍖哄煙
- EventHandler<MouseEventArgs> zoneHander = (sender, e) =>
- {
- var zone = new SelectZone();
- zone.Init();
- zone.ZoneAction += (selectRoom) =>
- {
- curRoom = selectRoom;
- zoneRow.SetTitle(HdlRoomLogic.Current.GetZoneName(selectRoom));
- };
- };
- zoneRow.ClickBtn.MouseUpEventHandler += zoneHander;
-
- //鎵ц鐩爣-娣诲姞鎵ц璁惧
- EventHandler<MouseEventArgs> targetAddHander = (sender, e) =>
- {
-
- //if (curRoom == null)
- //{
- // RoomCommon.ShowTipNoRoom();
- // return;
- //}
- if(curRoom != null)
- {
- if (curRoom.IsSharedRoom)
- {
- RoomCommon.ShowTipRoomIsShared();
- return;
- }
- }
-
- int selectRow_Height = 150;
- int selectRow_Width = 1034;
- var selectFL = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
- };
- AddChidren(selectFL);
-
- var itemFL = new FrameLayout()
- {
- Y = Application.GetRealHeight(1276),
- Height = Application.GetRealHeight(450),
- Width = Application.GetRealWidth(selectRow_Width),
- Gravity=Gravity.CenterHorizontal,
- Radius = (uint)Application.GetRealHeight(35),
- BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
- };
- selectFL.AddChidren(itemFL);
- //itemFL.Animate = Animate.DownToUp;
-
- var selectedFunctionBtn = new Button()
- {
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.Function,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectedFunctionBtn);
- var selectedFunctionLine = new Button()
- {
- Y = selectedFunctionBtn.Bottom,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- itemFL.AddChidren(selectedFunctionLine);
-
- var selectedSceneBtn = new Button()
- {
- Y = selectedFunctionLine.Bottom,
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.Scence,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectedSceneBtn);
- var selectedSceneLine = new Button()
- {
- Y = selectedSceneBtn.Bottom,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
- };
- itemFL.AddChidren(selectedSceneLine);
-
- var selectedTimerBtn = new Button()
- {
- Y = selectedSceneLine.Bottom,
- Height = Application.GetRealHeight(selectRow_Height) - 1,
- TextID = R.MyInternationalizationString.Delay,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- TextSize=17
- };
- itemFL.AddChidren(selectedTimerBtn);
-
-
- var cancelBtn = new Button()
- {
- Y = Application.GetRealHeight(1742),
- Height = Application.GetRealHeight(selectRow_Height),
- Width = Application.GetRealWidth(selectRow_Width),
- Gravity=Gravity.CenterHorizontal,
- TextID = R.MyInternationalizationString.Cancel,
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
- BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
- Radius = (uint)Application.GetRealHeight(35),
- TextSize=17
- };
- selectFL.AddChidren(cancelBtn);
-
- //娣诲姞鍔熻兘
- selectedFunctionBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var deviceView = new SelectDevice();
- UserView.HomePage.Instance.AddChidren(deviceView);
- UserView.HomePage.Instance.PageIndex += 1;
- deviceView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
- deviceView.Show();
- deviceView.selectedAction = (selectedDevice) =>
- {
- sceneTargetDevicesList.Add(selectedDevice);
- RefreshTargetListView();
- };
- };
- //娣诲姞鍦烘櫙
- selectedSceneBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var sceneView = new SelectScene();
- UserView.HomePage.Instance.AddChidren(sceneView);
- UserView.HomePage.Instance.PageIndex += 1;
- sceneView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
- sceneView.currentSceneUI = modifySceneUI;
- sceneView.Show();
- sceneView.selectedAction = (selectedScene) =>
- {
- sceneTargetDevicesList.Add(selectedScene);
- RefreshTargetListView();
- };
-
- };
- //娣诲姞鏃堕棿闂撮殧
- selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- var delayTimeView = new SelectDelayTime();
- UserView.HomePage.Instance.AddChidren(delayTimeView);
- UserView.HomePage.Instance.PageIndex += 1;
- delayTimeView.Show();
- delayTimeView.selectedTimeAction = (second) =>
- {
- sceneTargetDevicesList.Add(second);
- RefreshTargetListView();
- };
- };
-
- cancelBtn.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- };
- selectFL.MouseUpEventHandler += (send, ee) =>
- {
- selectFL.RemoveFromParent();
- };
- };
- targetAdd.MouseUpEventHandler += targetAddHander;
- targetFL.MouseUpEventHandler += targetAddHander;
- target.MouseUpEventHandler += targetAddHander;
- addTargetFL.MouseUpEventHandler += targetAddHander;
- //纭畾娣诲姞鐩爣
- confirmBtn.MouseUpEventHandler += async (sender, e) =>
- {
- if (curRoom == null)
- {
- RoomCommon.ShowTipNoRoom();
- return;
- }
- if (curRoom.IsSharedRoom)
- {
- RoomCommon.ShowTipRoomIsShared();
- return;
- }
-
- if(isModify)
- {
- if (string.IsNullOrEmpty(nameRow.NameText.Text))
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.SceneNameCannotBeNull));
- return;
- }
- else
- {
- try
- {
- var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"SceneIcon_{tradeTime}.png";
- if (modifySceneUI.Name != nameRow.NameText.Text.Trim())
- {
- if (HdlSceneLogic.Current.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
- return;
- }
- var r = await ZigBee.Device.Scene.RenameSceneAsync(modifySceneUI.Id, nameRow.NameText.Text.Trim());
- var reName = r.sceneRenameResponseData.Result;
- if (reName == 0)
- {
- return;
- }
- else if (reName == 1)
- {
- modifySceneUI.Name = nameRow.NameText.Text.Trim();
-
- }
- else if (reName == 2)
- {
- return;
- }
- }
- if (OldIconPathType != 0)
- {
- Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
- HdlAutoBackupLogic.DeleteFile(OldBackgroundImagePath);
- }
- if (IconPathType == 1 || IconPathType == 2)
- {
- Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- HdlAutoBackupLogic.AddOrEditorFile(fileName);
- modifySceneUI.IconPath = fileName;
- }
- else
- {
- modifySceneUI.IconPath = backGround.ImagePath;
- }
- modifySceneUI.IconPathType = IconPathType;
-
- CommonPage.Loading.Start();
- var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
- for (int i = 0; i < sceneTargetDevicesList.Count; i++)
- {
- var sceneTarget = sceneTargetDevicesList[i];
-
- if (sceneTarget.Type == 0)
- {
- if (sceneTarget.DeviceUI == null)
- {
- continue;
- }
- var memberData = new AddSceneMemberData
- {
- Type = 0,
- ScenesId = 0,
- DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.DeviceEpoint,
- TaskList = sceneTarget.TaskList,
- DelayTime = 0,
- MemberNumber = i + 1
- };
- memberDataList.Add(memberData);
- }
- else if (sceneTarget.Type == 1)
- {
- var memberData = new AddSceneMemberData
- {
- Type = 1,
- ScenesId = 0,
- ElseScenesId = sceneTarget.ElseScenesId,
- DelayTime = 0,
- MemberNumber = i + 1
- };
- memberDataList.Add(memberData);
- }
- else if (sceneTarget.Type == 2)
- {
- var memberData = new AddSceneMemberData
- {
- Type = 2,
- ScenesId = 0,
- DelayTime = sceneTarget.DelayTime,
- MemberNumber = i + 1
- };
- memberDataList.Add(memberData);
- }
- }
-
- var sceneRemoveMemberData = new SceneRemoveMemberData { };
- var removeSceneDeviceListInfoList = new List<RemoveSceneDeviceListInfo> { };
- for (int i = 0; i < modifySceneTargetDevicesList.Count; i++)
- {
- var sceneTarget = modifySceneTargetDevicesList[i];
- if (sceneTarget.Type == 0)
- {
- if (sceneTarget.DeviceUI == null)
- {
- continue;
- }
- var removeDevice = new RemoveSceneDeviceListInfo
- {
- Type = 0,
- DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.DeviceEpoint,
- MemberNumber = sceneTarget.DelayTimeSerialNumber
- };
- removeSceneDeviceListInfoList.Add(removeDevice);
- }
- else if (sceneTarget.Type == 1)
- {
- var removeDevice = new ZigBee.Device.Scene.RemoveSceneDeviceListInfo
- {
- Type = 1,
- ElseScenesId = sceneTarget.ElseScenesId,
- MemberNumber = sceneTarget.DelayTimeSerialNumber
- };
- removeSceneDeviceListInfoList.Add(removeDevice);
- }
- else
- {
- var removeDevice = new ZigBee.Device.Scene.RemoveSceneDeviceListInfo
- {
- Type = 2,
- DelayTime = sceneTarget.DelayTime,
- MemberNumber = sceneTarget.DelayTimeSerialNumber
- };
- removeSceneDeviceListInfoList.Add(removeDevice);
- }
- }
- sceneRemoveMemberData.DeviceList = removeSceneDeviceListInfoList;
- sceneRemoveMemberData.ScenesId = modifySceneUI.Id;
- var result = await HdlSceneLogic.Current.ModifyScene(modifySceneUI, sceneRemoveMemberData, memberDataList);
- if (result == 1)
- {
- if (modifyRoom != curRoom)
- {
- modifyRoom.ListSceneId.Remove(modifySceneUI.Id);
- curRoom.ListSceneId.Add(modifySceneUI.Id);
- modifyRoom.Save();
- curRoom.Save();
- }
- EditorAction?.Invoke(modifySceneUI, curRoom);
- RemoveFromParent();
- }
- else if (result == 0)
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.FailedPleaseTryAgain));
- }
- else if (result == -1)
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
- }
- }
- catch (Exception ex)
- {
- System.Console.WriteLine($"鍒嗙被娣诲姞鍦烘櫙鍑洪敊{ex.Message}");
- }
- finally
- {
- CommonPage.Loading.Hide();
- }
- }
- }
- else
- {
- //鏂板
- if (string.IsNullOrEmpty(nameRow.NameText.Text))
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.SceneNameCannotBeNull));
- return;
- }
- else
- {
- try
- {
- var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
- var fileName = $"SceneIcon_{tradeTime}.png";
- string imgPath;
- if (IconPathType == 1 || IconPathType == 2)
- {
- Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
- HdlAutoBackupLogic.AddOrEditorFile(fileName);
- imgPath = fileName;
- }
- else
- {
- imgPath = backGround.ImagePath;
- }
- //if (Common.Room.CurrentRoom.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
- //{
- // CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
- // return;
- //}
- CommonPage.Loading.Start();
- var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
- for (int i = 0; i < sceneTargetDevicesList.Count; i++)
- {
- var sceneTarget = sceneTargetDevicesList[i];
-
- if (sceneTarget.Type == 0)
- {
- if (sceneTarget.DeviceUI == null)
- {
- continue;
- }
- var memberData = new AddSceneMemberData
- {
- Type = 0,
- ScenesId = 0,
- DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
- Epoint = sceneTarget.DeviceUI.DeviceEpoint,
- TaskList = sceneTarget.TaskList,
- DelayTime = 0,
- MemberNumber = i+1
- };
- memberDataList.Add(memberData);
- }
- else if (sceneTarget.Type == 1)
- {
- var memberData = new AddSceneMemberData
- {
- Type = 1,
- ScenesId = 0,
- ElseScenesId = sceneTarget.ElseScenesId,
- DelayTime = 0,
- MemberNumber = i+1
- };
- memberDataList.Add(memberData);
- }
- else if (sceneTarget.Type == 2)
- {
- var memberData = new AddSceneMemberData
- {
- Type = 2,
- ScenesId = 0,
- DelayTime = sceneTarget.DelayTime,
- MemberNumber = i+1
- };
- memberDataList.Add(memberData);
- }
- }
-
- var result = await HdlSceneLogic.Current.AddScene(curRoom, nameRow.NameText.Text, imgPath, memberDataList, IconPathType);
- if (result == 1)
- {
- AddAction?.Invoke();
- RemoveFromParent();
- }
- else if (result == 0)
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.AddSceneFail));
- }
- else if (result == -1)
- {
- CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
- }
- }
- catch (Exception ex)
- {
- System.Console.WriteLine($"鍒嗙被娣诲姞鍦烘櫙鍑洪敊{ex.Message}");
- }
- finally
- {
- CommonPage.Loading.Hide();
- }
- }
- }
-
- };
- #endregion
- }
-
- #endregion
-
- #region 缂栬緫璁惧____________________________________
-
- /// <summary>
- /// ShowSelectAction
- /// </summary>
- /// <param name="device"></param>
- private void ShowSelectAction(CommonDevice device, SceneTargetDeviceUI sceneTarget)
- {
- var dialog = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
- };
- AddChidren(dialog);
-
- dialog.MouseUpEventHandler += (sender, e) =>
- {
- dialog.RemoveFromParent();
- };
-
- if (device.Type == ZigBee.Device.DeviceType.OnOffOutput)
- {
- SelectOnoffOutput(dialog, device, sceneTarget);
- }
- else if (device.Type == ZigBee.Device.DeviceType.AirSwitch)
- {
- SelectOnoffOutput(dialog, device, sceneTarget);
- }
- else if (device.Type == ZigBee.Device.DeviceType.DimmableLight)
- {
- SelectDimmableLight(dialog, device, sceneTarget);
- }
- else if (device.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
- {
- SelectWindowCoveringDevice(dialog, device, sceneTarget);
- }
- else if (device.Type == ZigBee.Device.DeviceType.Thermostat)
- {
- SelectThermostat(dialog, device, sceneTarget);
- }
- }
-
- /// <summary>
- /// 鐏厜
- /// </summary>
- /// <param name="dialog"></param>
- /// <param name="device"></param>
- /// <param name="sceneTarget"></param>
- private void SelectOnoffOutput(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
- {
- var selectFL = new FrameLayout
- {
- Y = Application.GetRealHeight(1391),
- Height = Application.GetRealHeight(530),
- };
- dialog.AddChidren(selectFL);
- //selectFL.Animate = Animate.DownToUp;
-
- var titleBG = new FrameLayout
- {
- Height = Application.GetRealHeight(138 * 2),
- Radius = (uint)Application.GetRealHeight(58),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(titleBG);
-
- var titleFL = new FrameLayout
- {
- Height = Application.GetRealHeight(138),
- };
- selectFL.AddChidren(titleFL);
-
- var line = new Button
- {
- Y = titleFL.Height - 1,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- titleFL.AddChidren(line);
-
- var cancleBtn = new Button
- {
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.Cancel
- };
- titleFL.AddChidren(cancleBtn);
-
- var deviceName = new Button
- {
- Width = Application.GetRealWidth(600),
- Gravity = Gravity.CenterHorizontal,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextSize = 16,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
- };
- titleFL.AddChidren(deviceName);
-
- var comfrimBtn = new Button
- {
- X = Application.GetRealWidth(800),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterRight,
- TextID = R.MyInternationalizationString.Complete
- };
- titleFL.AddChidren(comfrimBtn);
-
- var itemFL = new FrameLayout
- {
- Y = titleFL.Bottom,
- Height = Application.GetRealHeight(392),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(itemFL);
-
- var open = new SelectSceneStatuRow(0, 60);
- itemFL.AddChidren(open);
- open.Init();
- open.SetTitle(R.MyInternationalizationString.Open);
- open.IsSelected = true;
-
-
- var shut = new SelectSceneStatuRow(0, 60 + 127 + 30);
- itemFL.AddChidren(shut);
- shut.Init();
- shut.hideLine(true);
- shut.SetTitle(R.MyInternationalizationString.Shut);
-
- open.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- };
-
- shut.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- };
-
- cancleBtn.MouseUpEventHandler = (sender, e) =>
- {
- dialog.RemoveAll();
- dialog.RemoveFromParent();
- };
-
- if (sceneTarget.TaskList.Count > 0)
- {
- if (sceneTarget.TaskList[0].Data1 == 1)
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- }
- else
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- }
- }
-
- comfrimBtn.MouseUpEventHandler = (sender, e) =>
- {
- var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
- int taskType = 1;
- int data1 = 0;
- int data2 = 0;
-
- if (open.IsSelected)
- {
- //寮�
- data1 = 1;
- data2 = 0;
- }
- else
- {
- //鍏�
- data1 = 0;
- data2 = 0;
- }
- var taskInfo = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = data1,
- Data2 = data2
- };
- taskList.Add(taskInfo);
-
- sceneTarget.TaskList = taskList;
- sceneTarget.DeviceUI = device;
- selectedAction?.Invoke(sceneTarget);
- dialog.RemoveFromParent();
- };
- }
- /// <summary>
- /// 绐楀笜
- /// </summary>
- /// <param name="dialog"></param>
- /// <param name="device"></param>
- /// <param name="sceneTarget"></param>
- private void SelectWindowCoveringDevice(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
- {
- var selectFL = new FrameLayout
- {
- Y = Application.GetRealHeight(1169),
- Height = Application.GetRealHeight(752),
- };
- dialog.AddChidren(selectFL);
- //selectFL.Animate = Animate.DownToUp;
-
- var titleBG = new FrameLayout
- {
- Height = Application.GetRealHeight(138 * 2),
- Radius = (uint)Application.GetRealHeight(58),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(titleBG);
-
- var titleFL = new FrameLayout
- {
- Height = Application.GetRealHeight(138),
- };
- selectFL.AddChidren(titleFL);
-
- var line = new Button
- {
- Y = titleFL.Height - 1,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- titleFL.AddChidren(line);
-
- var cancleBtn = new Button
- {
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.Cancel
- };
- titleFL.AddChidren(cancleBtn);
-
- var deviceName = new Button
- {
- Width = Application.GetRealWidth(600),
- Gravity = Gravity.CenterHorizontal,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextSize = 16,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
- };
- titleFL.AddChidren(deviceName);
-
- var comfrimBtn = new Button
- {
- X = Application.GetRealWidth(800),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterRight,
- TextID = R.MyInternationalizationString.Complete
- };
- titleFL.AddChidren(comfrimBtn);
-
- var itemFL = new FrameLayout
- {
- Y = titleFL.Bottom,
- Height = Application.GetRealHeight(613),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(itemFL);
-
- var open = new SelectDeviceWithSeekBarRow(0, 60);
- itemFL.AddChidren(open);
- open.Init();
- open.SetTitle(R.MyInternationalizationString.Open);
- open.IsSelected = true;
-
- var shut = new SelectSceneStatuRow(0, 60 + 348 + 30);
- itemFL.AddChidren(shut);
- shut.Init();
- shut.hideLine(true);
- shut.SetTitle(R.MyInternationalizationString.Shut);
-
- open.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- };
-
- shut.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- };
-
- cancleBtn.MouseUpEventHandler = (sender, e) =>
- {
- dialog.RemoveAll();
- dialog.RemoveFromParent();
- };
-
- open.SeekBar.OnProgressChangedEvent += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- open.SetSeekBarTitle();
- };
-
- if (sceneTarget.TaskList.Count > 0)
- {
- if (sceneTarget.TaskList[0].Data1 == 1)
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- }
- else
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- open.SetSeekBarProgress(sceneTarget.TaskList[0].Data2);
- }
- }
-
- comfrimBtn.MouseUpEventHandler = (sender, e) =>
- {
- var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
-
- int taskType = 6;
- int data1 = 0;
- int data2 = 0;
-
- if (shut.IsSelected)
- {
- //鍏�
- data1 = 1;
- data2 = 0;
- }
- else
- {
- //鐧惧垎姣�
- data1 = 5;
- data2 = open.SeekBar.Progress;
- }
-
- var taskInfo = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = data1,
- Data2 = data2
- };
- taskList.Add(taskInfo);
-
- sceneTarget.TaskList = taskList;
- sceneTarget.DeviceUI = device;
- selectedAction?.Invoke(sceneTarget);
- dialog.RemoveFromParent();
- };
- }
- /// <summary>
- /// 璋冨厜鐏�
- /// </summary>
- /// <param name="dialog"></param>
- /// <param name="device"></param>
- /// <param name="sceneTarget"></param>
- private void SelectDimmableLight(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
- {
- var selectFL = new FrameLayout
- {
- Y = Application.GetRealHeight(1169),
- Height = Application.GetRealHeight(752),
- };
- dialog.AddChidren(selectFL);
- //selectFL.Animate = Animate.DownToUp;
-
- var titleBG = new FrameLayout
- {
- Height = Application.GetRealHeight(138 * 2),
- Radius = (uint)Application.GetRealHeight(58),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(titleBG);
-
- var titleFL = new FrameLayout
- {
- Height = Application.GetRealHeight(138),
- };
- selectFL.AddChidren(titleFL);
-
- var line = new Button
- {
- Y = titleFL.Height - 1,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- titleFL.AddChidren(line);
-
- var cancleBtn = new Button
- {
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.Cancel
- };
- titleFL.AddChidren(cancleBtn);
-
- var deviceName = new Button
- {
- Width = Application.GetRealWidth(600),
- Gravity = Gravity.CenterHorizontal,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextSize = 16,
- TextAlignment = TextAlignment.CenterLeft,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
- };
- titleFL.AddChidren(deviceName);
-
- var comfrimBtn = new Button
- {
- X = Application.GetRealWidth(800),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterRight,
- TextID = R.MyInternationalizationString.Complete
- };
- titleFL.AddChidren(comfrimBtn);
-
- var itemFL = new FrameLayout
- {
- Y = titleFL.Bottom,
- Height = Application.GetRealHeight(613),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(itemFL);
-
- var open = new SelectDeviceWithSeekBarRow(0, 60);
- itemFL.AddChidren(open);
- open.Init(254);
- open.SetTitle(R.MyInternationalizationString.Open);
- open.IsSelected = true;
-
- var shut = new SelectSceneStatuRow(0, 60 + 348 + 30);
- itemFL.AddChidren(shut);
- shut.Init();
- shut.hideLine(true);
- shut.SetTitle(R.MyInternationalizationString.Shut);
-
- open.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- };
-
- shut.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- };
-
- cancleBtn.MouseUpEventHandler = (sender, e) =>
- {
- dialog.RemoveAll();
- dialog.RemoveFromParent();
- };
-
- open.SeekBar.OnProgressChangedEvent += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- open.SetSeekBarTitle();
- };
-
- if (sceneTarget.TaskList.Count > 0)
- {
- if (sceneTarget.TaskList[0].Data1 == 0)
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- }
- else
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- open.SetSeekBarProgress(sceneTarget.TaskList[0].Data1);
- }
- }
-
- comfrimBtn.MouseUpEventHandler = (sender, e) =>
- {
- var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
-
- int taskType = 3;
- int data1 = 0;
- int data2 = 0;
-
- if (shut.IsSelected)
- {
- //鍏�
- data1 = 0;
- data2 = 0;
- }
- else
- {
- //鐧惧垎姣�
- data1 = open.SeekBar.Progress;
- data2 = 0;
- }
-
- var taskInfo = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = data1,
- Data2 = data2
- };
- taskList.Add(taskInfo);
-
- sceneTarget.TaskList = taskList;
- sceneTarget.DeviceUI = device;
- selectedAction?.Invoke(sceneTarget);
- dialog.RemoveFromParent();
- };
- }
- /// <summary>
- /// 绌鸿皟
- /// </summary>
- /// <param name="dialog"></param>
- /// <param name="device"></param>
- /// <param name="sceneTarget"></param>
- private void SelectThermostat(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
- {
- /// 娓╁害
- int tempId=0;
- /// 妯″紡
- int modelId=0;
- /// 椋庨��
- int fanid=0;
-
- var selectFL = new FrameLayout
- {
- Y = Application.GetRealHeight(815),
- Height = Application.GetRealHeight(1106),
- };
- dialog.AddChidren(selectFL);
- //selectFL.Animate = Animate.DownToUp;
-
- var titleBG = new FrameLayout
- {
- Height = Application.GetRealHeight(138 * 2),
- Radius = (uint)Application.GetRealHeight(58),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(titleBG);
-
- var titleFL = new FrameLayout
- {
- Height = Application.GetRealHeight(138),
- };
- selectFL.AddChidren(titleFL);
-
- var line = new Button
- {
- Y = titleFL.Height - 1,
- Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
- };
- titleFL.AddChidren(line);
-
- var cancleBtn = new Button
- {
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextGrayColor,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = R.MyInternationalizationString.Cancel
- };
- titleFL.AddChidren(cancleBtn);
-
- var deviceName = new Button
- {
- Width = Application.GetRealWidth(600),
- Gravity = Gravity.CenterHorizontal,
- TextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextSize = 16,
- TextAlignment = TextAlignment.CenterLeft,
- Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
- };
- titleFL.AddChidren(deviceName);
-
- var comfrimBtn = new Button
- {
- X = Application.GetRealWidth(800),
- Width = Application.GetRealWidth(200),
- TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterRight,
- TextID = R.MyInternationalizationString.Complete
- };
- titleFL.AddChidren(comfrimBtn);
-
- var itemFL = new FrameLayout
- {
- Y = titleFL.Bottom,
- Height = Application.GetRealHeight(968),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
- };
- selectFL.AddChidren(itemFL);
-
- var open = new SelectDeviceWithPickViewRow(0, 60);
- itemFL.AddChidren(open);
- open.Init();
- open.SetTitle(R.MyInternationalizationString.Open);
- open.IsSelected = true;
-
- open.pickerView.OnSelectChangeEvent = (l1, l2, l3) =>
- {
- tempId = l1;
- modelId = l2;
- fanid = l3;
- };
-
- var shut = new SelectSceneStatuRow(0, 60 + 703 + 30);
- itemFL.AddChidren(shut);
- shut.Init();
- shut.hideLine(true);
- shut.SetTitle(R.MyInternationalizationString.Shut);
-
- open.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = true;
- shut.IsSelected = false;
- };
-
- shut.ClickButton.MouseUpEventHandler += (sender, e) =>
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- };
-
- cancleBtn.MouseUpEventHandler = (sender, e) =>
- {
- dialog.RemoveAll();
- dialog.RemoveFromParent();
- };
-
- if (sceneTarget.TaskList.Count > 0)
- {
- if (sceneTarget.TaskList.Count == 1)
- {
- open.IsSelected = false;
- shut.IsSelected = true;
- }
- else
- {
- open.IsSelected = true;
- shut.IsSelected = false;
-
- for (int i = 0; i < sceneTarget.TaskList.Count; i++)
- {
- var tasklist = sceneTarget.TaskList[i];
- if (tasklist.Data1 == 6)
- {
- fanid = open.fanList.IndexOf(tasklist.Data2);
- }
- if (tasklist.Data1 == 3)
- {
- modelId = open.modeList.IndexOf(tasklist.Data2);
- }
- if (tasklist.Data1 == 4 || tasklist.Data1 == 5)
- {
- tempId = open.temperatureList.IndexOf(tasklist.Data2 / 100);
- }
- }
- open.pickerView.setCurrentItems(tempId, modelId, fanid);
- }
- }
-
- comfrimBtn.MouseUpEventHandler = (sender, e) =>
- {
-
- var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
-
- int taskType = 5;
- int data1 = 0;
- int data2 = 0;
-
- if (shut.IsSelected)
- {
- //鍏�
- data1 = 3;
- data2 = 0;
- var taskInfo = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = data1,
- Data2 = data2
- };
- taskList.Add(taskInfo);
- }
- else
- {
- //fan
- var taskInfo = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = 6,
- Data2 = open.fanList[fanid]
- };
- taskList.Add(taskInfo);
-
- //mode
- var taskInfo2 = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = 3,
- Data2 = open.modeList[modelId]
- };
- taskList.Add(taskInfo2);
-
- //tem
- if (open.modeList[modelId] == 4)
- {
- //heat
- var taskInfo3 = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = 4,
- Data2 = open.temperatureList[tempId] * 100
- };
- taskList.Add(taskInfo3);
-
- }
- else
- {
- //heat
- var taskInfo3 = new ZigBee.Device.Scene.TaskListInfo
- {
- TaskType = taskType,
- Data1 = 5,
- Data2 = open.temperatureList[tempId] * 100
- };
- taskList.Add(taskInfo3);
- }
- }
-
- sceneTarget.TaskList = taskList;
- sceneTarget.DeviceUI = device;
- selectedAction?.Invoke(sceneTarget);
- dialog.RemoveFromParent();
- };
- }
-
- #endregion
-
- }
-}
+ if (targetDevice.DeviceUI == null) continue;
+ devImgPath = targetDevice.DeviceUI.IconPath;
+ devNameText = Common.LocalDevice.Current.GetDeviceEpointName(targetDevice.DeviceUI);
+
+ var targetRow = new SceneTargetFunctionRow(13);
+ targetRow.Init();
+ targetRow.SetIcon(devImgPath);
+ targetRow.SetNameText(devNameText);
+ targetRow.SetZoneText(HdlRoomLogic.Current.GetRoomNameByDevice(targetDevice.DeviceUI, ","));
+ targetRow.SetStatuText(targetDevice.GetDeviceStatu());
+ targetRowLayout.AddChidren(targetRow);
+ if (i == sceneTargetDevicesList.Count - 1)
+ {
+ targetRow.HideLine(true);
+ }
+ }
+ else if (targetDevice.Type == 2)
+ {
+ devNameText = CommonFormResouce.GetTimeString(targetDevice.DelayTime);
+ devNameText += Language.StringByID(R.MyInternationalizationString.Later);
+ var targetRow = new SceneTargetTimeRow(13);
+ targetRow.Init();
+ targetRow.SetTitle(devNameText);
+ targetRowLayout.AddChidren(targetRow);
+ if (i == sceneTargetDevicesList.Count - 1)
+ {
+ targetRow.HideLine(true);
+ }
+ }
+ else if (targetDevice.Type == 1)
+ {
+ devImgPath = "Scene/SceneIcon.png";
+ devNameText = targetDevice.SceneName;
+
+ var targetRow = new SceneTargetFunctionRow(13);
+ targetRow.Init();
+ targetRow.SetIcon(devImgPath);
+ targetRow.SetNameText(devNameText);
+ targetRow.SetZoneText(HdlSceneLogic.Current.GetZoneById(targetDevice.SceneUI.Id));
+ targetRowLayout.AddChidren(targetRow);
+ if (i == sceneTargetDevicesList.Count - 1)
+ {
+ targetRow.HideLine(true);
+ }
+ }
+
+ var editBtn = new RowLayoutEditButton();
+ targetRowLayout.AddRightView(editBtn);
+ //缂栬緫璁惧
+ editBtn.MouseUpEventHandler += detailMouseUpEventHandler;
+ var delBtn = new RowLayoutDeleteButton();
+ targetRowLayout.AddRightView(delBtn);
+ //鍒犻櫎璁惧
+ delBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ sceneTargetDevicesList.Remove(targetDevice);
+ RefreshTargetListView();
+ };
+
+ //璁惧璇︾粏璁剧疆鐣岄潰
+ void detailMouseUpEventHandler(object sender, MouseEventArgs e)
+ {
+ if (targetDevice.Type == 0)
+ {
+ if (targetDevice.DeviceUI == null)
+ {
+ return;
+ }
+
+ ShowSelectAction(targetDevice.DeviceUI, targetDevice);
+ selectedAction = (selectedDevice) =>
+ {
+ var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == selectedDevice.SceneTargetDeviceUIID);
+ if (targetDeviceUI != null)
+ {
+ targetDeviceUI.DeviceUI = selectedDevice.DeviceUI;
+ targetDeviceUI.TaskList = selectedDevice.TaskList;
+ }
+ RefreshTargetListView();
+ };
+
+ }
+ else if (targetDevice.Type == 2)
+ {
+ var delayTimeView = new SelectDelayTime();
+ UserView.HomePage.Instance.AddChidren(delayTimeView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ delayTimeView.sceneTargetDevice = targetDevice;
+ delayTimeView.totalSecond = targetDevice.DelayTime;
+ delayTimeView.Show();
+ delayTimeView.selectedTimeAction = (second) =>
+ {
+ var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == second.SceneTargetDeviceUIID);
+ if (targetDeviceUI != null)
+ {
+ targetDeviceUI.DelayTime = second.DelayTime;
+ }
+ RefreshTargetListView();
+ };
+ }
+ else if (targetDevice.Type == 1)
+ {
+ var sceneView = new SelectScene();
+ UserView.HomePage.Instance.AddChidren(sceneView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ sceneView.sceneTargetDevice = targetDevice;
+ sceneView.sceneUI = targetDevice.SceneUI;
+ sceneView.currentSceneUI = modifySceneUI;
+ sceneView.Show();
+ sceneView.selectedAction = (selectedScene) =>
+ {
+ var targetDeviceUI = sceneTargetDevicesList.Find((obj) => obj.SceneTargetDeviceUIID == selectedScene.SceneTargetDeviceUIID);
+ if (targetDeviceUI != null)
+ {
+ targetDeviceUI.SceneName = selectedScene.SceneName;
+ targetDevice.SceneUI = selectedScene.SceneUI;
+ targetDevice.ElseScenesId = selectedScene.ElseScenesId;
+ }
+ RefreshTargetListView();
+ };
+ }
+ }
+ }
+ }
+ }
+ /// <summary>
+ /// Show this instance.
+ /// </summary>
+ public void Show()
+ {
+ Init();
+
+ AddTop();
+
+ AddBodyView();
+
+ }
+
+ #region Add____________________________________
+
+ /// <summary>
+ /// Init
+ /// </summary>
+ private void Init()
+ {
+
+ }
+
+ /// <summary>
+ /// AddTop
+ /// </summary>
+ private void AddTop()
+ {
+ var top = new TopFrameLayout();
+ AddChidren(top);
+ top.InitTopview();
+ if (isModify)
+ {
+ top.SetTopTitle(R.MyInternationalizationString.EditorScene);
+ }
+ else
+ {
+ top.SetTopTitle(R.MyInternationalizationString.AddScence);
+ }
+ top.backButton.MouseUpEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+ }
+
+ /// <summary>
+ /// AddBodyView
+ /// </summary>
+ private void AddBodyView()
+ {
+ var bodyScrolView = new VerticalScrolViewLayout()
+ {
+ Y = Application.GetRealHeight(184),
+ Height = Application.GetRealHeight(1737),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ };
+ AddChidren(bodyScrolView);
+
+ bodyFrameLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(1086 + 127),
+ BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor,
+ };
+ bodyScrolView.AddChidren(bodyFrameLayout);
+
+ var imgFL = new FrameLayout
+ {
+ Height = Application.GetRealHeight(559),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ bodyFrameLayout.AddChidren(imgFL);
+
+ var backGround1 = new ImageView()
+ {
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetMinRealAverage(916),
+ Height = Application.GetMinRealAverage(487),
+ Gravity = Gravity.CenterHorizontal,
+ ImagePath = "Room/Room_Rectangle.png"
+ };
+ imgFL.AddChidren(backGround1);
+
+ backGround = new ImageView()
+ {
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetMinRealAverage(887),
+ Height = Application.GetMinRealAverage(444),
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetMinRealAverage(CommonFormResouce.BigFormRadius),
+ ImagePath = "SceneIcon/3.png"
+ };
+ imgFL.AddChidren(backGround);
+
+ var infoFL = new FrameLayout
+ {
+ Y = imgFL.Bottom + Application.GetRealHeight(23),
+ Height = Application.GetRealHeight(418),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ bodyFrameLayout.AddChidren(infoFL);
+
+ var infoEdit = new Button
+ {
+ X = Application.GetRealWidth(CommonFormResouce.X_Left),
+ Height = Application.GetRealHeight(130),
+ Width = Application.GetRealWidth(700),
+ TextID = R.MyInternationalizationString.EditInfo,
+ TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 15,
+ //IsBold=true
+ };
+ infoFL.AddChidren(infoEdit);
+
+
+ var nameRow = new DeviceInfoEditRow(130);
+ nameRow.Init();
+ nameRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.SceneName)}:");
+ nameRow.SetPlaceHoldText(R.MyInternationalizationString.PleaseInputSceneName);
+ infoFL.AddChidren(nameRow);
+
+ var zoneRow = new DeviceInfoRow(257);
+ zoneRow.Y = nameRow.Bottom + Application.GetRealHeight(14);
+ zoneRow.Init();
+ zoneRow.SetTipTitle($"{Language.StringByID(R.MyInternationalizationString.BelongZone)}:");
+ //zoneRow.SetTitle(curRoom.Name);
+ infoFL.AddChidren(zoneRow);
+ zoneRow.HideLine(true);
+
+ var targetFL = new FrameLayout()
+ {
+ Y = infoFL.Bottom + Application.GetRealHeight(23),
+ Height = Application.GetRealHeight(346)
+ };
+ bodyFrameLayout.AddChidren(targetFL);
+
+ var targetBG = new FrameLayout
+ {
+ Height = Application.GetRealHeight(334),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ targetFL.AddChidren(targetBG);
+
+ var addTargetFL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(46),
+ Height = Application.GetRealHeight(127),
+ };
+ targetFL.AddChidren(addTargetFL);
+
+ var target = new Button()
+ {
+ X = Application.GetRealWidth(CommonFormResouce.X_Left),
+ Height = Application.GetRealHeight(127) - 1,
+ Width = Application.GetRealWidth(600),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextID = R.MyInternationalizationString.AddScentTargetAction,
+ Gravity = Gravity.CenterVertical,
+ TextSize = 15
+ };
+ addTargetFL.AddChidren(target);
+
+ var targetAdd = new Button
+ {
+ X = Application.GetRealWidth(950),
+ Y = Application.GetRealHeight(46),
+ Width = Application.GetMinRealAverage(72),
+ Height = Application.GetMinRealAverage(72),
+ Gravity = Gravity.CenterVertical,
+ UnSelectedImagePath = "Item/Add.png",
+ };
+ addTargetFL.AddChidren(targetAdd);
+ var targetLine = new Button()
+ {
+ Y = target.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ addTargetFL.AddChidren(targetLine);
+
+ TargetListScrolView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(173)
+ };
+ bodyScrolView.AddChidren(TargetListScrolView);
+
+
+
+ confirmBtn = new CommonForm.CompleteButton(1656, 907, 127);
+ confirmBtn.TextID = R.MyInternationalizationString.uFinish;
+ AddChidren(confirmBtn);
+
+ if (isModify)
+ {
+ IconPathType = modifySceneUI.IconPathType;
+ OldIconPathType = modifySceneUI.IconPathType;
+ if (IconPathType != 0)
+ {
+ OldBackgroundImagePath = modifySceneUI.IconPath;
+ }
+ if (modifySceneUI.IconPathType == 0)
+ {
+ backGround.ImagePath = modifySceneUI.IconPath;
+ }
+ else
+ {
+ backGround.ImagePath = System.IO.Path.Combine(Config.Instance.FullPath, modifySceneUI.IconPath);
+ }
+ nameRow.SetTitle(modifySceneUI.Name);
+ if (Config.Instance.Home.FloorDics.Count == 0)
+ {
+ zoneRow.SetTitle($"{modifyRoom.Name}");
+ }
+ else
+ {
+ zoneRow.SetTitle($"{Config.Instance.Home.GetFloorNameById(modifyRoom.FloorId)}锛寋modifyRoom.Name}");
+ }
+ curRoom = modifyRoom;
+ sceneTargetDevicesList.AddRange(modifySceneTargetDevicesList);
+ }
+
+ RefreshTargetListView();
+
+ #region event
+
+ EventHandler<MouseEventArgs> backGroundIMGHander = (sender, e) =>
+ {
+ if (curRoom != null && curRoom.IsSharedRoom)
+ {
+ RoomCommon.ShowTipRoomIsShared();
+ return;
+ }
+
+ int selectRow_Height = 150;
+ int selectRow_Width = 1034;
+ var selectFL = new FrameLayout()
+ {
+ BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
+ };
+ AddChidren(selectFL);
+
+ var itemFL = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(1276),
+ Height = Application.GetRealHeight(450),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetRealHeight(35),
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ selectFL.AddChidren(itemFL);
+ //itemFL.Animate = Animate.DownToUp;
+
+ var selectLocalPicture = new Button()
+ {
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.LocalPicture,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectLocalPicture);
+ var selectLocalLine = new Button()
+ {
+ Y = selectLocalPicture.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ itemFL.AddChidren(selectLocalLine);
+
+ var selectPhotographBtn = new Button()
+ {
+ Y = selectLocalLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.Photograph,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectPhotographBtn);
+ var selectPhotographLine = new Button()
+ {
+ Y = selectPhotographBtn.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
+ };
+ itemFL.AddChidren(selectPhotographLine);
+
+ var selectAblumsBtn = new Button()
+ {
+ Y = selectPhotographLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.MyAblums,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectAblumsBtn);
+
+ var cancelBtn = new Button()
+ {
+ Y = Application.GetRealHeight(1742),
+ Height = Application.GetRealHeight(selectRow_Height),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ TextID = R.MyInternationalizationString.Cancel,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ Radius = (uint)Application.GetRealHeight(35),
+ TextSize = 17
+ };
+ selectFL.AddChidren(cancelBtn);
+
+ selectLocalPicture.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var localPic = new CategorySceneSelectImgByLocal();
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(localPic);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ localPic.Show();
+ localPic.action = (imgPath) =>
+ {
+ IconPathType = 0;
+ backGround.ImageBytes = null;
+ backGround.ImagePath = imgPath;
+ };
+ };
+ selectPhotographBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
+ var fileName = $"SceneIcon_{tradeTime}.png";
+ //閫氳繃鐩告満鎷嶇収瑁佸壀
+ CropImage.TakePicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
+ }
+ if (isModify)
+ {
+ if (IconPathType != 0)
+ {
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
+ HdlAutoBackupLogic.DeleteFile(backGround.ImagePath);
+ }
+ }
+
+ IconPathType = 1;
+ backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ backGround.ImagePath = imagePath;
+ System.IO.File.Delete(imagePath);
+
+ }, fileName, 2, 1);
+ };
+
+ selectAblumsBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
+ var fileName = $"SceneIcon_{tradeTime}.png";
+ //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+ CropImage.SelectPicture((imagePath) =>
+ {
+ if (string.IsNullOrEmpty(imagePath))
+ {
+ return;
+ }
+ if (isModify)
+ {
+ if (IconPathType != 0)
+ {
+ Global.DeleteFilebyHomeId(backGround.ImagePath);
+ HdlAutoBackupLogic.DeleteFile(backGround.ImagePath);
+ }
+ }
+
+ IconPathType = 2;
+ backGround.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
+ backGround.ImagePath = imagePath;
+ System.IO.File.Delete(imagePath);
+
+ }, fileName, 2, 1);
+ };
+
+ cancelBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
+ selectFL.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
+ };
+ backGround.MouseUpEventHandler += backGroundIMGHander;
+
+ //鍖哄煙
+ EventHandler<MouseEventArgs> zoneHander = (sender, e) =>
+ {
+ var zone = new SelectZone();
+ zone.Init();
+ zone.ZoneAction += (selectRoom) =>
+ {
+ curRoom = selectRoom;
+ zoneRow.SetTitle(HdlRoomLogic.Current.GetZoneName(selectRoom));
+ };
+ };
+ zoneRow.ClickBtn.MouseUpEventHandler += zoneHander;
+
+ //鎵ц鐩爣-娣诲姞鎵ц璁惧
+ EventHandler<MouseEventArgs> targetAddHander = (sender, e) =>
+ {
+
+ //if (curRoom == null)
+ //{
+ // RoomCommon.ShowTipNoRoom();
+ // return;
+ //}
+ if (curRoom != null)
+ {
+ if (curRoom.IsSharedRoom)
+ {
+ RoomCommon.ShowTipRoomIsShared();
+ return;
+ }
+ }
+
+ int selectRow_Height = 150;
+ int selectRow_Width = 1034;
+ var selectFL = new FrameLayout()
+ {
+ BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
+ };
+ AddChidren(selectFL);
+
+ var itemFL = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(1276),
+ Height = Application.GetRealHeight(450),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetRealHeight(35),
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ selectFL.AddChidren(itemFL);
+ //itemFL.Animate = Animate.DownToUp;
+
+ var selectedFunctionBtn = new Button()
+ {
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.Function,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectedFunctionBtn);
+ var selectedFunctionLine = new Button()
+ {
+ Y = selectedFunctionBtn.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ itemFL.AddChidren(selectedFunctionLine);
+
+ var selectedSceneBtn = new Button()
+ {
+ Y = selectedFunctionLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.Scence,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectedSceneBtn);
+ var selectedSceneLine = new Button()
+ {
+ Y = selectedSceneBtn.Bottom,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
+ };
+ itemFL.AddChidren(selectedSceneLine);
+
+ var selectedTimerBtn = new Button()
+ {
+ Y = selectedSceneLine.Bottom,
+ Height = Application.GetRealHeight(selectRow_Height) - 1,
+ TextID = R.MyInternationalizationString.Delay,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ TextSize = 17
+ };
+ itemFL.AddChidren(selectedTimerBtn);
+
+
+ var cancelBtn = new Button()
+ {
+ Y = Application.GetRealHeight(1742),
+ Height = Application.GetRealHeight(selectRow_Height),
+ Width = Application.GetRealWidth(selectRow_Width),
+ Gravity = Gravity.CenterHorizontal,
+ TextID = R.MyInternationalizationString.Cancel,
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor4,
+ BackgroundColor = ZigbeeColor.Current.GXCTextWhiteColor,
+ Radius = (uint)Application.GetRealHeight(35),
+ TextSize = 17
+ };
+ selectFL.AddChidren(cancelBtn);
+
+ //娣诲姞鍔熻兘
+ selectedFunctionBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var deviceView = new SelectDevice();
+ UserView.HomePage.Instance.AddChidren(deviceView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ deviceView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
+ deviceView.Show();
+ deviceView.selectedAction = (selectedDevice) =>
+ {
+ sceneTargetDevicesList.Add(selectedDevice);
+ RefreshTargetListView();
+ };
+ };
+ //娣诲姞鍦烘櫙
+ selectedSceneBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var sceneView = new SelectScene();
+ UserView.HomePage.Instance.AddChidren(sceneView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ sceneView.beforeSceneTargetDeviceUIs = sceneTargetDevicesList;
+ sceneView.currentSceneUI = modifySceneUI;
+ sceneView.Show();
+ sceneView.selectedAction = (selectedScene) =>
+ {
+ sceneTargetDevicesList.Add(selectedScene);
+ RefreshTargetListView();
+ };
+
+ };
+ //娣诲姞鏃堕棿闂撮殧
+ selectedTimerBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ var delayTimeView = new SelectDelayTime();
+ UserView.HomePage.Instance.AddChidren(delayTimeView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ delayTimeView.Show();
+ delayTimeView.selectedTimeAction = (second) =>
+ {
+ sceneTargetDevicesList.Add(second);
+ RefreshTargetListView();
+ };
+ };
+
+ cancelBtn.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
+ selectFL.MouseUpEventHandler += (send, ee) =>
+ {
+ selectFL.RemoveFromParent();
+ };
+ };
+ targetAdd.MouseUpEventHandler += targetAddHander;
+ targetFL.MouseUpEventHandler += targetAddHander;
+ target.MouseUpEventHandler += targetAddHander;
+ addTargetFL.MouseUpEventHandler += targetAddHander;
+ //纭畾娣诲姞鐩爣
+ confirmBtn.MouseUpEventHandler += async (sender, e) =>
+ {
+ if (curRoom == null)
+ {
+ RoomCommon.ShowTipNoRoom();
+ return;
+ }
+ if (curRoom.IsSharedRoom)
+ {
+ RoomCommon.ShowTipRoomIsShared();
+ return;
+ }
+
+ if (isModify)
+ {
+ if (string.IsNullOrEmpty(nameRow.NameText.Text))
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.SceneNameCannotBeNull));
+ return;
+ }
+ else
+ {
+ try
+ {
+ var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
+ var fileName = $"SceneIcon_{tradeTime}.png";
+ if (modifySceneUI.Name != nameRow.NameText.Text.Trim())
+ {
+ if (HdlSceneLogic.Current.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
+ return;
+ }
+ var r = await ZigBee.Device.Scene.RenameSceneAsync(modifySceneUI.Id, nameRow.NameText.Text.Trim());
+ var reName = r.sceneRenameResponseData.Result;
+ if (reName == 0)
+ {
+ return;
+ }
+ else if (reName == 1)
+ {
+ modifySceneUI.Name = nameRow.NameText.Text.Trim();
+
+ }
+ else if (reName == 2)
+ {
+ return;
+ }
+ }
+ if (OldIconPathType != 0)
+ {
+ Shared.IO.FileUtils.DeleteFile(System.IO.Path.Combine(Config.Instance.FullPath, OldBackgroundImagePath));
+ HdlAutoBackupLogic.DeleteFile(OldBackgroundImagePath);
+ }
+ if (IconPathType == 1 || IconPathType == 2)
+ {
+ Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
+ HdlAutoBackupLogic.AddOrEditorFile(fileName);
+ modifySceneUI.IconPath = fileName;
+ }
+ else
+ {
+ modifySceneUI.IconPath = backGround.ImagePath;
+ }
+ modifySceneUI.IconPathType = IconPathType;
+
+ CommonPage.Loading.Start();
+ var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
+ for (int i = 0; i < sceneTargetDevicesList.Count; i++)
+ {
+ var sceneTarget = sceneTargetDevicesList[i];
+
+ if (sceneTarget.Type == 0)
+ {
+ if (sceneTarget.DeviceUI == null)
+ {
+ continue;
+ }
+ var memberData = new AddSceneMemberData
+ {
+ Type = 0,
+ ScenesId = 0,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
+ TaskList = sceneTarget.TaskList,
+ DelayTime = 0,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ else if (sceneTarget.Type == 1)
+ {
+ var memberData = new AddSceneMemberData
+ {
+ Type = 1,
+ ScenesId = 0,
+ ElseScenesId = sceneTarget.ElseScenesId,
+ DelayTime = 0,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ else if (sceneTarget.Type == 2)
+ {
+ var memberData = new AddSceneMemberData
+ {
+ Type = 2,
+ ScenesId = 0,
+ DelayTime = sceneTarget.DelayTime,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ }
+
+ var sceneRemoveMemberData = new SceneRemoveMemberData { };
+ var removeSceneDeviceListInfoList = new List<RemoveSceneDeviceListInfo> { };
+ for (int i = 0; i < modifySceneTargetDevicesList.Count; i++)
+ {
+ var sceneTarget = modifySceneTargetDevicesList[i];
+ if (sceneTarget.Type == 0)
+ {
+ if (sceneTarget.DeviceUI == null)
+ {
+ continue;
+ }
+ var removeDevice = new RemoveSceneDeviceListInfo
+ {
+ Type = 0,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
+ MemberNumber = sceneTarget.DelayTimeSerialNumber
+ };
+ removeSceneDeviceListInfoList.Add(removeDevice);
+ }
+ else if (sceneTarget.Type == 1)
+ {
+ var removeDevice = new ZigBee.Device.Scene.RemoveSceneDeviceListInfo
+ {
+ Type = 1,
+ ElseScenesId = sceneTarget.ElseScenesId,
+ MemberNumber = sceneTarget.DelayTimeSerialNumber
+ };
+ removeSceneDeviceListInfoList.Add(removeDevice);
+ }
+ else
+ {
+ var removeDevice = new ZigBee.Device.Scene.RemoveSceneDeviceListInfo
+ {
+ Type = 2,
+ DelayTime = sceneTarget.DelayTime,
+ MemberNumber = sceneTarget.DelayTimeSerialNumber
+ };
+ removeSceneDeviceListInfoList.Add(removeDevice);
+ }
+ }
+ sceneRemoveMemberData.DeviceList = removeSceneDeviceListInfoList;
+ sceneRemoveMemberData.ScenesId = modifySceneUI.Id;
+ var result = await HdlSceneLogic.Current.ModifyScene(modifySceneUI, sceneRemoveMemberData, memberDataList);
+ if (result == 1)
+ {
+ if (modifyRoom != curRoom)
+ {
+ modifyRoom.ListSceneId.Remove(modifySceneUI.Id);
+ curRoom.ListSceneId.Add(modifySceneUI.Id);
+ modifyRoom.Save();
+ curRoom.Save();
+ }
+ EditorAction?.Invoke(modifySceneUI, curRoom);
+ RemoveFromParent();
+ }
+ else if (result == 0)
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.FailedPleaseTryAgain));
+ }
+ else if (result == -1)
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
+ }
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"鍒嗙被娣诲姞鍦烘櫙鍑洪敊{ex.Message}");
+ }
+ finally
+ {
+ CommonPage.Loading.Hide();
+ }
+ }
+ }
+ else
+ {
+ //鏂板
+ if (string.IsNullOrEmpty(nameRow.NameText.Text))
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.SceneNameCannotBeNull));
+ return;
+ }
+ else
+ {
+ try
+ {
+ var tradeTime = DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo);
+ var fileName = $"SceneIcon_{tradeTime}.png";
+ string imgPath;
+ if (IconPathType == 1 || IconPathType == 2)
+ {
+ Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Config.Instance.FullPath, fileName), backGround.ImageBytes);
+ HdlAutoBackupLogic.AddOrEditorFile(fileName);
+ imgPath = fileName;
+ }
+ else
+ {
+ imgPath = backGround.ImagePath;
+ }
+ //if (Common.Room.CurrentRoom.GetSameFloorScenes(curRoom.FloorId).Find(s => s.Name == nameRow.NameText.Text.Trim()) != null)
+ //{
+ // CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
+ // return;
+ //}
+ CommonPage.Loading.Start();
+ var memberDataList = new List<ZigBee.Device.Scene.AddSceneMemberData>();
+ for (int i = 0; i < sceneTargetDevicesList.Count; i++)
+ {
+ var sceneTarget = sceneTargetDevicesList[i];
+
+ if (sceneTarget.Type == 0)
+ {
+ if (sceneTarget.DeviceUI == null)
+ {
+ continue;
+ }
+ var memberData = new AddSceneMemberData
+ {
+ Type = 0,
+ ScenesId = 0,
+ DeviceAddr = sceneTarget.DeviceUI.DeviceAddr,
+ Epoint = sceneTarget.DeviceUI.DeviceEpoint,
+ TaskList = sceneTarget.TaskList,
+ DelayTime = 0,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ else if (sceneTarget.Type == 1)
+ {
+ var memberData = new AddSceneMemberData
+ {
+ Type = 1,
+ ScenesId = 0,
+ ElseScenesId = sceneTarget.ElseScenesId,
+ DelayTime = 0,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ else if (sceneTarget.Type == 2)
+ {
+ var memberData = new AddSceneMemberData
+ {
+ Type = 2,
+ ScenesId = 0,
+ DelayTime = sceneTarget.DelayTime,
+ MemberNumber = i + 1
+ };
+ memberDataList.Add(memberData);
+ }
+ }
+
+ var result = await HdlSceneLogic.Current.AddScene(curRoom, nameRow.NameText.Text, imgPath, memberDataList, IconPathType);
+ if (result == 1)
+ {
+ AddAction?.Invoke();
+ RemoveFromParent();
+ }
+ else if (result == 0)
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.AddSceneFail));
+ }
+ else if (result == -1)
+ {
+ CommonFormResouce.ShowTip(Language.StringByID(R.MyInternationalizationString.TheSceneHadExist));
+ }
+ }
+ catch (Exception ex)
+ {
+ System.Console.WriteLine($"鍒嗙被娣诲姞鍦烘櫙鍑洪敊{ex.Message}");
+ }
+ finally
+ {
+ CommonPage.Loading.Hide();
+ }
+ }
+ }
+
+ };
+ #endregion
+ }
+
+ #endregion
+
+ #region 缂栬緫璁惧____________________________________
+
+ /// <summary>
+ /// ShowSelectAction
+ /// </summary>
+ /// <param name="device"></param>
+ private void ShowSelectAction(CommonDevice device, SceneTargetDeviceUI sceneTarget)
+ {
+ var dialog = new FrameLayout()
+ {
+ BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
+ };
+ AddChidren(dialog);
+
+ dialog.MouseUpEventHandler += (sender, e) =>
+ {
+ dialog.RemoveFromParent();
+ };
+
+ if (device.Type == ZigBee.Device.DeviceType.OnOffOutput)
+ {
+ SelectOnoffOutput(dialog, device, sceneTarget);
+ }
+ else if (device.Type == ZigBee.Device.DeviceType.AirSwitch)
+ {
+ SelectOnoffOutput(dialog, device, sceneTarget);
+ }
+ else if (device.Type == ZigBee.Device.DeviceType.DimmableLight)
+ {
+ SelectDimmableLight(dialog, device, sceneTarget);
+ }
+ else if (device.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
+ {
+ SelectWindowCoveringDevice(dialog, device, sceneTarget);
+ }
+ else if (device.Type == ZigBee.Device.DeviceType.Thermostat)
+ {
+ SelectThermostat(dialog, device, sceneTarget);
+ }
+ }
+
+ /// <summary>
+ /// 鐏厜
+ /// </summary>
+ /// <param name="dialog"></param>
+ /// <param name="device"></param>
+ /// <param name="sceneTarget"></param>
+ private void SelectOnoffOutput(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
+ {
+ var selectFL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(1391),
+ Height = Application.GetRealHeight(530),
+ };
+ dialog.AddChidren(selectFL);
+ //selectFL.Animate = Animate.DownToUp;
+
+ var titleBG = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138 * 2),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(titleBG);
+
+ var titleFL = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138),
+ };
+ selectFL.AddChidren(titleFL);
+
+ var line = new Button
+ {
+ Y = titleFL.Height - 1,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ titleFL.AddChidren(line);
+
+ var cancleBtn = new Button
+ {
+ X = Application.GetRealWidth(80),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.Cancel
+ };
+ titleFL.AddChidren(cancleBtn);
+
+ var deviceName = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 16,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
+ };
+ titleFL.AddChidren(deviceName);
+
+ var comfrimBtn = new Button
+ {
+ X = Application.GetRealWidth(800),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = R.MyInternationalizationString.Complete
+ };
+ titleFL.AddChidren(comfrimBtn);
+
+ var itemFL = new FrameLayout
+ {
+ Y = titleFL.Bottom,
+ Height = Application.GetRealHeight(392),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(itemFL);
+
+ var open = new SelectSceneStatuRow(0, 60);
+ itemFL.AddChidren(open);
+ open.Init();
+ open.SetTitle(R.MyInternationalizationString.Open);
+ open.IsSelected = true;
+
+
+ var shut = new SelectSceneStatuRow(0, 60 + 127 + 30);
+ itemFL.AddChidren(shut);
+ shut.Init();
+ shut.hideLine(true);
+ shut.SetTitle(R.MyInternationalizationString.Shut);
+
+ open.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ };
+
+ shut.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ };
+
+ cancleBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.RemoveAll();
+ dialog.RemoveFromParent();
+ };
+
+ if (sceneTarget.TaskList.Count > 0)
+ {
+ if (sceneTarget.TaskList[0].Data1 == 1)
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ }
+ else
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ }
+ }
+
+ comfrimBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
+ int taskType = 1;
+ int data1 = 0;
+ int data2 = 0;
+
+ if (open.IsSelected)
+ {
+ //寮�
+ data1 = 1;
+ data2 = 0;
+ }
+ else
+ {
+ //鍏�
+ data1 = 0;
+ data2 = 0;
+ }
+ var taskInfo = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = data1,
+ Data2 = data2
+ };
+ taskList.Add(taskInfo);
+
+ sceneTarget.TaskList = taskList;
+ sceneTarget.DeviceUI = device;
+ selectedAction?.Invoke(sceneTarget);
+ dialog.RemoveFromParent();
+ };
+ }
+ /// <summary>
+ /// 绐楀笜
+ /// </summary>
+ /// <param name="dialog"></param>
+ /// <param name="device"></param>
+ /// <param name="sceneTarget"></param>
+ private void SelectWindowCoveringDevice(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
+ {
+ var selectFL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(1169),
+ Height = Application.GetRealHeight(752),
+ };
+ dialog.AddChidren(selectFL);
+ //selectFL.Animate = Animate.DownToUp;
+
+ var titleBG = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138 * 2),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(titleBG);
+
+ var titleFL = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138),
+ };
+ selectFL.AddChidren(titleFL);
+
+ var line = new Button
+ {
+ Y = titleFL.Height - 1,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ titleFL.AddChidren(line);
+
+ var cancleBtn = new Button
+ {
+ X = Application.GetRealWidth(80),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.Cancel
+ };
+ titleFL.AddChidren(cancleBtn);
+
+ var deviceName = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 16,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
+ };
+ titleFL.AddChidren(deviceName);
+
+ var comfrimBtn = new Button
+ {
+ X = Application.GetRealWidth(800),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = R.MyInternationalizationString.Complete
+ };
+ titleFL.AddChidren(comfrimBtn);
+
+ var itemFL = new FrameLayout
+ {
+ Y = titleFL.Bottom,
+ Height = Application.GetRealHeight(613),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(itemFL);
+
+ var open = new SelectDeviceWithSeekBarRow(0, 60);
+ itemFL.AddChidren(open);
+ open.Init();
+ open.SetTitle(R.MyInternationalizationString.Open);
+ open.IsSelected = true;
+
+ var shut = new SelectSceneStatuRow(0, 60 + 348 + 30);
+ itemFL.AddChidren(shut);
+ shut.Init();
+ shut.hideLine(true);
+ shut.SetTitle(R.MyInternationalizationString.Shut);
+
+ open.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ };
+
+ shut.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ };
+
+ cancleBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.RemoveAll();
+ dialog.RemoveFromParent();
+ };
+
+ open.SeekBar.OnProgressChangedEvent += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ open.SetSeekBarTitle();
+ };
+
+ if (sceneTarget.TaskList.Count > 0)
+ {
+ if (sceneTarget.TaskList[0].Data1 == 1)
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ }
+ else
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ open.SetSeekBarProgress(sceneTarget.TaskList[0].Data2);
+ }
+ }
+
+ comfrimBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
+
+ int taskType = 6;
+ int data1 = 0;
+ int data2 = 0;
+
+ if (shut.IsSelected)
+ {
+ //鍏�
+ data1 = 1;
+ data2 = 0;
+ }
+ else
+ {
+ //鐧惧垎姣�
+ data1 = 5;
+ data2 = open.SeekBar.Progress;
+ }
+
+ var taskInfo = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = data1,
+ Data2 = data2
+ };
+ taskList.Add(taskInfo);
+
+ sceneTarget.TaskList = taskList;
+ sceneTarget.DeviceUI = device;
+ selectedAction?.Invoke(sceneTarget);
+ dialog.RemoveFromParent();
+ };
+ }
+ /// <summary>
+ /// 璋冨厜鐏�
+ /// </summary>
+ /// <param name="dialog"></param>
+ /// <param name="device"></param>
+ /// <param name="sceneTarget"></param>
+ private void SelectDimmableLight(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
+ {
+ var selectFL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(1169),
+ Height = Application.GetRealHeight(752),
+ };
+ dialog.AddChidren(selectFL);
+ //selectFL.Animate = Animate.DownToUp;
+
+ var titleBG = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138 * 2),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(titleBG);
+
+ var titleFL = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138),
+ };
+ selectFL.AddChidren(titleFL);
+
+ var line = new Button
+ {
+ Y = titleFL.Height - 1,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ titleFL.AddChidren(line);
+
+ var cancleBtn = new Button
+ {
+ X = Application.GetRealWidth(80),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.Cancel
+ };
+ titleFL.AddChidren(cancleBtn);
+
+ var deviceName = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 16,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
+ };
+ titleFL.AddChidren(deviceName);
+
+ var comfrimBtn = new Button
+ {
+ X = Application.GetRealWidth(800),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = R.MyInternationalizationString.Complete
+ };
+ titleFL.AddChidren(comfrimBtn);
+
+ var itemFL = new FrameLayout
+ {
+ Y = titleFL.Bottom,
+ Height = Application.GetRealHeight(613),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(itemFL);
+
+ var open = new SelectDeviceWithSeekBarRow(0, 60);
+ itemFL.AddChidren(open);
+ open.Init(254);
+ open.SetTitle(R.MyInternationalizationString.Open);
+ open.IsSelected = true;
+
+ var shut = new SelectSceneStatuRow(0, 60 + 348 + 30);
+ itemFL.AddChidren(shut);
+ shut.Init();
+ shut.hideLine(true);
+ shut.SetTitle(R.MyInternationalizationString.Shut);
+
+ open.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ };
+
+ shut.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ };
+
+ cancleBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.RemoveAll();
+ dialog.RemoveFromParent();
+ };
+
+ open.SeekBar.OnProgressChangedEvent += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ open.SetSeekBarTitle();
+ };
+
+ if (sceneTarget.TaskList.Count > 0)
+ {
+ if (sceneTarget.TaskList[0].Data1 == 0)
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ }
+ else
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ open.SetSeekBarProgress(sceneTarget.TaskList[0].Data1);
+ }
+ }
+
+ comfrimBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
+
+ int taskType = 3;
+ int data1 = 0;
+ int data2 = 0;
+
+ if (shut.IsSelected)
+ {
+ //鍏�
+ data1 = 0;
+ data2 = 0;
+ }
+ else
+ {
+ //鐧惧垎姣�
+ data1 = open.SeekBar.Progress;
+ data2 = 0;
+ }
+
+ var taskInfo = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = data1,
+ Data2 = data2
+ };
+ taskList.Add(taskInfo);
+
+ sceneTarget.TaskList = taskList;
+ sceneTarget.DeviceUI = device;
+ selectedAction?.Invoke(sceneTarget);
+ dialog.RemoveFromParent();
+ };
+ }
+ /// <summary>
+ /// 绌鸿皟
+ /// </summary>
+ /// <param name="dialog"></param>
+ /// <param name="device"></param>
+ /// <param name="sceneTarget"></param>
+ private void SelectThermostat(FrameLayout dialog, CommonDevice device, SceneTargetDeviceUI sceneTarget)
+ {
+ /// 娓╁害
+ int tempId = 0;
+ /// 妯″紡
+ int modelId = 0;
+ /// 椋庨��
+ int fanid = 0;
+
+ var selectFL = new FrameLayout
+ {
+ Y = Application.GetRealHeight(815),
+ Height = Application.GetRealHeight(1106),
+ };
+ dialog.AddChidren(selectFL);
+ //selectFL.Animate = Animate.DownToUp;
+
+ var titleBG = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138 * 2),
+ Radius = (uint)Application.GetRealHeight(58),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(titleBG);
+
+ var titleFL = new FrameLayout
+ {
+ Height = Application.GetRealHeight(138),
+ };
+ selectFL.AddChidren(titleFL);
+
+ var line = new Button
+ {
+ Y = titleFL.Height - 1,
+ Height = 1,
+ BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2
+ };
+ titleFL.AddChidren(line);
+
+ var cancleBtn = new Button
+ {
+ X = Application.GetRealWidth(80),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextGrayColor,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.Cancel
+ };
+ titleFL.AddChidren(cancleBtn);
+
+ var deviceName = new Button
+ {
+ Width = Application.GetRealWidth(600),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+ TextSize = 16,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device)
+ };
+ titleFL.AddChidren(deviceName);
+
+ var comfrimBtn = new Button
+ {
+ X = Application.GetRealWidth(800),
+ Width = Application.GetRealWidth(200),
+ TextColor = ZigbeeColor.Current.GXCTextSelectedColor2,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterRight,
+ TextID = R.MyInternationalizationString.Complete
+ };
+ titleFL.AddChidren(comfrimBtn);
+
+ var itemFL = new FrameLayout
+ {
+ Y = titleFL.Bottom,
+ Height = Application.GetRealHeight(968),
+ BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor
+ };
+ selectFL.AddChidren(itemFL);
+
+ var open = new SelectDeviceWithPickViewRow(0, 60);
+ itemFL.AddChidren(open);
+ open.Init();
+ open.SetTitle(R.MyInternationalizationString.Open);
+ open.IsSelected = true;
+
+ open.pickerView.OnSelectChangeEvent = (l1, l2, l3) =>
+ {
+ tempId = l1;
+ modelId = l2;
+ fanid = l3;
+ };
+
+ var shut = new SelectSceneStatuRow(0, 60 + 703 + 30);
+ itemFL.AddChidren(shut);
+ shut.Init();
+ shut.hideLine(true);
+ shut.SetTitle(R.MyInternationalizationString.Shut);
+
+ open.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+ };
+
+ shut.ClickButton.MouseUpEventHandler += (sender, e) =>
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ };
+
+ cancleBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ dialog.RemoveAll();
+ dialog.RemoveFromParent();
+ };
+
+ if (sceneTarget.TaskList.Count > 0)
+ {
+ if (sceneTarget.TaskList.Count == 1)
+ {
+ open.IsSelected = false;
+ shut.IsSelected = true;
+ }
+ else
+ {
+ open.IsSelected = true;
+ shut.IsSelected = false;
+
+ for (int i = 0; i < sceneTarget.TaskList.Count; i++)
+ {
+ var tasklist = sceneTarget.TaskList[i];
+ if (tasklist.Data1 == 6)
+ {
+ fanid = open.fanList.IndexOf(tasklist.Data2);
+ }
+ if (tasklist.Data1 == 3)
+ {
+ modelId = open.modeList.IndexOf(tasklist.Data2);
+ }
+ if (tasklist.Data1 == 4 || tasklist.Data1 == 5)
+ {
+ tempId = open.temperatureList.IndexOf(tasklist.Data2 / 100);
+ }
+ }
+ open.pickerView.setCurrentItems(tempId, modelId, fanid);
+ }
+ }
+
+ comfrimBtn.MouseUpEventHandler = (sender, e) =>
+ {
+
+ var taskList = new List<ZigBee.Device.Scene.TaskListInfo> { };
+
+ int taskType = 5;
+ int data1 = 0;
+ int data2 = 0;
+
+ if (shut.IsSelected)
+ {
+ //鍏�
+ data1 = 3;
+ data2 = 0;
+ var taskInfo = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = data1,
+ Data2 = data2
+ };
+ taskList.Add(taskInfo);
+ }
+ else
+ {
+ //fan
+ var taskInfo = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = 6,
+ Data2 = open.fanList[fanid]
+ };
+ taskList.Add(taskInfo);
+
+ //mode
+ var taskInfo2 = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = 3,
+ Data2 = open.modeList[modelId]
+ };
+ taskList.Add(taskInfo2);
+
+ //tem
+ if (open.modeList[modelId] == 4)
+ {
+ //heat
+ var taskInfo3 = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = 4,
+ Data2 = open.temperatureList[tempId] * 100
+ };
+ taskList.Add(taskInfo3);
+
+ }
+ else
+ {
+ //heat
+ var taskInfo3 = new ZigBee.Device.Scene.TaskListInfo
+ {
+ TaskType = taskType,
+ Data1 = 5,
+ Data2 = open.temperatureList[tempId] * 100
+ };
+ taskList.Add(taskInfo3);
+ }
+ }
+
+ sceneTarget.TaskList = taskList;
+ sceneTarget.DeviceUI = device;
+ selectedAction?.Invoke(sceneTarget);
+ dialog.RemoveFromParent();
+ };
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
index 188c42f..15e3c8f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs
@@ -71,7 +71,7 @@
bodyFrameLayout.AddChidren(scrollView);
int k = 0;
- for (int j = 0; j < 5; j++)
+ for (int j = 0; j < 7; j++)
{
var itemView = new FrameLayout()
{
@@ -86,7 +86,7 @@
Y=Application.GetRealHeight(58),
Width=Application.GetRealWidth(467),
Height=Application.GetRealHeight(311),
- ImagePath = $"SceneIcon/{k}.jpg",
+ ImagePath = $"SceneIcon/{k}.png",
Radius =(uint)Application.GetRealHeight(17)
};
itemView.AddChidren(icon);
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
index 227faea..7e3008e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectDelayTime.cs
@@ -154,25 +154,38 @@
};
timeFL.AddChidren(pickView);
- var minuList = new List<int> { };
- var secList = new List<int> { };
- var minuStrList = new List<string> { };
- var secStrList = new List<string> { };
- for (int i = 0; i < 60; i++)
+ //鍒�
+ string strMinute = Language.StringByID(R.MyInternationalizationString.uMinute);
+ //绉�
+ string strSecond = Language.StringByID(R.MyInternationalizationString.uSecond);
+ var listfirst = new List<string>();
+ var listSecond = new List<List<string>>();
+ for (int i = 0; i <= 59; i++)
{
- minuList.Add(i);
- minuStrList.Add($"{i}{Language.StringByID(R.MyInternationalizationString.Minute)}");
- secList.Add(i);
- secStrList.Add($"{i}{Language.StringByID(R.MyInternationalizationString.Second)}");
+ listfirst.Add(i.ToString().PadLeft(2, '0') + strMinute);
+ var listTemp = new List<string>();
+ for (int j = 0; j <= 59; j++)
+ {
+ if (i == 0 && j == 0)
+ {
+ continue;
+ }
+ listTemp.Add(j.ToString().PadLeft(2, '0') + strSecond);
+ }
+ listSecond.Add(listTemp);
}
-
- pickView.setNPicker(minuStrList, secStrList, null);
-
+ //鍔犱竴涓�60鍒嗛挓鍚�
+ listfirst.Add("60" + strMinute);
+ var listTemp2 = new List<string>() { "00" + strSecond };
+ listSecond.Add(listTemp2);
+
+ pickView.setPicker(listfirst, listSecond);
pickView.setCurrentItems(totalSecond / 60, totalSecond % 60, 0);
-
- pickView.OnSelectChangeEvent += (l1, l2, l3) =>
- {
- totalSecond = minuList[l1] * 60 + secList[l2];
+ pickView.OnSelectChangeEvent += (value1, value2, value3) =>
+ {
+ int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));
+ int second = Convert.ToInt32(listSecond[value1][value2].Substring(0, 2));
+ totalSecond = minute * 60 + second;
};
var confirmBtn = new CommonForm.CompleteButton(1656, 907, 127);
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs
index a094781..9ef77e5 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/DeviceInfoEditRow.cs
@@ -61,7 +61,7 @@
Y = Height - 1,
Width = Application.GetRealWidth(965),
Height = 1,
- BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor2,
+ BackgroundColor = UserCenter.UserCenterColor.Current.ButtomLine,
};
AddChidren(line);
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index a843033..fbe901a 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -2,12 +2,11 @@
using Shared.Common;
using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserCenter;
-using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.Device.CommonForm
{
- public class RoomView:FrameLayout, ZigBee.Common.IStatus
+ public class RoomView : FrameLayout
{
/// <summary>
/// Room
@@ -23,114 +22,14 @@
Button temperatureText;
Button humidityText;
-
- CommonDevice temperDevice;
-
- CommonDevice humidDevice;
-
- #region 鈼� 鎺ュ彛__________________________
-
- /// <summary>
- /// 璁惧鐘舵�佹洿鏂版帴鍙�
- /// <para>type锛氬鏋滀负 DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
- /// <para>type锛氬鏋滀负 IASInfoReport:RemoveDeviceRespon</para>
- /// <para>type锛氬鏋滀负 DeviceStatusReport:璁惧涓婃姤</para>
- /// <para>type锛氬鏋滀负 IASInfoReport:IAS瀹夐槻淇℃伅涓婃姤</para>
- /// <para>type锛氬鏋滀负 OnlineStatusChange: 璁惧鍦ㄧ嚎鐘舵�佹洿鏂�</para>
+ /// <summary>
+ /// 娓╁害璁惧
/// </summary>
- /// <param name="common">Common.</param>
- /// <param name="typeTag">Type tag.</param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- if (typeTag == "DeviceStatusReport")
- {
- Application.RunOnMainThread(() =>
- {
- try
- {
- if (common.DeviceStatusReport.AttriBute == null || common.DeviceStatusReport.AttriBute.Count == 0)
- {
- return;
- }
- //鏄惁涓哄綋鍓嶈澶�
- if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr) )
- {
- return;
- }
-
- //if (common.Type == DeviceType.TemperatureSensor)
- //{
- if (common.DeviceStatusReport.CluterID == 1026)
- {
- foreach (var data in common.DeviceStatusReport.AttriBute)
- {
- if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
- {
- if (data.AttriButeData == 0)
- {
- //0鈩�
- temperatureText.Text = "0.0鈩�";
- room.Temperatrue = 0;
- }
- else if (data.AttriButeData > 32767)
- {
- //璐熸暟(鐗规畩澶勭悊)
- string strValue = (data.AttriButeData - 65536).ToString();
- //灏忔暟鐐归渶瑕佷竴浣�
- strValue = strValue.Substring(0, strValue.Length - 1);
- temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- temperatureText.Text = strValue.Insert(strValue.Length - 1, ".") + "鈩�";
- room.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
- }
- }
- }
- else if (common.DeviceStatusReport.CluterID == 1029)
- {
- foreach (var data in common.DeviceStatusReport.AttriBute)
- {
- if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
- {
- if (data.AttriButeData == 0)
- {
- //0
- humidityText.Text = "--%";
- room.Humidity = 0;
- }
- else
- {
- //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
- string strValue = data.AttriButeData.ToString();
- strValue = strValue.Substring(0, strValue.Length - 1);
- humidityText.Text = strValue.Insert(strValue.Length - 1, ".") + "%";
- room.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
- }
- }
- }
- }
- //}
- }
- catch (Exception ex)
- {
- System.Console.WriteLine($"Error:{ex.Message}");
- }
- });
- }
- }
- #endregion
-
- public override void RemoveFromParent()
- {
- ZbGateway.StatusList.Remove(this);
- base.RemoveFromParent();
- }
+ private CommonDevice temperDevice = null;
+ /// <summary>
+ /// 婀垮害璁惧
+ /// </summary>
+ private CommonDevice humidDevice = null;
/// <summary>
/// RoomView
@@ -143,7 +42,6 @@
Y = Application.GetRealHeight(y);
Width = Application.GetRealWidth(717);
Height = Application.GetRealHeight(478);
- ZbGateway.StatusList.Add(this);
}
/// <summary>
@@ -201,7 +99,7 @@
Text = room.Name,
TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextSize = 10,
- TextAlignment=TextAlignment.CenterLeft,
+ TextAlignment = TextAlignment.CenterLeft,
IsBold = true
};
roomNameBackground.AddChidren(roomName);
@@ -235,7 +133,7 @@
Width = Application.GetRealWidth(120),
Text = "--鈩�",
TextSize = 14,
- TextAlignment=TextAlignment.CenterLeft
+ TextAlignment = TextAlignment.CenterLeft
};
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
@@ -305,6 +203,46 @@
this.Init(this.room);
};
};
+ //璁惧灞炴�т笂鎶�
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("RoomView" + this.room.Id, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ {
+ if (this.temperDevice != null)
+ {
+ //娓╁害璁惧
+ if (report.DeviceAddr == temperDevice.DeviceAddr && report.DeviceEpoint == temperDevice.DeviceEpoint)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (((TemperatureSensor)temperDevice).Temperatrue == 0)
+ {
+ temperatureText.Text = "0.0鈩�";
+ }
+ else
+ {
+ temperatureText.Text = ((TemperatureSensor)temperDevice).Temperatrue + "鈩�";
+ }
+ }, ShowErrorMode.NO);
+ }
+ }
+ if (this.humidDevice != null)
+ {
+ //婀垮害璁惧
+ if (report.DeviceAddr == humidDevice.DeviceAddr && report.DeviceEpoint == humidDevice.DeviceEpoint)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (((TemperatureSensor)temperDevice).Humidity == 0)
+ {
+ humidityText.Text = "--%";
+ }
+ else
+ {
+ humidityText.Text = ((TemperatureSensor)temperDevice).Humidity + "%";
+ }
+ }, ShowErrorMode.NO);
+ }
+ }
+ });
}
/// <summary>
@@ -313,6 +251,15 @@
public void HideName(bool statu)
{
roomNameBackground.Visible = roomTemperatureBackground.Visible = roomListBtn.Visible = !statu;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ HdlGatewayReceiveLogic.Current.RemoveEvent("RoomView" + this.room.Id);
+ base.RemoveFromParent();
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
index 9c161ec..0baf350 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
@@ -74,7 +74,7 @@
{
Y=Height-1,
Height=1,
- BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor4
+ BackgroundColor= UserCenter.UserCenterColor.Current.ButtomLine
};
AddChidren(line);
}
diff --git a/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs
index aeea43a..0515eab 100755
--- a/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Device/DeviceLogic/ReadDeviceAttributeLogic.cs
@@ -52,7 +52,7 @@
/// SendThermostatStatuComand
/// </summary>
/// <param name="device">璁惧</param>
- private void SendThermostatStatuComand(CommonDevice device)
+ public void SendThermostatStatuComand(CommonDevice device)
{
if (device == null)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
index 3d0f6c6..5e7bdea 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
@@ -18,13 +18,12 @@
}
public void Show()
{
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ #region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
- #region 鏈�涓嬮潰鐨勫竷灞�浠ｇ爜
+
var middle = new FrameLayout
{
Y = view.topRowLayout.Bottom,
@@ -37,41 +36,21 @@
timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
middle.AddChidren(timeView.FunFrameView());
- timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- TimeView();
- };
+
///璁惧
FunView functionView = new FunView();
functionView.funFrameLayout.Y = timeView.funFrameLayout.Bottom;
functionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
functionView.funnameBtn.TextID = MyInternationalizationString.device;
middle.AddChidren(functionView.FunFrameView());
- functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- var roomAndDeviceView = new RoomAndDeviceView();
- UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
- UserView.HomePage.Instance.PageIndex += 1;
- roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
- roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
- };
+
///瀹夐槻
FunView securityView = new FunView();
securityView.funFrameLayout.Y = functionView.funFrameLayout.Bottom;
securityView.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
securityView.funnameBtn.TextID = MyInternationalizationString.security;
middle.AddChidren(securityView.FunFrameView());
- securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- //CurtainPanel.ButtonSet buttonSet = new CurtainPanel.ButtonSet();
- //UserView.HomePage.Instance.AddChidren(buttonSet);
- //UserView.HomePage.Instance.PageIndex += 1;
- //buttonSet.Show();
- //return;
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- SecurityView(flMain, false);
- };
+
///鍦扮悊鍥存爮
FunView positionView = new FunView();
positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
@@ -80,15 +59,32 @@
positionView.funnameBtn.TextID = MyInternationalizationString.location;
positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
middle.AddChidren(positionView.FunFrameView());
+ #endregion
+
+ timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ TimeView();
+ };
+ functionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var roomAndDeviceView = new RoomAndDeviceView();
+ UserView.HomePage.Instance.AddChidren(roomAndDeviceView);
+ UserView.HomePage.Instance.PageIndex += 1;
+ roomAndDeviceView.IfType = LogicView.IfString.Condition_Logic;
+ roomAndDeviceView.Show(Language.StringByID(MyInternationalizationString.devicestate));
+ };
+ securityView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ SecurityView(flMain, false);
+ };
positionView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
LocationView(flMain, false);
};
-
- #endregion
-
}
/// <summary>
@@ -485,7 +481,7 @@
UserView.HomePage.Instance.AddChidren(logicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
logicCommunalPage.Show(() => { });
- }, strname, true, latitude, longitude, r);
+ }, strname, Language.StringByID(R.MyInternationalizationString.uSave), true, latitude, longitude, r);
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 203f4c8..9a25794 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -19,7 +19,7 @@
UserView.HomePage.Instance.ScrollEnabled = false;
CompleteView completeView = new CompleteView();
flMain.AddChidren(completeView.Show(1));
- completeView.Btntitle.Text = common.DeviceEpointName;
+ completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
if (!edit)
@@ -493,96 +493,12 @@
break;
case DeviceType.DoorLock:
{
- if (_if[0] == "condition")
- {
- flMain.RemoveFromParent();
- var memberList = new MemberList();
- UserView.HomePage.Instance.AddChidren(memberList);
- UserView.HomePage.Instance.PageIndex += 1;
- MemberList.edit = false;
- memberList.Show(common);
- }
- else
- {
- completeView.Btntitle.TextID = MyInternationalizationString.openmode;
- completeView.Show(2).AddChidren(openView.Show());
- completeView.Show(2).AddChidren(closeView.Show());
- openView.titleBtn.TextID = MyInternationalizationString.logicopen;
- closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
- //闂ㄩ攣鏁版嵁鐗规畩锛岃繘琛岀壒娈婂鐞�;
- if (actionsInfo.ContainsKey("LinkType"))
- {
- actionsInfo.Remove("LinkType");
- }
- //鐩爣闂ㄩ攣绫诲瀷鏄�8锛�
- actionsInfo.Add("LinkType", 8);
- if (actionsInfo.ContainsKey("TaskList"))
- {
- actionsInfo.Remove("TaskList");
- }
- if (actionsInfo.ContainsKey("Time"))
- {
- actionsInfo.Remove("Time");
- }
- closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- ///
- openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- openView.selectedIconBtn.Visible = true;
- closeView.selectedIconBtn.Visible = false;
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- SelectedDeviceStatus = "DoorLock";
- if (actionsInfo.ContainsKey("PassData"))
- {
- actionsInfo.Remove("PassData");
- }
- actionsInfo.Add("PassData", "055704010112");//闂ㄩ攣甯稿紑
- };
- ///鐐瑰嚮鍙栨秷浜嬩欢
- closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- openView.selectedIconBtn.Visible = false;
- closeView.selectedIconBtn.Visible = true;
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- SelectedDeviceStatus = "DoorLock";
- if (actionsInfo.ContainsKey("PassData"))
- {
- actionsInfo.Remove("PassData");
- }
- actionsInfo.Add("PassData", "055704010113");//闂ㄩ攣甯稿叧
-
- };
- if (edit)
- {
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
- {
- if (deviceinfo["LinkType"].ToString() == "8")
- {
- if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
- {
- if (deviceinfo["PassData"].ToString() == "055704010112")
- {//寮�鍚�
- openView.selectedIconBtn.Visible = true;
- closeView.selectedIconBtn.Visible = false;
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- }
- else
- {//鍏抽棴
- openView.selectedIconBtn.Visible = false;
- closeView.selectedIconBtn.Visible = true;
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
-
- }
- break;
- }
- }
- }
- }
- }
+ flMain.RemoveFromParent();
+ var memberList = new MemberList();
+ UserView.HomePage.Instance.AddChidren(memberList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ MemberList.edit = false;
+ memberList.Show(common);
}
break;
case DeviceType.TemperatureSensor:
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 76e071f..1efe402 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -17,13 +17,12 @@
public void Show()
{
-
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+
+ #region 鐣岄潰甯冨眬浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
middle = new VerticalRefreshLayout
{
Y = view.topRowLayout.Bottom,
@@ -31,6 +30,7 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ #endregion
middle.BeginHeaderRefreshingAction += () =>
{
//閲嶆柊鍒锋柊logic鍒楄〃
@@ -95,7 +95,6 @@
/// </summary>
public void UserAllView(string macport)
{
- middle.RemoveAll();
for (int i = 0; i < Send.LockList.Count; i++)
{
var user = Send.LockList[i];
@@ -103,218 +102,110 @@
{
continue;
}
- var userFramelayout = new FrameLayout
+
+ FunView userView = new FunView();
+ userView.iconBtn.Visible = false;
+ userView.funnameBtn.X = Application.GetRealWidth(81);
+ userView.funnameBtn.Text = user.UserName;
+ userView.funnextBtn.X = Application.GetRealWidth(1080 - 81 - 58);
+ userView.lineBtn.X = Application.GetRealWidth(81);
+ userView.lineBtn.Width = Application.GetRealWidth(1080 - 81 - 58);
+ if (Send.LockList.Count - 1 == i)
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(userFramelayout);
-
- var userRow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(1080 - 58 - 58),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(58),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- userFramelayout.AddChidren(userRow);
-
- var usernameBtn = new Button
- {
- Text = user.UserName,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(130),
- Tag = Send.LockList[i],
- TextSize = 14,
- };
- userRow.AddChidren(usernameBtn);
-
- var btntimeback = new Button
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- X = userRow.Width - Application.GetRealWidth(58),
- Gravity = Gravity.CenterVertical,
- };
- userRow.AddChidren(btntimeback);
-
-
- EventHandler<MouseEventArgs> userclick = (sender, e) =>
+ userView.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ userView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ }
+ middle.AddChidren(userView.FunFrameView());
+ userView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
SelectedUserID(user);
};
- usernameBtn.MouseUpEventHandler += userclick;
- btntimeback.MouseUpEventHandler += userclick;
- userFramelayout.MouseUpEventHandler += userclick;
- userRow.MouseUpEventHandler += userclick;
-
}
}
/// <summary>
/// 閫夋嫨鏌愪釜鐢ㄦ埛
/// </summary>
- /// <param name="membershipIfon">瑙﹀彂婧愬垪琛�</param>
- public void SelectedUserID(Send.MembershipIfon membershipIfon)
+ /// <param name="user">瑙﹀彂婧愬垪琛�</param>
+ public void SelectedUserID(Send.MembershipIfon user)
{
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
-
- flMain.MouseUpEventHandler += (sender1, e1) =>
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ VerticalScrolViewLayout vV = null;
+ int count = user.UserIdMode.Count;
+ if (count > 9)
{
- flMain.RemoveFromParent();
- };
-
-
-
- var lockcolorfra1 = new FrameLayout
- {
-
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(530),
- Y = Application.GetRealHeight(1920 - 530),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
- };
- flMain.AddChidren(lockcolorfra1);
- lockcolorfra1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ ///鍏冪礌瓒呭嚭9涓�;
+ count = 6;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ vV = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(140 + 20),
+ Height = Application.GetRealHeight(160 * count),
+ };
+ //娓呴櫎涔嬪墠鐨勬帶浠�;
+ vV.RemoveAll();
+ }
#region -------鍙栨秷 瀹屾垚
- var lockRow = new RowLayout
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+ this.AddChidren(flMain);
+ CompleteView completeView = new CompleteView();
+ flMain.AddChidren(completeView.Show(count));
+ completeView.Btntitle.Text = user.UserName;
+ EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- Height = Application.GetRealHeight(140),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
-
- };
- lockcolorfra1.AddChidren(lockRow);
- var Btncancel = new Button
- {
- TextID = MyInternationalizationString.cancel,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- X = Application.GetRealWidth(80),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = 14,
- };
- lockRow.AddChidren(Btncancel);
- Btncancel.MouseUpEventHandler += (sender16, e16) =>
- {
- flMain.RemoveFromParent();
UserView.HomePage.Instance.ScrollEnabled = true;
+ flMain.RemoveFromParent();
};
-
- var Btntitle = new Button
- {
- TextID = MyInternationalizationString.security,
- TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(320),
- TextAlignment = TextAlignment.Center,
- X = Btncancel.Right + Application.GetRealWidth(100),
- TextSize = 16,
- Text = membershipIfon.UserName,
- };
- lockRow.AddChidren(Btntitle);
- var Btncomplete = new Button
- {
- TextID = MyInternationalizationString.complete,
- TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterRight,
- X = Btntitle.Right + Application.GetRealWidth(100),
- TextSize = 14,
-
- };
- lockRow.AddChidren(Btncomplete);
+ flMain.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
#endregion
+ ///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
+ string userId = "";
+ string openMode = "";
+ string accountName = "";
+ string SelectedDeviceStatuscondition = "";
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * membershipIfon.UserIdMode.Count) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * membershipIfon.UserIdMode.Count) + 20 + 50);
- if (membershipIfon.UserIdMode.Count > 9)
+ for (int i = 0; i < user.UserIdMode.Count; i++)
{
- ///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
- }
- string SelectedLockStatus = "";
- ///瀹氫箟涓や釜鍙橀噺璁板綍閫変腑鐘舵�侊紱
- string attriButeId = "";
- string attriButeData2 = "";
- string modeName = "";
+ var userifon = user.UserIdMode[i];
- for (int j = 0; j < membershipIfon.UserIdMode.Count; j++)
- {
- var userIdmode = membershipIfon.UserIdMode[j];
- var doorlockfra = new FrameLayout
+ mFunView lockView = new mFunView();
+ if (user.UserIdMode.Count > 9)
{
- Height = Application.GetRealHeight(160),
- Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * j),
- };
- lockcolorfra1.AddChidren(doorlockfra);
-
- var doorlockRow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- doorlockfra.AddChidren(doorlockRow);
-
- var doorlockBtn = new Button
- {
- Width = Application.GetRealWidth(600),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
- Text = userIdmode.ModeName,
- TextSize = 14,
- };
- doorlockRow.AddChidren(doorlockBtn);
-
- var doorlockSelected = new Button
- {
- X = Application.GetRealWidth(860),
- Width = Application.GetMinRealAverage(60),
- Height = Application.GetMinRealAverage(60),
- UnSelectedImagePath = "ZigeeLogic/selected.png",
- Visible = false,
- Gravity = Gravity.CenterVertical,
-
- };
- doorlockRow.AddChidren(doorlockSelected);
- if ((membershipIfon.UserIdMode.Count - 1) == j)
- {
- doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
+ vV.AddChidren(lockView.Show());
}
- EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
+ else
{
- SelectedLockStatus = "DoorLock";
- selectedIcon.Visible = false;
- selectedIcon = doorlockSelected;
- doorlockSelected.Visible = true;
- //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- attriButeId = userIdmode.OpenMode.ToString();
- attriButeData2 = userIdmode.UserId;
- modeName = userIdmode.ModeName;
- };
- doorlockRow.MouseUpEventHandler += doorlockclick;
- doorlockBtn.MouseUpEventHandler += doorlockclick;
- doorlockSelected.MouseUpEventHandler += doorlockclick;
- doorlockfra.MouseUpEventHandler += doorlockclick;
+ lockView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160 * i);
+ completeView.Show(count).AddChidren(lockView.Show());
+ }
+ lockView.titleBtn.Text = userifon.ModeName;
- if (string.IsNullOrEmpty(doorlockBtn.Text))
+ if ((user.UserIdMode.Count - 1) == i)
+ {
+ lockView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ }
+ lockView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ SelectedDeviceStatuscondition = "DoorLock";
+ selectedIcon.Visible = false;
+ selectedIcon = lockView.selectedIconBtn;
+ lockView.selectedIconBtn.Visible = true;
+ userId = userifon.UserId;
+ openMode = userifon.OpenMode.ToString();
+ accountName = completeView.Btntitle.Text + lockView.titleBtn.Text;
+ };
+
+
+ if (string.IsNullOrEmpty(lockView.titleBtn.Text))
{
string strname = "";
- switch (userIdmode.OpenMode)
+ switch (userifon.OpenMode)
{
case 0:
{
@@ -332,25 +223,31 @@
}
break;
}
- doorlockBtn.Text = userIdmode.UserId + strname;
+ lockView.titleBtn.Text = userifon.UserId + strname;
}
- ///鏄剧ず涔嬪墠鐨勭姸鎬�
+
if (conditionsIndex != -1)
{
- var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
- if (s["AttriButeId"] == userIdmode.OpenMode.ToString() && s["AttriButeData2"] == userIdmode.UserId)
+
+ ///鏄剧ず涔嬪墠鐨勭姸鎬�
+ if (conditionsIndex != -1)
{
- selectedIcon.Visible = false;
- selectedIcon = doorlockSelected;
- doorlockSelected.Visible = true;
+ var s = Common.Logic.CurrentLogic.Conditions[conditionsIndex];
+ if (s["AttriButeId"] == userifon.OpenMode.ToString() && s["AttriButeData2"] == userifon.UserId)
+ {
+ selectedIcon.Visible = false;
+ selectedIcon = lockView.selectedIconBtn;
+ lockView.selectedIconBtn.Visible = true;
+ }
+
}
-
}
+
}
- Btncomplete.MouseUpEventHandler += (sender, e) =>
+ completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
var lockConditionsInfo = new Dictionary<string, string>();
lockConditionsInfo.Add("Type", "1");
@@ -358,15 +255,16 @@
lockConditionsInfo.Add("MacAddr", Send.CurrentDoorLock.DeviceAddr);
lockConditionsInfo.Add("Epoint", Send.CurrentDoorLock.DeviceEpoint.ToString());
lockConditionsInfo.Add("Cluster_ID", "64529");
- lockConditionsInfo.Add("AttriButeId", attriButeId);
- lockConditionsInfo.Add("AttriButeData2", attriButeData2);
+ lockConditionsInfo.Add("AttriButeId", openMode);
+ lockConditionsInfo.Add("AttriButeData2", userId);
lockConditionsInfo.Add("AttriButeData1", "2");
lockConditionsInfo.Add("Range", "0");
var accounts = new Dictionary<string, string>();
accounts.Add("Type", "1");
- accounts.Add("Account", membershipIfon.UserName + modeName);
- accounts.Add("UserId", attriButeData2);
- if (SelectedLockStatus != "")
+ accounts.Add("Account", Config.Instance.Guid);
+ accounts.Add("AccountName",accountName);
+ accounts.Add("UserId", userId);
+ if (SelectedDeviceStatuscondition != "")
{
if (conditionsIndex == -1)
{
@@ -386,24 +284,24 @@
}
}
}
- if (!addCondition)
- {
- Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
- }
for (int i = 0; i < Common.Logic.CurrentLogic.Accounts.Count; i++)
{
if (Common.Logic.CurrentLogic.Accounts[i]["Type"] == "1")
{
- if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == attriButeData2)
+ if (Common.Logic.CurrentLogic.Accounts[i]["UserId"] == userId)
{
addAccount = true;
break;
}
}
}
+ if (!addCondition)
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
+ Common.Logic.CurrentLogic.Conditions.Add(lockConditionsInfo);
+ }
if (!addAccount)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(accounts);
}
}
@@ -447,6 +345,6 @@
lockLogicCommunalPage.Show(() => { });
};
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 2a2bfc8..b09fc48 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -35,7 +35,6 @@
}
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- //UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
action();
RemoveFromParent();
};
@@ -140,7 +139,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.edit.Tag = i;
@@ -155,7 +154,7 @@
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ selecteddevice.selecetddevicestateBtn.Text = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
break;
}
}
@@ -184,10 +183,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var lockLogicCommunalPage = new LockLogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- lockLogicCommunalPage.Show(() => { });
+ selecteddevice.selecetdFrameLayout.RemoveFromParent();
+ //var lockLogicCommunalPage = new LockLogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //lockLogicCommunalPage.Show(() => { });
};
};
@@ -246,7 +246,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = deviceinof.DeviceEpointName;
+ name =LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
@@ -511,8 +511,8 @@
}
break;
case 2:
- {
- actiondevice.edit.Visible = false;//闅愯棌缂栬緫鎸夐挳(鍦烘櫙涓嶉渶瑕佺紪杈�)
+ {
+ actiondevice.edit.Visible = false;//闅愯棌缂栬緫鎸夐挳(鍦烘櫙涓嶉渶瑕佺紪杈�)
//鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
//鏈湴娌℃湁瀛樺湪;
@@ -588,10 +588,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Actions.Remove(actions);
- var lockLogicCommunalPage = new LockLogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- lockLogicCommunalPage.Show(() => { });
+ actiondevice.selecetdFrameLayout.RemoveFromParent();
+ //var lockLogicCommunalPage = new LockLogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //lockLogicCommunalPage.Show(() => { });
};
};
@@ -604,7 +605,6 @@
Method.Push(middle);
#endregion
-
saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
var name = logicTextBox.Text.Trim();
@@ -614,12 +614,12 @@
}
public void AddCondition(int value)
{
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
var addCondition = new AddCondition();
addCondition.conditionsIndex = value;
UserView.HomePage.Instance.AddChidren(addCondition);
UserView.HomePage.Instance.PageIndex += 1;
addCondition.Show();
-
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index bcc6ffa..0d0e1fc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -10,7 +10,7 @@
public LockLogicList()
{
- Tag = "Logic";
+ Tag = "LockListView";
}
VerticalRefreshLayout middle;
public void Show()
@@ -36,10 +36,9 @@
//new涓�涓柊閫昏緫瀵硅薄锛�
Common.Logic.CurrentLogic = new Common.Logic();
Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
- Common.Logic.CurrentLogic.LogicType = 1;
+ Common.Logic.CurrentLogic.LogicType = 1;//鏍囪鑷姩鍖栫被鍨�
Common.Logic.CurrentLogic.Relationship = 1;
- Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
- //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.linkageevent);
var lockLogicCommunalPage = new LockLogicCommunalPage();
UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
UserView.HomePage.Instance.PageIndex += 1;
@@ -80,7 +79,7 @@
for (int j = 0; j < listlogic.Count; j++)
{
var logic = listlogic[j];
- if (logic.LogicType == 0)
+ if (logic.LogicType != 1)
{
continue;
}
@@ -228,7 +227,6 @@
};
-
///鍒犻櫎
var del = new Button
{
@@ -239,18 +237,16 @@
logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.tip), Language.StringByID(MyInternationalizationString.doyouwanttodelete),
- Language.StringByID(MyInternationalizationString.cancel), Language.StringByID(MyInternationalizationString.confrim));
- alert.ResultEventHandler += (sender1, e1) =>
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
{
- if (e1)
- {
- Common.Logic.LockLogicList.Remove(logic);
- Automationview();
- Send.DelLogic(logic.LogicId);
- }
+ Common.Logic.LockLogicList.Remove(logic);
+ Automationview();
+ Send.DelLogic(logic.LogicId);
};
- alert.Show();
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index c4ab55c..b4578ef 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -115,7 +115,7 @@
X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Radius = (uint)Application.GetRealHeight(50),
+ Radius = (uint)Application.GetMinRealAverage(50),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
Tag = k,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 0cd43ec..15ccc6f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -280,7 +280,7 @@
case 1:
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
- name = deviceinof.DeviceEpointName;
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
@@ -450,7 +450,7 @@
{
if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
{
- state = Common.Logic.CurrentLogic.Accounts[a]["Account"];
+ state = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
break;
}
@@ -660,10 +660,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+ selecteddevice.selecetdFrameLayout.RemoveFromParent();
+ //var logicCommunalPage = new LogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //logicCommunalPage.Show(() => { });
};
};
@@ -724,7 +725,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = deviceinof.DeviceEpointName;
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
@@ -1151,11 +1152,12 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Actions.Remove(actions);
+ actiondevice.selecetdFrameLayout.RemoveFromParent();
// devicesFrameLayout.RemoveFromParent();
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
+ //var logicCommunalPage = new LogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //logicCommunalPage.Show(() => { });
};
};
@@ -1324,50 +1326,7 @@
};
}
- /// <summary>
- /// 闂幇寮忔彁绀烘鐨勬柟娉�
- /// </summary>
- /// <param name="tipText">鎻愮ず鍐呭</param>
- /// <param name="second">鍋滅暀鏃堕棿鍗曚綅涓簊</param>
- public void TipView(string tipText, int second = 1)
- {
-
- var frameLayout = new FrameLayout { BackgroundColor = 0x50000000 };
- this.AddChidren(frameLayout);
-
- var btn = new Button
- {
- Gravity = Gravity.Center,
- Text = tipText,
- BackgroundColor = 0xff1f1f1f,
- Width = Application.GetRealWidth(500),
- Height = Application.GetRealHeight(100),
- Radius = (uint)Application.GetRealHeight(50),
- };
- frameLayout.AddChidren(btn);
-
- var dateTime1 = DateTime.Now;
- new System.Threading.Thread(() =>
- {
- Application.RunOnMainThread(() =>
- {
- while (true)
- {
- if ((DateTime.Now - dateTime1).TotalMilliseconds > second * 1000)
- {
- //榛樿涓�绉掑叧闂�
- frameLayout.RemoveFromParent();
- break;
- }
- }
- });
- })
- { IsBackground = true }.Start();
-
- }
-
-
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
index 73b019c..48970d2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/Addview.cs
@@ -44,8 +44,8 @@
public Button switchBtn = new Button
{
- Width = Application.GetRealWidth(104),
- Height = Application.GetRealHeight(63),
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
UnSelectedImagePath = "ZigeeLogic/logicclose.png",
SelectedImagePath = "ZigeeLogic/logicopen.png",
X = Application.GetRealWidth(1080 - 58 - 104),
@@ -60,7 +60,7 @@
Width = Application.GetRealWidth(58 +58+40),
Height = Application.GetRealHeight(160),
- X = Application.GetRealWidth(1080 - 58 - 58),
+ X = Application.GetRealWidth(1080 - 58 - 58-40),
};
public FrameLayout AddDeviceView()
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index a4a3a77..0eeee0b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -22,66 +22,23 @@
{
common = commondevice;
editdeviceConditionsInfo = editdeviceConditions;
+
+ #region 鐣岄潰甯冨眬浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
- #region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
-
- var titleName = new Button
- {
- TextSize = 17,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(600),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.userlist,
- IsBold = true,
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
- #endregion
-
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.userlist;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
middle = new VerticalRefreshLayout
{
- Y = topRowLayout.Bottom,
+ Y = view.topRowLayout.Bottom,
Height = Application.GetRealHeight(1920 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
+ #endregion
+
middle.BeginHeaderRefreshingAction += () =>
{
//閲嶆柊鍒锋柊logic鍒楄〃
@@ -149,222 +106,115 @@
/// <param name="macport"></param>
public void UserList(string macport)
{
- foreach (var user in Send.LockList)
+ for (int i=0;i<Send.LockList.Count;i++)
{
+ var user = Send.LockList[i];
if (user.DoorLockMacPort != macport)
{
continue;
}
- var userFramelayout = new FrameLayout
+
+ FunView userView = new FunView();
+ userView.iconBtn.Visible = false;
+ userView.funnameBtn.X = Application.GetRealWidth(81);
+ userView.funnameBtn.Text = user.UserName;
+ userView.funnextBtn.X = Application.GetRealWidth(1080 - 81 - 58);
+ userView.lineBtn.X = Application.GetRealWidth(81);
+ userView.lineBtn.Width = Application.GetRealWidth(1080 - 81 - 58);
+ if (Send.LockList.Count - 1 == i)
{
- Height = Application.GetRealHeight(160),
- BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- // LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- };
- middle.AddChidren(userFramelayout);
-
-
- var userRow = new RowLayout
- {
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(1080 - 81 - 58),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(81),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- userFramelayout.AddChidren(userRow);
-
- var userBtn = new Button
- {
- Text = user.UserName,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextSize = 14,
- };
- userRow.AddChidren(userBtn);
-
- var userBack = new Button
- {
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealHeight(58),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- X = Application.GetRealWidth(1080 - 81 - 58 - 58),
- Gravity = Gravity.CenterVertical,
- };
- userRow.AddChidren(userBack);
-
- EventHandler<MouseEventArgs> useridclick = (sender, e) =>
- {
- User(user);
-
- };
- userBtn.MouseUpEventHandler += useridclick;
- userBack.MouseUpEventHandler += useridclick;
- userFramelayout.MouseUpEventHandler += useridclick;
- userRow.MouseUpEventHandler += useridclick;
+ userView.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ userView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+ }
+ middle.AddChidren(userView.FunFrameView());
+ userView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ User(user);
+ };
}
- }
+ }
/// <summary>
/// 褰撳墠鎴愬憳淇℃伅鐨勬柟娉�
/// </summary>
/// <param name="user"></param>
public void User(Send.MembershipIfon user)
{
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender1, e1) =>
+
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ VerticalScrolViewLayout vV = null;
+ int count = user.UserIdMode.Count;
+ if (count > 9)
{
- flMain.RemoveFromParent();
- };
-
- var lockcolorfra = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(lockcolorfra);
-
- var lockcolorfra1 = new FrameLayout
- {
-
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(530),
- Y = Application.GetRealHeight(1920 - 530),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
- };
- flMain.AddChidren(lockcolorfra1);
+ ///鍏冪礌瓒呭嚭9涓�;
+ count = 6;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ vV = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(140 + 20),
+ Height = Application.GetRealHeight(160 * count),
+ };
+ //娓呴櫎涔嬪墠鐨勬帶浠�;
+ vV.RemoveAll();
+ }
#region -------鍙栨秷 瀹屾垚
- var lockRow = new RowLayout
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+ this.AddChidren(flMain);
+ CompleteView completeView = new CompleteView();
+ flMain.AddChidren(completeView.Show(count));
+ completeView.Btntitle.Text = user.UserName;
+ EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- Height = Application.GetRealHeight(140),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- lockcolorfra1.AddChidren(lockRow);
- var Btncancel = new Button
- {
- TextID = MyInternationalizationString.cancel,
- TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- X = Application.GetRealWidth(80),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = 14,
- };
- lockRow.AddChidren(Btncancel);
- Btncancel.MouseUpEventHandler += (sender16, e16) =>
- {
- flMain.RemoveFromParent();
UserView.HomePage.Instance.ScrollEnabled = true;
+ flMain.RemoveFromParent();
};
+ flMain.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
- var Btntitle = new Button
- {
- TextID = MyInternationalizationString.security,
- TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(320),
- TextAlignment = TextAlignment.Center,
- X = Btncancel.Right + Application.GetRealWidth(100),
- TextSize = 16,
- Text = user.UserName,
- };
- lockRow.AddChidren(Btntitle);
- var Btncomplete = new Button
- {
- TextID = MyInternationalizationString.complete,
- TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
- Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterRight,
- X = Btntitle.Right + Application.GetRealWidth(100),
- TextSize = 14,
-
- };
- lockRow.AddChidren(Btncomplete);
#endregion
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
string userId = "";
string openMode = "";
- string accountname = "";
+ string accountName = "";
string SelectedDeviceStatuscondition = "";
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
- if (user.UserIdMode.Count > 9)
- {
- ///鍏冪礌瓒呭嚭10涓紝鏆傛椂榛樿鏄剧ず10;
- lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
- lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
- }
-
for (int i = 0; i < user.UserIdMode.Count; i++)
{
var userifon = user.UserIdMode[i];
- var doorlockfra = new FrameLayout
- {
- Height = Application.GetRealHeight(160),
- Y = lockRow.Bottom + Application.GetRealHeight(20 + 160 * i),
- };
- lockcolorfra1.AddChidren(doorlockfra);
- var doorlockRow = new RowLayout
+ mFunView lockView = new mFunView();
+ if (user.UserIdMode.Count > 9)
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(920),
- Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(80),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
- doorlockfra.AddChidren(doorlockRow);
-
- var doorlockBtn = new Button
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
+ vV.AddChidren(lockView.Show());
+ }
+ else
{
- Width = Application.GetRealWidth(600),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
- Text = userifon.ModeName,
- TextSize = 14,
- };
- doorlockRow.AddChidren(doorlockBtn);
+ lockView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160 * i);
+ completeView.Show(count).AddChidren(lockView.Show());
+ }
+ lockView.titleBtn.Text = userifon.ModeName;
- var doorlockSelected = new Button
- {
- X = Application.GetRealWidth(860),
- Width = Application.GetMinRealAverage(60),
- Height = Application.GetMinRealAverage(60),
- UnSelectedImagePath = "ZigeeLogic/selected.png",
- Visible = false,
- Gravity = Gravity.CenterVertical,
-
- };
- doorlockRow.AddChidren(doorlockSelected);
if ((user.UserIdMode.Count - 1) == i)
{
- doorlockRow.LineColor = ZigbeeColor.Current.LogicBackgroundColor;
+ lockView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
}
- EventHandler<MouseEventArgs> doorlockclick = (sender2, e2) =>
- {
- SelectedDeviceStatuscondition = "DoorLock";
- selectedIcon.Visible = false;
- selectedIcon = doorlockSelected;
- doorlockSelected.Visible = true;
- userId = userifon.UserId;
- openMode = userifon.OpenMode.ToString();
- accountname = Btntitle.Text + doorlockBtn.Text;
- //doorlockBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- };
- doorlockRow.MouseUpEventHandler += doorlockclick;
- doorlockBtn.MouseUpEventHandler += doorlockclick;
- doorlockSelected.MouseUpEventHandler += doorlockclick;
- doorlockfra.MouseUpEventHandler += doorlockclick;
+ lockView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ SelectedDeviceStatuscondition = "DoorLock";
+ selectedIcon.Visible = false;
+ selectedIcon = lockView.selectedIconBtn;
+ lockView.selectedIconBtn.Visible = true;
+ userId = userifon.UserId;
+ openMode = userifon.OpenMode.ToString();
+ accountName = completeView.Btntitle.Text + lockView.titleBtn.Text;
+ };
- if (string.IsNullOrEmpty(doorlockBtn.Text))
+
+ if (string.IsNullOrEmpty(lockView.titleBtn.Text))
{
string strname = "";
switch (userifon.OpenMode)
@@ -385,7 +235,7 @@
}
break;
}
- doorlockBtn.Text = userifon.UserId + strname;
+ lockView.titleBtn.Text = userifon.UserId + strname;
}
if (edit && editdeviceConditionsInfo != null)
@@ -394,15 +244,17 @@
if (editdeviceConditionsInfo["AttriButeData2"] == userifon.UserId.ToString())
{
selectedIcon.Visible = false;
- selectedIcon = doorlockSelected;
- doorlockSelected.Visible = true;
+ selectedIcon = lockView.selectedIconBtn;
+ lockView.selectedIconBtn.Visible = true;
}
}
}
- Btncomplete.MouseUpEventHandler += (sender3, e3) =>
+
+ completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
+
string userIdstr = "", openModestr = "";
var deviceConditionsInfo = new Dictionary<string, string>();
var userdictionary = new Dictionary<string, string>();
@@ -415,7 +267,8 @@
deviceConditionsInfo.Add("Range", "0");
deviceConditionsInfo.Add("AttriButeId", openMode);
deviceConditionsInfo.Add("AttriButeData2", userId);
- userdictionary.Add("Account", accountname);
+ userdictionary.Add("Account", Config.Instance.Guid);
+ userdictionary.Add("AccountName", accountName);
userdictionary.Add("Type", "1");
userdictionary.Add("UserId", userId);
if (edit)
@@ -462,11 +315,11 @@
}
}
if (!addConditions)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Conditions.Add(deviceConditionsInfo);
}
if (!addAccounts)
- {
+ {//娌℃湁瀛樺湪鏁版嵁鏂板姞
Common.Logic.CurrentLogic.Accounts.Add(userdictionary);
}
}
@@ -490,7 +343,7 @@
};
-
}
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index e0e8a72..3d3bdf5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -97,40 +97,47 @@
{
List<string> devicetypelist = new List<string>();
devicetypelist.Clear();
+
var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput);
if (lightjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
}
- var iASZonejosn = devicelist.Find((device) => device.Type == DeviceType.IASZone || device.Type == DeviceType.TemperatureSensor);
- if (iASZonejosn != null)
- {
- devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
- }
- var onOffSwitchjson = devicelist.Find((device) => device.Type == DeviceType.OnOffSwitch);
- if (onOffSwitchjson != null)
- {
- devicetypelist.Add(Language.StringByID(MyInternationalizationString.OnOffSwitch));
- }
- var doorLock = devicelist.Find((device) => device.Type == DeviceType.DoorLock);
- if (doorLock != null)
- {
- devicetypelist.Add(Language.StringByID(MyInternationalizationString.doorLock));
- }
+
var curtainjosn = devicelist.Find((device) => device.Type == DeviceType.WindowCoveringDevice);
if (curtainjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
}
+
var ac = devicelist.Find((device) => device.Type == DeviceType.Thermostat);
if (ac != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.AC));
}
+
+ var onOffSwitchjson = devicelist.Find((device) => device.Type == DeviceType.OnOffSwitch);
+ if (onOffSwitchjson != null)
+ {
+ devicetypelist.Add(Language.StringByID(MyInternationalizationString.OnOffSwitch));
+ }
+
+ var doorLock = devicelist.Find((device) => device.Type == DeviceType.DoorLock);
+ if (doorLock != null)
+ {
+ devicetypelist.Add(Language.StringByID(MyInternationalizationString.doorLock));
+ }
+
var airSwitch = devicelist.Find((device) => device.Type == DeviceType.AirSwitch);
if (airSwitch != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Airswitch));
+ }
+
+ var iASZonejosn = devicelist.Find((device) => device.Type == DeviceType.IASZone || device.Type == DeviceType.TemperatureSensor);
+ if (iASZonejosn != null)
+ {
+ devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
}
return devicetypelist;
@@ -334,7 +341,7 @@
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
///闂ㄩ攣鐗规畩
- deviceTypeList.Add(DeviceType.DoorLock);
+ // deviceTypeList.Add(DeviceType.DoorLock);
}
break;
case "condition_mould":
@@ -356,7 +363,7 @@
deviceTypeList.Add(DeviceType.Thermostat);
deviceTypeList.Add(DeviceType.AirSwitch);
///闂ㄩ攣鐗规畩
- deviceTypeList.Add(DeviceType.DoorLock);
+ // deviceTypeList.Add(DeviceType.DoorLock);
}
break;
@@ -654,6 +661,7 @@
custompushview.iconBtn.Visible = true;
custompushview.iconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
custompushview.titleBtn.TextID = MyInternationalizationString.custompush;
+ custompushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
middle.AddChidren(custompushview.AddDeviceView());
EventHandler<MouseEventArgs> customclick = (sender, e) =>
@@ -674,6 +682,7 @@
LogicView.IfString.Tag = true;
custompushview.frameLayout.Height = Application.GetRealHeight(160);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 1;
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
}
else
@@ -681,6 +690,7 @@
LogicView.IfString.Tag = false;
custompushview.frameLayout.Height = Application.GetRealHeight(0);
Common.Logic.CurrentLogic.LogicIsCustomPushText = 0;
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
}
Send.Zj(LogicView.IfString.Tag, Common.Logic.CurrentLogic);
};
@@ -690,12 +700,14 @@
LogicView.IfString.Tag = false;
pushview.switchBtn.IsSelected = false;
custompushview.frameLayout.Height = Application.GetRealHeight(0);
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
}
else
{
LogicView.IfString.Tag = true;
pushview.switchBtn.IsSelected = true;
custompushview.frameLayout.Height = Application.GetRealHeight(160);
+ pushview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor;
}
}
/// <summary>
@@ -707,6 +719,16 @@
/// <param name="CurrentLogic">褰撳墠閫昏緫</param>
public async static void SaveLogic(string if_logic, string name, bool tag, Common.Logic CurrentLogic)
{
+
+ if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.addnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
+
if (string.IsNullOrEmpty(name))
{
var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
@@ -735,7 +757,17 @@
{
succeed = true;
CurrentLogic.LogicId = logicifon.LogicId;
- Common.Logic.LogicList.Add(CurrentLogic);
+ if (LogicView.IfString._LockLogic == if_logic)
+ {
+ //闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+ Common.Logic.LockLogicList.Add(CurrentLogic);
+ }
+ else
+ {
+ //鑷姩鍖栭�昏緫鍒楄〃
+ Common.Logic.LogicList.Add(CurrentLogic);
+
+ }
if (tag)
{
Send.Zj(tag, CurrentLogic);
@@ -760,13 +792,29 @@
//TipView("娣诲姞鑷姩鍖栧け璐�");
//return;
}
- UserView.HomePage.Instance.RemoveViewByTag("Logic");
+
+
if (LogicView.IfString._Logic == if_logic)
{
- Category.Category.instance?.RefreshBodyView();
+ UserView.HomePage.Instance.RemoveViewByTag("Logic");
+ if (CurrentLogic.LogicType == 0)
+ {
+ //鍙埛鏂板垎绫讳笂涓嬫粦鍔╲iew锛�
+ Phone.Category.CategoryMainForm.instance?.RefreshBodyView();
+ // Category.Category.instance?.RefreshBodyView();
+ }
+ else if (CurrentLogic.LogicType == 2)
+ {
+ //鍒锋柊鏁翠釜鍒嗙被锛�
+ //闂ㄩ攣甯稿紑妯″紡鐗规畩;
+ UserView.UserPage.Instance.ShowCategoryAutoListForm();
+
+ }
}
else if (LogicView.IfString._LockLogic == if_logic)
{
+ UserView.HomePage.Instance.RemoveViewByTag("Logic");//绉婚櫎鎵�鏈夋爣璁癓ogic鐣岄潰
+ UserView.HomePage.Instance.RemoveViewByTag("LockListView");//绉婚櫎鎵�鏈夋爣璁癓ockListView鐣岄潰
var doorLockLogicList = new DoorLockLogic.LockLogicList();
UserView.HomePage.Instance.AddChidren(doorLockLogicList);
UserView.HomePage.Instance.PageIndex += 1;
@@ -786,5 +834,7 @@
UserView.HomePage.Instance.PageIndex += 1;
deviceTarget.Show(str1, str2);
}
+
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
new file mode 100755
index 0000000..3d58db9
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/OneLogic.cs
@@ -0,0 +1,437 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared;
+using Shared.Common;
+using Shared.Phone;
+using Shared.Phone.Device.Logic.LogicView;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+ public class OneLogic : FrameLayout
+ {
+
+ public OneLogic()
+ {
+ UserView.HomePage.Instance.RemoveViewByTag("Logic");
+ Tag = "Logic";
+ }
+ /// <summary>
+ /// S-one闂ㄩ攣鐗规畩鐣岄潰
+ /// </summary>
+ /// <param name="Yes"></param>
+ public void Show(bool Yes)
+ {
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ #region View甯冨眬浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ if (Common.Logic.CurrentLogic.LogicId != 0)
+ {
+ view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.editautomation);
+ }
+ else
+ {
+ view.toptitleNameBtn.Text = Language.StringByID(MyInternationalizationString.newautomation);
+ }
+ view.clickBtn.MouseDownEventHandler += (sender, e) =>
+ {
+ // UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
+ RemoveFromParent();
+ };
+ var middle = new VerticalScrolViewLayout
+ {
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(1920 - 184 - 180),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ this.AddChidren(middle);
+ var saveBtn = new SaveView();
+ saveBtn.frameLayout.Y = middle.Bottom;
+ saveBtn.frameLayout.Height = Application.GetRealHeight(180);
+ this.AddChidren(saveBtn.Show());
+ #endregion
+
+ #region -----鑷姩鍖栧悕绉� 璁剧疆鍚嶇О-----
+ var logicnamefl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(130),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ };
+ middle.AddChidren(logicnamefl);
+
+ var text = new Button
+ {
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(60),
+ X = Application.GetRealWidth(58),
+ TextAlignment = TextAlignment.CenterLeft,
+ //Text = "鑷姩鍖栧悕绉�",
+ TextID = MyInternationalizationString.automationname,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ Y = Application.GetRealHeight(35),
+ TextSize = 15,
+ };
+ logicnamefl.AddChidren(text);
+
+ var logicTextBox = new EditText
+ {
+ Y = Application.GetRealHeight(35),
+ Width = Application.GetRealWidth(1080 - 58 - 300),
+ Height = Application.GetRealHeight(60),
+ X = text.Right,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 14,
+ Text = Common.Logic.CurrentLogic.LogicName,
+ //TextID=MyInternationalizationString.automation1,
+ };
+ logicnamefl.AddChidren(logicTextBox);
+ if (Yes)
+ {
+ //S-one闂ㄩ攣鐗规畩,涓嶈兘鍐嶆缂栬緫;
+ logicTextBox.Enable = false;
+ }
+ var fraline = new FrameLayout
+ {
+ Height = Application.GetRealHeight(30),
+ };
+ middle.AddChidren(fraline);
+ #endregion
+
+ #region -----鏄剧ず閫昏緫鏉′欢-----
+ Addview addconditionview = new Addview();
+ addconditionview.iconBtn.Visible = false;
+ addconditionview.titleBtn.TextID = MyInternationalizationString.ifcondition;
+ middle.AddChidren(addconditionview.AddDeviceView());
+
+ ///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
+ for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
+ {
+ SelectedDeviceView selecteddevice = new SelectedDeviceView();
+ selecteddevice.Show(middle);
+ if (!Yes)
+ {
+ //S-one闂ㄩ攣鐗规畩,涓嶈兘鍐嶆缂栬緫;
+ selecteddevice.stateRow.AddRightView(selecteddevice.edit);
+ }
+ var Type = int.Parse(Common.Logic.CurrentLogic.Conditions[i]["Type"]);
+ var conditions = Common.Logic.CurrentLogic.Conditions[i];
+ switch (Type)
+ {
+ case 5:
+ {
+
+ selecteddevice.ordinaryBtn.Visible = true;
+ selecteddevice.iconBtn.UnSelectedImagePath = "ZigeeLogic/timeparagraph.png";
+ string s1 = "", s2 = "";
+ s1 = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
+ s2 = conditions["StopMin"].Length < 2 ? "0" + conditions["StopMin"] : conditions["StopMin"];
+ ///鏄剧ず鏃堕棿
+ selecteddevice.ordinaryBtn.Text = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2;
+ selecteddevice.selecetddevicestateBtn.Text = Language.StringByID(MyInternationalizationString.timeframe);
+ }
+ break;
+
+ }
+ if (Yes)
+ {
+ //鏀瑰彉瀛椾綋棰滆壊;
+ selecteddevice.ordinaryBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ selecteddevice.selecetddevicestateBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ }
+ ///缂栬緫
+ selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
+ {
+ if (Type==5) {
+ var timePage = new TimePage();
+ UserView.HomePage.Instance.AddChidren(timePage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ timePage.str1 = conditions["StartHour"] + ":" + conditions["StartMin"] + "-" + conditions["StopHour"] + ":" + conditions["StopMin"];
+ timePage.IsEditor = true;
+ timePage.Show();
+ }
+ };
+
+ }
+ #endregion
+
+ #region ----鏄剧ず鎵ц鐩爣----
+ Addview addactionview = new Addview();
+ addactionview.iconBtn.Visible = false;
+ addactionview.titleBtn.TextID = MyInternationalizationString.execute;
+ middle.AddChidren(addactionview.AddDeviceView());
+
+ for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
+ {
+ SelectedDeviceView actiondevice = new SelectedDeviceView();
+ actiondevice.Show(middle);
+ if (!Yes)
+ {
+ //S-one闂ㄩ攣鐗规畩,涓嶈兘鍐嶆缂栬緫;
+ actiondevice.stateRow.AddRightView(actiondevice.edit);
+ }
+
+
+ var linkType = int.Parse(Common.Logic.CurrentLogic.Actions[i]["LinkType"].ToString());
+ var actions = Common.Logic.CurrentLogic.Actions[i];
+
+ switch (linkType)
+ {
+ case 8:
+ {
+
+ var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
+ if (deviceinof == null)
+ {
+ deviceinof = new CommonDevice();
+ }
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ actiondevice.deviceNameBtn.Visible = true;
+ actiondevice.regionNameBtn.Visible = true;
+ Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
+
+ if (Yes) {
+ //鏀瑰彉瀛椾綋棰滆壊;
+ actiondevice.deviceNameBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ actiondevice.regionNameBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ actiondevice.selecetddevicestateBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ }
+ switch (deviceinof.Type)
+ {
+ case DeviceType.DoorLock:
+ {
+ //闂ㄩ攣鐗规畩
+ actiondevice.iconBtn.UnSelectedImagePath = "ZigeeLogic/doorlock.png";
+ if (actions["PassData"].ToString() == "055704010112")
+ {
+ actiondevice.selecetddevicestateBtn.Text = Language.StringByID(MyInternationalizationString.logicopen);
+ }
+ else
+ {
+ actiondevice.selecetddevicestateBtn.Text = Language.StringByID(MyInternationalizationString.logicclose);
+ }
+ }
+ break;
+ }
+
+ }
+ break;
+
+ }
+
+ ///缂栬緫
+ actiondevice.edit.MouseUpEventHandler += (sender, e) =>
+ {
+ switch (linkType)
+ {
+ case 8:
+ {
+ var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
+ if (deviceinof == null)
+ {
+ deviceinof = new CommonDevice();
+ }
+ DevcieView(deviceinof, actiondevice.selecetddevicestateBtn);
+ };
+ break;
+
+
+ }
+ };
+
+ }
+ #endregion
+
+ #region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
+
+ var fraline1 = new FrameLayout
+ {
+ Height = Application.GetRealHeight(30),
+ };
+ middle.AddChidren(fraline1);
+
+ Addview weekview = new Addview();
+ weekview.iconBtn.Visible = true;
+ weekview.iconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ weekview.titleBtn.TextID = MyInternationalizationString.setupcycle;
+ middle.AddChidren(weekview.AddDeviceView());
+ var weekBtn = new Button
+ {
+ Width = Application.GetRealWidth(595),
+ Height = Application.GetRealHeight(60),
+ TextAlignment = TextAlignment.CenterRight,
+ //Text = "姣忓ぉ",
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextID = MyInternationalizationString.everyday,
+ Y = Application.GetRealHeight(35 + 30),
+ X = weekview.titleBtn.Right,
+ TextSize = 14,
+ };
+ weekview.frameLayout.AddChidren(weekBtn);
+ Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic);
+ EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
+ {
+ if (Yes) {
+ //S-one闂ㄩ攣鐗规畩,涓嶈兘鍐嶆缂栬緫;
+ return;
+ }
+ var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
+ UserView.HomePage.Instance.AddChidren(cycle);
+ UserView.HomePage.Instance.PageIndex += 1;
+ cycle.Show();
+ };
+ weekBtn.MouseUpEventHandler += cycleclick;
+ weekview.clickBtn.MouseUpEventHandler += cycleclick;
+ if (Yes)
+ {
+ //鏀瑰彉瀛椾綋棰滆壊;
+ weekBtn.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ logicTextBox.TextColor = ZigbeeColor.Current.LogicBtnCancelColor;
+ }
+ #endregion
+
+ #region ----鎺ㄩ�佽缃�----
+ Method.Push(middle);
+ #endregion
+
+ saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (Yes)
+ {
+ //S-one闂ㄩ攣鐗规畩,涓嶈兘鍐嶆缂栬緫;
+ RemoveFromParent();
+ return;
+ }
+ var name = logicTextBox.Text.Trim();
+ Method.SaveLogic(IfString._Logic, name, IfString.Tag, Common.Logic.CurrentLogic);
+ };
+
+
+
+ }
+ /// <summary>
+ /// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠舵垨鑰呯洰鏍囩殑瑙嗗浘鏂规硶
+ /// </summary>
+ /// <param name="common">Common.</param>
+ void DevcieView( CommonDevice common,Button button)
+ {
+ #region -------鐣岄潰甯冨眬閮ㄥ垎
+ //涓嶈褰撳墠鐣岄潰婊戝姩
+ UserView.HomePage.Instance.ScrollEnabled = false;
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ CompleteView completeView = new CompleteView();
+ flMain.AddChidren(completeView.Show(1));
+ // completeView.Btntitle.Text =LocalDevice.Current.GetDeviceEpointName(common);
+ completeView.Btntitle.TextID = MyInternationalizationString.openmode;
+ EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
+ {
+ flMain.RemoveFromParent();
+ };
+ flMain.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
+
+ mFunView openView = new mFunView();
+ openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+ completeView.Show(2).AddChidren(openView.Show());
+ openView.titleBtn.TextID = MyInternationalizationString.logicopen;
+
+ mFunView closeView = new mFunView();
+ closeView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160);
+ closeView.frameLayout.Y = openView.frameLayout.Bottom;
+ completeView.Show(2).AddChidren(closeView.Show());
+ closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ #endregion
+
+
+ Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 8);
+ actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+ actionsInfo.Add("Epoint", common.DeviceEpoint);
+ string SelectedDeviceStatus = "";
+ switch (common.Type)
+ {
+ case DeviceType.DoorLock:
+ {
+ openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ SelectedDeviceStatus = Language.StringByID(MyInternationalizationString.logicopen);
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010112");//闂ㄩ攣甯稿紑
+ };
+ ///鐐瑰嚮鍙栨秷浜嬩欢
+ closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ SelectedDeviceStatus = Language.StringByID(MyInternationalizationString.logicclose);
+ if (actionsInfo.ContainsKey("PassData"))
+ {
+ actionsInfo.Remove("PassData");
+ }
+ actionsInfo.Add("PassData", "055704010113");//闂ㄩ攣甯稿叧
+
+ };
+
+ foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ {
+ if (deviceinfo["LinkType"].ToString() == "8")
+ {
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ if (deviceinfo["PassData"].ToString() == "055704010112")
+ {//寮�鍚�
+ SelectedDeviceStatus = Language.StringByID(MyInternationalizationString.logicopen);
+ openView.selectedIconBtn.Visible = true;
+ closeView.selectedIconBtn.Visible = false;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ }
+ else
+ {//鍏抽棴
+ SelectedDeviceStatus = Language.StringByID(MyInternationalizationString.logicclose);
+ openView.selectedIconBtn.Visible = false;
+ closeView.selectedIconBtn.Visible = true;
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+
+ }
+ break;
+ }
+ }
+ }
+
+
+ }
+ break;
+
+ }
+
+
+ completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
+ {
+ if (!string.IsNullOrEmpty(SelectedDeviceStatus))
+ {
+ LogicIfon.AddDoorLockActions(common, actionsInfo);
+ button.Text = SelectedDeviceStatus;
+ }
+
+ flMain.RemoveFromParent();
+
+ };
+ }
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index c4d535f..5b5bf36 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -313,8 +313,8 @@
var backgroundColor = new Button
{
- Width = Application.GetRealWidth(156),
- Height = Application.GetRealHeight(180),
+ Width = Application.GetMinRealAverage(156),
+ Height = Application.GetMinRealAverage(180),
X = Application.GetRealWidth(10),
UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index dbca6ba..8c89431 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -54,11 +54,16 @@
return logicIdList;
}
mainGateWay.GwResDataAction += action;
-
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2004 } };
- var jObjectdata1 = new JObject { { "LogicType", LogicType } };
- jObject.Add("Data", jObjectdata1);
- mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
+ try
+ {
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2004 } };
+ var jObjectdata1 = new JObject { { "LogicType", LogicType } };
+ jObject.Add("Data", jObjectdata1);
+ mainGateWay?.Send("Logic/GetLogicList", jObject.ToString());
+ }
+ catch(Exception e) {
+ var d = e.Message;
+ }
//await System.Threading.Tasks.Task.Run(async () =>
//{
var dateTime = DateTime.Now;
@@ -260,7 +265,7 @@
try
{
-
+
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 2000 } };
var selectMonthList = new JArray { };
foreach (var intvalue in logic.TimeAttribute.SelectMonDate)
@@ -292,6 +297,7 @@
["RemindTime"] = int.Parse(dictionary["RemindTime"]),
["EnDelay"] = int.Parse(dictionary["EnDelay"]),
["DelayTime"] = int.Parse(dictionary["DelayTime"]),
+ ["DoorLockOpenDelayTime"] = int.Parse(dictionary["DoorLockOpenDelayTime"]),
};
if (dictionary["DateType"].ToString() == "0")
{
@@ -490,6 +496,7 @@
["Type"] = int.Parse(dictionary["Type"]),
["Account"] = dictionary["Account"],
["UserId"] = dictionary["UserId"],
+ ["AccountName"] = dictionary["AccountName"],
};
accounts.Add(accounts1);
@@ -513,6 +520,7 @@
}
}
+
var data = new JObject{
{ "LogicId",logic.LogicId},
{ "IsEnable", logic.IsEnable} ,
@@ -707,7 +715,7 @@
}
catch { }
var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < 8 * 1000)
+ while ((DateTime.Now - dateTime).TotalMilliseconds < 5* 1000)
{
await System.Threading.Tasks.Task.Delay(100);
if (sum == listLogic.Count)
@@ -927,7 +935,7 @@
{
string s = null;
var str = await WebClientAsync(0, CommonPage.RequestHttpsHost + "/App/GetHomePager");//涓嶅悓鍖哄煙鍩熷悕鍓嶇紑涓嶄竴鏍�
- // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
+
var jObject = JObject.Parse(str);
if (jObject == null || jObject["StateCode"].ToString() != "Success")
{
@@ -952,13 +960,11 @@
residential.IsOtherAccountCtrl = true;
residential.doorlockmac = doorlockMac;
residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
- //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
s = await ReadUserDoorLock(residential);
}
else
{
residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
- //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
residential.Token = Config.Instance.Token;
residential.Id = Config.Instance.HomeId;
residential.IsOtherAccountCtrl = false;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
new file mode 100755
index 0000000..81ca490
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -0,0 +1,805 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using Shared.Common;
+using Shared.Phone.UserView;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+ public class SkipView
+ {
+ /// <summary>
+ /// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
+ /// </summary>
+ public static void SkipAddLogic(int intvalue,DoorLock doorLock=null,UserCenter.MemberInfoRes accountObj = null)
+ {
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
+ switch (intvalue)
+ {
+ case 0: {
+ //new涓�涓柊閫昏緫瀵硅薄锛�
+ //鏂板姝ｅ父鑷姩鍖栧叆鍙�
+ Common.Logic.CurrentLogic = new Common.Logic();
+ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+ Common.Logic.CurrentLogic.LogicType = 0;//鏍囪閫昏緫绫诲瀷
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ } break;
+ case 1: {
+ //杩涘叆闂ㄩ攣鑱斿姩浜嬩欢鍏ュ彛
+ Send.UserMemberInfoRes = accountObj;
+ Send.CurrentDoorLock = doorLock;
+ if (accountObj == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
+ }
+ if (doorLock == null)
+ {
+ ///闃叉鎶涘紓甯�
+ Send.CurrentDoorLock = new DoorLock();
+ }
+ ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ var doorLockLogicList = new DoorLockLogic.LockLogicList();
+ UserView.HomePage.Instance.AddChidren(doorLockLogicList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ doorLockLogicList.Show();
+ } break;
+ case 2: {
+ Common.Logic.LogicDviceList.Clear();
+ if (Common.Logic.LogicDviceList.Count == 0)
+ {
+ Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
+ }
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ int h =int.Parse(DateTime.Now.ToString("hh"));
+ int m = int.Parse(DateTime.Now.ToString("mm"));
+ //榛樿涓�涓椂闂存(寮�濮嬫椂闂翠负:绯荤粺褰撳墠锛岀粨鏉熸椂闂翠负:寮�濮嬫椂闂�+1涓椂闂�)
+ Dictionary<string, string> timeDictionary = new Dictionary<string, string>();
+ timeDictionary.Add("Type", "5");
+ timeDictionary.Add("IsValid", "1");
+ timeDictionary.Add("StartHour", h.ToString());
+ timeDictionary.Add("StartMin", m.ToString());
+ if (h + 1 == 24)
+ {
+ //缁撴潫鏃堕棿瓒呭嚭24灏忔椂澶勭悊鏂规硶;
+ timeDictionary.Add("StopHour", h.ToString());
+ timeDictionary.Add("StopMin", "59");
+ }
+ else
+ {
+ timeDictionary.Add("StopHour", (h + 1).ToString());
+ timeDictionary.Add("StopMin", m.ToString());
+ }
+ Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 8);
+ actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
+ actionsInfo.Add("Epoint", doorLock.DeviceEpoint);
+ actionsInfo.Add("PassData", "055704010112");//榛樿闂ㄩ攣甯稿紑
+
+ //new涓�涓柊閫昏緫瀵硅薄锛�
+ //鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
+ Common.Logic.CurrentLogic = new Common.Logic();
+ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+ Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
+ Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
+ Common.Logic.CurrentLogic.Conditions.Add(timeDictionary);//娣诲姞鏉′欢
+ Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(false);
+ } break;
+ }
+
+ }
+
+
+ #region 鈼� 鑷姩鍖朹_________________________
+
+ /// <summary>
+ /// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
+ /// </summary>
+ public static void ShowAutotionView(FrameLayout functionSceneAutoBodyView)
+ {
+ // functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ #region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
+ //鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
+ var bjFrameLayout = new FrameLayout
+ {
+ Width = Application.GetRealWidth(1080 - 58),
+ Height = Application.GetRealHeight(170),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ X = Application.GetRealWidth(58),
+ //Radius = (uint)Application.GetRealHeight(50),
+ Y = Application.GetRealHeight(30),
+
+ };
+ functionSceneAutoBodyView.AddChidren(bjFrameLayout);
+ bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
+ //鍥炬爣鎺т欢
+ var sigBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(84),
+ Height = Application.GetMinRealAverage(84),
+ UnSelectedImagePath = "ZigeeLogic/sign.png",
+ X = Application.GetRealWidth(58),
+ Gravity = Gravity.CenterVertical,
+ };
+ bjFrameLayout.AddChidren(sigBtn);
+ //鎺ㄨ崘妯℃澘鏂囨湰鎺т欢
+ var recommendtextBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(300),
+ Height = Application.GetMinRealAverage(84),
+ X = sigBtn.Right + Application.GetRealWidth(35),
+ TextAlignment = TextAlignment.CenterLeft,
+ //Text = "鎺ㄨ崘妯℃澘",
+ TextID = MyInternationalizationString.logictemplate,
+ Gravity = Gravity.CenterVertical,
+ TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
+ TextSize = 15,
+ };
+ bjFrameLayout.AddChidren(recommendtextBtn);
+ //鎺ㄨ崘妯℃澘寮�鍏虫帶浠�
+ var recommendswitchBtn = new Button
+ {
+ Width = Application.GetRealWidth(104),
+ Height = Application.GetRealHeight(63),
+ UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+ SelectedImagePath = "ZigeeLogic/logicopen.png",
+ X = bjFrameLayout.Width - Application.GetRealWidth(104 + 58),
+ Gravity = Gravity.CenterVertical,
+ };
+ bjFrameLayout.AddChidren(recommendswitchBtn);
+ #endregion
+ //榛樿鎺ㄨ崘妯℃澘宸﹀彸鍙粦鎺т欢
+ var scenehorizontalScrol = new HorizontalScrolViewLayout
+ {
+ Width = Application.GetRealWidth(1080 - 58),
+ X = Application.GetRealWidth(58),
+ Y = bjFrameLayout.Bottom + Application.GetRealHeight(30),
+ Height = Application.GetRealHeight(0),
+ };
+ functionSceneAutoBodyView.AddChidren(scenehorizontalScrol);
+ //鏄剧ず鑷姩鍖栧垪琛ㄤ笂涓嬪彲婊戞帶浠�
+ var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
+ {
+ Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
+ //BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,/
+ X = Application.GetRealWidth(58),
+ Y = scenehorizontalScrol.Bottom,
+ };
+ functionSceneAutoBodyView.AddChidren(logicScrolView);
+
+ logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ bool no = false;
+ //鏄剧ず榛樿妯℃澘鐨勭晫闈簨浠�
+ recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ int Yheight = 0;
+ recommendswitchBtn.IsSelected = !recommendswitchBtn.IsSelected;
+ scenehorizontalScrol.RemoveAll();
+ if (recommendswitchBtn.IsSelected)
+ {
+ no = true;
+ scenehorizontalScrol.Height = Application.GetRealHeight(246);
+ Yheight = 20;
+ for (int i = 1; i < 4; i++)
+ {
+
+ var frameLayout = new FrameLayout
+ {
+ Width = Application.GetMinRealAverage(369 + 46),
+ Height = Application.GetMinRealAverage(246),
+ };
+ scenehorizontalScrol.AddChidren(frameLayout);
+ var logiciocnBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(369),
+ Height = Application.GetMinRealAverage(246),
+ UnSelectedImagePath = "ZigeeLogic/" + i + ".png",
+ Tag = i,
+ };
+ frameLayout.AddChidren(logiciocnBtn);
+
+ var logicnameBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(250),
+ Height = Application.GetMinRealAverage(80),
+ X = Application.GetRealWidth(23),
+ Y = Application.GetRealHeight(246 - 23 - 80),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 14,
+ };
+ frameLayout.AddChidren(logicnameBtn);
+
+ if (i == 1)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.onlight);
+ }
+ else if (i == 2)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.offlight);
+ }
+ else if (i == 3)
+ {
+ logicnameBtn.Text = Language.StringByID(MyInternationalizationString.automation1);
+ }
+
+
+ EventHandler<MouseEventArgs> iconclick = (sender1, e1) =>
+ {
+ Common.Logic.CurrentLogic = new Common.Logic();
+ Common.Logic.CurrentLogic.IsEnable = 1;//榛樿涓哄紑
+ if (logiciocnBtn.Tag.ToString() == "3")
+ {
+ Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+ //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
+ var addLogicPage = new Device.Logic.AddLogicPage();
+ HomePage.Instance.AddChidren(addLogicPage);
+ HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
+ else
+ {
+
+ Common.Logic.CurrentLogic.LogicName = logicnameBtn.Text;
+ //Common.Logic.CurrentLogic.LogicCustomPushText = Common.Logic.CurrentLogic.LogicName + Language.StringByID(MyInternationalizationString.defaulttext);
+ Device.Logic.TemplatePage templatePage = new Device.Logic.TemplatePage();
+ Device.Logic.TemplatePage.s = logiciocnBtn.Tag.ToString();
+ HomePage.Instance.AddChidren(templatePage);
+ HomePage.Instance.PageIndex += 1;
+ templatePage.Show();
+ }
+ };
+ logiciocnBtn.MouseUpEventHandler += iconclick;
+ logicnameBtn.MouseUpEventHandler += iconclick;
+ }
+ }
+ else
+ {
+ no = false;
+ scenehorizontalScrol.Height = Application.GetRealHeight(0);
+ Yheight = 0;
+ }
+ logicScrolView.Y = scenehorizontalScrol.Bottom + Yheight;
+ logicScrolView.Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30) - Yheight;
+ Automationview(logicScrolView, no);
+ };
+ //涓嬫媺鍒锋柊鑷姩鍖栧垪琛ㄧ殑浜嬩欢
+ logicScrolView.BeginHeaderRefreshingAction += () =>
+ {
+ //閲嶆柊鍒锋柊logic鍒楄〃
+ Common.Logic.LogicList.Clear();
+ Read(logicScrolView, no);
+ //鍏抽棴鍒锋柊View锛�
+ logicScrolView.EndHeaderRefreshing();
+ };
+
+ //鑷姩鍖�
+ Read(logicScrolView, no);
+
+ }
+ /// <summary>
+ /// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
+ /// </summary>
+ /// <param name="logicScrolView"></param>
+ private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
+ {
+ CommonPage.Loading.Start();
+ if (Common.Logic.LogicList.Count == 0)
+ {
+ var Idlist1 = await Send.GetLogicId(0);//
+ var Idlist2 = await Send.GetLogicId(2);//闂ㄩ攣甯稿紑妯″紡
+ if (Idlist1.Count != 0)
+ {
+ var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
+ for (int j = 0; j < listlogic1.Count; j++)
+ {
+ var logic = listlogic1[j];
+ if (logic.LogicType != 0)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
+ }
+ }
+ if (Idlist2.Count != 0)
+ {
+ var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
+ for (int j = 0; j < listlogic2.Count; j++)
+ {
+ var logic = listlogic2[j];
+ if (logic.LogicType != 2)
+ {
+ continue;
+ }
+ Common.Logic.LogicList.Add(logic);
+ }
+ }
+ }
+ //鑷姩鍖�
+ Automationview(logicScrolView, no);
+ CommonPage.Loading.Hide();
+ }
+ /// <summary>
+ /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
+ /// </summary>
+ /// <param name="refresview">Refresview.</param>
+ private static async void Automationview(VerticalRefreshLayout refresview, bool no)
+ {
+ refresview.RemoveAll();
+ if (Common.Logic.LogicList.Count == 0 && no == false)
+ {
+ //灏辨槸涓轰簡鏄剧ず寮曞娣诲姞鍥炬爣;
+ refresview.BackgroundColor = 0x00000000;
+ var noFrameLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(434 + 200 + 32 + 294-55),
+ //BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ refresview.AddChidren(noFrameLayout);
+
+
+ var noIconBtn = new Button
+ {
+ Y = Application.GetRealHeight(294-55),
+ Width = Application.GetMinRealAverage(756),
+ Height = Application.GetMinRealAverage(434),
+ UnSelectedImagePath = "Item/NoFunction.png",
+ X = Application.GetRealWidth(104),
+ };
+ noFrameLayout.AddChidren(noIconBtn);
+
+ var noTextBtn = new Button()
+ {
+ Y = noIconBtn.Bottom,
+ Height = Application.GetRealHeight(200) + Application.GetRealHeight(32),
+ Width = Application.GetRealWidth(700),
+ //Gravity = Gravity.CenterHorizontal,
+ Text = Language.StringByID(MyInternationalizationString.automationaddtext).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true,
+ X = Application.GetRealWidth(190 - 58),
+ };
+ noFrameLayout.AddChidren(noTextBtn);
+
+ }
+ else
+ {
+
+ if (Common.Logic.LogicList.Count == 0 && no == true)
+ {
+ ///鏀瑰彉婊戝姩view鐨勯鑹诧紱
+ refresview.BackgroundColor = 0x00000000;
+ }
+ else
+ {
+ refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ }
+ }
+ int i = 1;//灞�閮ㄥ彉閲忥紝榛樿鏄涓�鏉￠�昏緫;
+ foreach (var logic in Common.Logic.LogicList)
+ {
+
+ var fLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080 - 58),
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ };
+ refresview.AddChidren(fLayout);
+
+ var logicRowlayout = new RowLayout
+ {
+ Height = Application.GetRealHeight(190 + 30),
+ Width = Application.GetRealWidth(1080 - 58),
+ LineColor = ZigbeeColor.Current.LogicBackgroundColor,
+ BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
+ SubViewWidth = Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+
+ };
+ fLayout.AddChidren(logicRowlayout);
+ if (i == 1)
+ {
+ //瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
+ fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
+ i = 2;
+ }
+
+ var logicnameBtn = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(350),
+ Text = logic.LogicName,
+ X = Application.GetRealWidth(12 + 46),
+ Y = Application.GetRealHeight(30),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 14,
+ };
+ logicRowlayout.AddChidren(logicnameBtn);
+
+ var logicswitchBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(63),
+ UnSelectedImagePath = "ZigeeLogic/logicclose.png",
+ SelectedImagePath = "ZigeeLogic/logicopen.png",
+ X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
+ Y = Application.GetRealHeight(58 + 30 + 9 + 30),
+
+ };
+ logicRowlayout.AddChidren(logicswitchBtn);
+
+ logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
+ {
+ logicswitchBtn.IsSelected = !logicswitchBtn.IsSelected;
+ if (logicswitchBtn.IsSelected)
+ {
+ //閫昏緫寮�
+ logic.IsEnable = 1;
+ StatusColor(logic, logicRowlayout, 1);
+ }
+ else
+ {
+ //閫昏緫鍏�
+ logic.IsEnable = 0;
+ StatusColor(logic, logicRowlayout, 0);
+ }
+ Send.LogicControlSwitch(logic);
+ //Logic.Send.AddModifyLogic(logic);
+ };
+ if (logic.IsEnable == 1)
+ {
+ logicswitchBtn.IsSelected = true;
+ StatusColor(logic, logicRowlayout, 1);
+ }
+ else if (logic.IsEnable == 0)
+ {
+ logicswitchBtn.IsSelected = false;
+ StatusColor(logic, logicRowlayout, 0);
+ }
+ ///缂栬緫
+ var edit = new Button
+ {
+ BackgroundColor = ZigbeeColor.Current.LogicEditBlackColor1,
+ Text = Language.StringByID(MyInternationalizationString.edit),
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ };
+ logicRowlayout.AddRightView(edit);
+ edit.MouseUpEventHandler += (sender, e) =>
+ {
+ Common.Logic.CurrentLogic = logic;
+ if (Common.Logic.CurrentLogic.LogicType == 2)
+ {
+ var oneLogic = new OneLogic();
+ UserView.HomePage.Instance.AddChidren(oneLogic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ oneLogic.Show(true);
+ }
+ else
+ {
+ var logicCommunalPage = new LogicCommunalPage();
+ HomePage.Instance.AddChidren(logicCommunalPage);
+ HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
+ }
+ };
+
+ ///鍒犻櫎
+ var del = new Button
+ {
+ BackgroundColor = ZigbeeColor.Current.LogicDelBlackColor1,
+ Text = Language.StringByID(MyInternationalizationString.del),
+ TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ };
+ logicRowlayout.AddRightView(del);
+ del.MouseUpEventHandler += (sender, e) =>
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ Language.StringByID(MyInternationalizationString.doyouwanttodelete),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ alert.ConfirmClickEvent += () =>
+ {
+ Common.Logic.LogicList.Remove(logic);
+ Automationview(refresview, no);
+ Send.DelLogic(logic.LogicId);
+ };
+
+ };
+ var line = new Button
+ {
+ Y = fLayout.Height - 1,
+ Height = 1,
+ X = Application.GetRealWidth(58),
+ Width = Application.GetRealWidth(1080 - 58),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ };
+ fLayout.AddChidren(line);
+ }
+
+ }
+ /// <summary>
+ /// 鏄剧ず鑷姩鍖栬緭鍑哄姛鑳芥ā鍧楀浘鏍囩殑棰滆壊
+ /// </summary>
+ /// <param name="logic"></param>
+ /// <param name="logicRowlayout"></param>
+ /// <param name="intvalue"></param>
+ private static void StatusColor(Common.Logic logic, RowLayout logicRowlayout, int intvalue)
+ {
+
+ var logictimeBtn = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = logicRowlayout.Width - Application.GetRealWidth(58 + 12 + 350),
+ Y = Application.GetRealHeight(30),
+ X = Application.GetRealWidth(365),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = ZigbeeColor.Current.LogicListWeekTextColor,
+ };
+ logicRowlayout.AddChidren(logictimeBtn);
+
+ ///鏄剧ず鎵ц鍛ㄦ湡
+ Method.UpdateWeek(logictimeBtn, logic);
+
+
+ List<string> indexlist = new List<string>();
+ List<string> iconIndexlist = new List<string>();
+ for (int i = 0; i < logic.Actions.Count; i++)
+ {
+ var linkType = logic.Actions[i]["LinkType"].ToString();
+ var d = indexlist.Find((value) => { return value == linkType; });
+ if (d == null)
+ {
+ indexlist.Add(linkType);
+ }
+ }
+ //鎺掑垪鍥炬爣椤哄簭;
+ if (indexlist.Contains("0")|| indexlist.Contains("8"))
+ {
+ iconIndexlist.Add("0");
+ }
+ if (indexlist.Contains("2"))
+ {
+ iconIndexlist.Add("2");
+ }
+ if (indexlist.Contains("6"))
+ {
+ iconIndexlist.Add("6");
+ }
+ if (indexlist.Contains("7"))
+ {
+ iconIndexlist.Add("7");
+ }
+ for (int i = 0; i < iconIndexlist.Count; i++)
+ {
+ var iconindex = iconIndexlist[i];
+ var typebjBtn = new FrameLayout
+ {
+ Width = Application.GetMinRealAverage(82),
+ Height = Application.GetMinRealAverage(82),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
+ Y = Application.GetRealHeight(58 + 30 + 30),
+ Radius = (uint)Application.GetMinRealAverage(41),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ logicRowlayout.AddChidren(typebjBtn);
+
+ var typeIconBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(58),
+ Height = Application.GetMinRealAverage(58),
+ Gravity = Gravity.Center,
+
+ };
+ typebjBtn.AddChidren(typeIconBtn);
+
+ var connectIconBtn = new Button
+ {
+ Y = typebjBtn.Y + Application.GetRealHeight(35),
+ X = Application.GetRealWidth(58) + Application.GetRealWidth((12 + 82 + 12) + (12 + 45 + 82 + 12) * i),
+ Width = Application.GetRealWidth(48),
+ Height = Application.GetRealHeight(15),
+ UnSelectedImagePath = "ZigeeLogic/connect.png",
+ };
+ logicRowlayout.AddChidren(connectIconBtn);
+ if (iconIndexlist.Count - 1 == i)
+ {
+ connectIconBtn.Visible = false;
+ }
+ switch (iconindex)
+ {
+ case "0":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/function1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicFunction1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+ }
+ break;
+ case "2":
+ {
+
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/scene1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicScene1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/noscene.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+ case "6":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/security1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicSecurity1Color;
+
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nosecurity.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+ case "7":
+ {
+ if (intvalue == 1)
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/delay1.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicDelay1Color;
+ }
+ else
+ {
+ typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nodelay.png";
+ typebjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ }
+
+ }
+ break;
+
+ }
+ }
+ }
+
+ #endregion
+
+ /// <summary>
+ /// 闂ㄩ攣鍙栨秷璁剧疆鐢ㄧ殑鏂规硶(鐩稿綋涓�涓叧闂父寮�妯″紡鎸夐挳,鍒嗙被-鑷姩鍖�-涓嶉渶瑕佹樉绀鸿鑷姩鍖�)
+ /// </summary>
+ /// <param name="timeVlaue">鏃堕棿鍊�</param>
+ /// <param name="common">璁惧</param>
+ /// <returns></returns>
+ public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ {
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ var h = DateTime.Now.ToString("hh");
+ var m = DateTime.Now.ToString("mm");
+ Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
+ timeConditionsInfo.Add("Type", "0");
+ timeConditionsInfo.Add("IsValid", "1");
+ timeConditionsInfo.Add("DateType", "0");
+ timeConditionsInfo.Add("RemindTime", "0");
+ timeConditionsInfo.Add("EnDelay", "0");
+ timeConditionsInfo.Add("DelayTime", "0");
+ timeConditionsInfo.Add("StartHour", h);
+ timeConditionsInfo.Add("StartMin", m);
+ timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
+ Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 8);
+ actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+ actionsInfo.Add("Epoint", common.DeviceEpoint);
+ actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+
+ Common.Logic currentLogic = new Common.Logic();
+ currentLogic.IsEnable = 1;//榛樿涓哄紑
+ currentLogic.TimeAttribute.Repeat = 0;//鎵ц涓�娆�
+ currentLogic.LogicType = 3;//鏍囪閫昏緫绫诲瀷
+ currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
+ currentLogic.Conditions.Add(timeConditionsInfo);
+ currentLogic.Actions.Add(actionsInfo);
+ Exist(3);//鏌ユ壘鏄惁瀛樺湪璁剧疆杩囧け鏁堟椂闂�(鏈夌殑璇濆垹闄わ紝鍐嶆坊鍔�)
+ Send.AddModifyLogic(currentLogic);
+
+ }
+
+ ///<summary>
+ /// 鏄惁瀛樺湪S-one閫昏緫鏂规硶(true涓哄瓨鍦�)
+ /// </summary>
+ public static async System.Threading.Tasks.Task<bool> Exist(int valueInt=2)
+ {
+ bool exist = false;
+ var Idlist = await Send.GetLogicId(valueInt);
+ if (Idlist.Count != 0)
+ {
+ if (valueInt==3) {
+ for (int i = 0; i < Idlist.Count; i++)
+ {
+ //valueInt=3涓�鏉＄壒娈婄殑鑷姩鍖�(鐢ㄦ潵璁剧疆澶辨晥鏃堕棿)
+ Send.DelLogic(Idlist[i]);
+ }
+ }
+ exist = true;
+ }
+ return exist;
+ }
+
+ ///<summary>
+ /// s-one闂ㄩ攣纭鍙栨秷鍙戦�佺殑鏂规硶
+ /// </summary>
+ public static async void LockCloseLogic(CommonDevice common)
+ {
+ //璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
+ int h =int.Parse(DateTime.Now.ToString("hh"));
+ int m= int.Parse(DateTime.Now.ToString("mm"));
+ //杞寲涓哄灏戝垎閽�;
+ int s = h * 60 + m;
+ List<Common.Logic> logicList = new List<Common.Logic>();
+ logicList.Clear();
+ var Idlist = await Send.GetLogicId(2);
+ if (Idlist.Count != 0)
+ { //鍏堝幓璇诲彇缃戝叧鐪嬫槸鍚﹀瓨鍦ㄦ暟鎹�;
+ var list = await Send.ReadList(Idlist.Count, 2);
+ for (int j = 0; j < list.Count; j++)
+ {
+ var logic = list[j];
+ foreach (var conditions in logic.Conditions)
+ {
+ var linkType = conditions["Type"];
+ if (linkType == "5")
+ {
+ int startMin = int.Parse(conditions["StartMin"]);
+ int startHour = int.Parse(conditions["StartHour"]);
+ int stopMin = int.Parse(conditions["StopMin"]);
+ int stopHour = int.Parse(conditions["StopHour"]);
+ int s1 = startMin + startHour * 60;//寮�濮嬫椂闂村��
+ int s2 = stopMin + stopHour * 60;//缁撴潫鏃堕棿鍊�
+ if (s >= s1&&s<=s2)
+ {
+ //鏌ユ壘绯荤粺鏃堕棿鍊兼槸鍚﹀睘浜庤繖涓寖鍥达紱
+ logicList.Add(logic);
+ }
+ }
+ }
+
+ }
+ }
+ foreach (var logic in logicList)
+ {
+ logic.IsEnable = 3;//鏀瑰彉閫昏緫浣胯兘鐘舵��;
+ //鐢╢oreach鍙戦�佸懡浠わ紱
+ Send.AddModifyLogic(logic);
+ }
+ }
+ }
+}
+
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index d781ff4..4e7e1b2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -215,7 +215,7 @@
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ selecteddevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
selecteddevice.regionNameBtn.Visible = true;
Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
selecteddevice.iconBtn.UnSelectedImagePath ="ZigeeLogic/sensor13.png";
@@ -289,10 +289,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Conditions.Remove(conditions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
+ selecteddevice.selecetdFrameLayout.RemoveFromParent();
+ //var templatePage = new TemplatePage();
+ //UserView.HomePage.Instance.AddChidren(templatePage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //templatePage.Show();
};
};
}
@@ -356,7 +357,7 @@
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
actiondevice.deviceNameBtn.Visible = true;
- actiondevice.deviceNameBtn.Text = deviceinof.DeviceEpointName;
+ actiondevice.deviceNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(deviceinof);
actiondevice.regionNameBtn.Visible = true;
Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
switch (deviceinof.Type)
@@ -418,10 +419,11 @@
alert.ConfirmClickEvent += () =>
{
Common.Logic.CurrentLogic.Actions.Remove(actions);
- var templatePage = new TemplatePage();
- UserView.HomePage.Instance.AddChidren(templatePage);
- UserView.HomePage.Instance.PageIndex += 1;
- templatePage.Show();
+ actiondevice.selecetdFrameLayout.RemoveFromParent();
+ //var templatePage = new TemplatePage();
+ //UserView.HomePage.Instance.AddChidren(templatePage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //templatePage.Show();
};
};
@@ -432,11 +434,11 @@
#region -----姣忓ぉ 璁剧疆鍛ㄦ湡-----
- var fraline1 = new FrameLayout
+ var fraHeight = new FrameLayout
{
Height = Application.GetRealHeight(30),
};
- middle.AddChidren(fraline1);
+ middle.AddChidren(fraHeight);
LogicView.Addview weekview = new LogicView.Addview();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
index 6994a1b..a13fe90 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePoint.cs
@@ -51,6 +51,7 @@
timeifon.Add("RemindTime", "0");
timeifon.Add("EnDelay", "0");
timeifon.Add("DelayTime", "0");
+ timeifon.Add("DoorLockOpenDelayTime","0");
timeifon.Add("DateType", TypeValue.ToString());
DateType = dictionary["DateType"];
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index c30fa40..644affd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -15,15 +15,12 @@
public void Show (string titlename)
{
- var weeklist = new List<string> ();
- #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ #region 鐣岄潰鐨勫竷灞�浠ｇ爜
TopView view = new TopView();
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.Text=titlename;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
- #endregion
-
var middle = new VerticalScrolViewLayout
{
Y = view.topRowLayout.Bottom,
@@ -31,11 +28,12 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
-
LogicView.SaveView saveView = new LogicView.SaveView();
saveView.frameLayout.Y = middle.Bottom;
this.AddChidren(saveView.Show());
+ #endregion
+ var weeklist = new List<string>();
if (Common.Logic.CurrentLogic.TimeAttribute.Repeat == 5)
{
string len = "";
@@ -83,7 +81,6 @@
}
}
}
-
var cyclelist = new List<string> ();
cyclelist.AddRange (new string [] {
Language.StringByID(MyInternationalizationString.mon),
@@ -138,8 +135,6 @@
};
}
-
-
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
index de1c241..c79d6fc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/AddRoomSelectPicByLocal.cs
@@ -51,9 +51,8 @@
};
this.AddChidren(midFl);
-
int k = 0;
- for (int j = 0; j < 3; j++)
+ for (int j = 0; j < 11; j++)
{
var itemView = new FrameLayout()
{
@@ -68,7 +67,7 @@
Y = Application.GetRealHeight(58),
Width = Application.GetRealWidth(467),
Height = Application.GetRealHeight(311),
- ImagePath = $"RoomIcon/{k}.JPG",
+ ImagePath = $"RoomIcon/{k}.jpg",
Radius = (uint)Application.GetRealHeight(17)
};
itemView.AddChidren(icon);
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs b/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
index 065cd53..1d723ca 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLogin.cs
@@ -391,6 +391,8 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
var revertData = responseDataObj;
Config.ReFresh();
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = passwordStr;
Config.Instance.MD5PWD = revertData.MD5PWD;
@@ -686,7 +688,9 @@
if (stateCodeStr == "SUCCESS")
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
- var revertData = responseDataObj;
+ var revertData = responseDataObj;
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Guid = revertData.Guid;
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
index 30ccf5e..9bce716 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginByCode.cs
@@ -330,7 +330,9 @@
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(requestRevetLoginCodeOBJ.ResponseData.ToString());
var revertData = responseDataObj;
- Config.ReFresh();
+ Config.ReFresh();
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Password = string.Empty;
Config.Instance.Account = revertData.Account;
Config.Instance.Guid = revertData.Guid;
@@ -639,7 +641,9 @@
if (stateCodeStr == "SUCCESS")
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
- var revertData = responseDataObj;
+ var revertData = responseDataObj;
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.MD5PWD = revertData.MD5PWD;
Config.Instance.Guid = revertData.Guid;
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
index c610589..b4e0464 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
@@ -430,7 +430,7 @@
}
CommonPage.Loading.Start();
- (sender as Button).Enable = (sender as Button).IsSelected = false;
+ (sender as Button).Enable = false;
try
{
int companyInt = 0;
@@ -466,30 +466,30 @@
{
//鎻愪緵鐨勫弬鏁伴敊璇�
errorBtn.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
- (sender as Button).Enable = (sender as Button).IsSelected = true;
+ (sender as Button).Enable = true;
}
else if (stateCodeStr == "SENDFAIL")
{
//楠岃瘉鐮佸彂閫佸け璐�
- errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
- (sender as Button).Enable = (sender as Button).IsSelected = true;
+ errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
+ (sender as Button).Enable = true;
}
else if (stateCodeStr == "EXIST")
{
//璐﹀彿瀛樺湪
- errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
- (sender as Button).Enable = (sender as Button).IsSelected = true;
+ errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
+ (sender as Button).Enable = true;
}
else
{
- errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
- (sender as Button).Enable = (sender as Button).IsSelected = true;
+ errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
+ (sender as Button).Enable = true;
}
}
catch
{
errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
- (sender as Button).Enable = (sender as Button).IsSelected = true;
+ (sender as Button).Enable = true;
}
finally
{
diff --git a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
index 432436e..b813e33 100755
--- a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
@@ -1170,7 +1170,7 @@
Application.RunOnMainThread(() =>
{
SendCodeBtn.Text = Convert.ToInt16(60 - span.TotalSeconds) + "s" + Language.StringByID(R.MyInternationalizationString.SendVerificationCodeAgain);
- SendCodeBtn.Enable = SendCodeBtn.IsSelected = false;
+ SendCodeBtn.Enable = false;
SendCodeBtn.BackgroundColor = ZigbeeColor.Current.GXCClearColor;
SendCodeBtn.SelectedBackgroundColor= ZigbeeColor.Current.GXCClearColor;
SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
@@ -1184,7 +1184,7 @@
SendCodeBtn.BackgroundColor = ZigbeeColor.Current.GXCButtonDisableColor;
SendCodeBtn.SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor;
SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
- SendCodeBtn.Enable = SendCodeBtn.IsSelected = true;
+ SendCodeBtn.Enable = true;
t.Stop();
t.Close();
});
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
new file mode 100755
index 0000000..87b1643
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
@@ -0,0 +1,400 @@
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage.ControlForm
+{
+ /// <summary>
+ /// 涓婚〉娣卞害鍗＄墖鐨勫簳灞傚叡閫�
+ /// </summary>
+ public class DeviceDetailCardCommonForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴浜嬩欢
+ /// </summary>
+ public Action<CommonDevice, Common.Room> FormCloseEvent = null;
+ /// <summary>
+ /// 璁惧瀵硅薄
+ /// </summary>
+ public CommonDevice device = null;
+ /// <summary>
+ /// 鎴块棿瀵硅薄
+ /// </summary>
+ public Common.Room room = null;
+ /// <summary>
+ /// 鐘舵�佹帶浠�
+ /// </summary>
+ private NormalViewControl btnStatu = null;
+ /// <summary>
+ /// 璁惧鍚嶇О鎺т欢
+ /// </summary>
+ private NormalViewControl btnDeviceName = null;
+ /// <summary>
+ /// 鎴块棿鍚嶇О
+ /// </summary>
+ private NormalViewControl btnRoomName = null;
+ /// <summary>
+ /// 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋� 0:娌℃湁鑾峰彇寰楀埌 1:宸茬粡鑾峰彇寰楀埌
+ /// </summary>
+ private int ResponeResult = 0;
+ /// <summary>
+ /// 褰撳墠绔偣鐨勫姛鑳界被鍨�
+ /// </summary>
+ private DeviceFunctionType nowDeviceFuncType = DeviceFunctionType.A鏈畾涔�;
+ /// <summary>
+ /// 鐧借壊鑳屾櫙鐨勫搴�
+ /// </summary>
+ private int backFrameWidth = 0;
+ /// <summary>
+ /// 鐧借壊鑳屾櫙鐨勯珮搴�
+ /// </summary>
+ private int backFrameHeight = 0;
+ /// <summary>
+ /// 褰撳墠鐨勬枃鏈�
+ /// </summary>
+ private string CurrentText = string.Empty;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_device">璁惧瀵硅薄</param>
+ /// <param name="i_room">鎴块棿</param>
+ /// <param name="i_backWidth">鐧借壊鑳屾櫙鐨勫搴�(闈炵湡瀹炲��)</param>
+ /// <param name="i_backHeight">鐧借壊鑳屾櫙鐨勯珮搴�(闈炵湡瀹炲��)</param>
+ public void ShowForm(CommonDevice i_device, Common.Room i_room, int i_backWidth, int i_backHeight)
+ {
+ this.CurrentText = Language.StringByID(R.MyInternationalizationString.Current) + " ";
+ this.room = i_room;
+ this.backFrameWidth = i_backWidth;
+ this.backFrameHeight = i_backHeight;
+
+ //鏇村
+ var btnMore = new MostRightIconControl(69, 69);
+ btnMore.UnSelectedImagePath = "Item/More.png";
+ topFrameLayout.AddChidren(btnMore);
+ btnMore.InitControl();
+ btnMore.ButtonClickEvent += (sender, e) =>
+ {
+ var detailInfo = new DeviceDetailInfoForm();
+ detailInfo.AddForm(device, room);
+ };
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(i_device);
+ //娣诲姞璁惧涓婃姤浜嬩欢
+ this.AddDeviceReportEvent();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ /// <param name="i_device">璁惧瀵硅薄</param>
+ /// <param name="backWidth">鐧借壊鑳屾櫙鐨勫搴�(闈炵湡瀹炲��)</param>
+ /// <param name="backHeight">鐧借壊鑳屾櫙鐨勯珮搴�(闈炵湡瀹炲��)</param>
+ private void InitMiddleFrame(CommonDevice i_device)
+ {
+ this.device = i_device;
+ this.nowDeviceFuncType = device.DfunctionType;
+
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鐧借壊鑳屾櫙鎺т欢
+ var frameWhiteBack = new FrameLayout();
+ frameWhiteBack.Y = Application.GetRealHeight(115);
+ frameWhiteBack.Width = Application.GetRealWidth(this.backFrameWidth);
+ frameWhiteBack.Height = Application.GetRealHeight(this.backFrameHeight);
+ frameWhiteBack.BackgroundColor = UserCenterColor.Current.White;
+ frameWhiteBack.Radius = (uint)Application.GetRealHeight(17);
+ frameWhiteBack.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(frameWhiteBack);
+
+ //璁惧鍚嶇О
+ this.btnDeviceName = new NormalViewControl(100, 60, true);
+ btnDeviceName.Y = Application.GetRealHeight(46);
+ btnDeviceName.TextSize = 15;
+ btnDeviceName.IsBold = true;
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
+ btnDeviceName.TextAlignment = TextAlignment.Center;
+ btnDeviceName.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(btnDeviceName);
+
+ //鐘舵��
+ this.btnStatu = new NormalViewControl(700, 42, true);
+ btnStatu.Y = btnDeviceName.Bottom + Application.GetRealHeight(12);
+ btnStatu.TextSize = 10;
+ btnStatu.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnStatu.TextAlignment = TextAlignment.Center;
+ btnStatu.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(btnStatu);
+
+ //鎴块棿鐨勯粦鑹茶儗鏅�
+ var frameRoomBlack = new FrameLayout();
+ frameRoomBlack.Height = Application.GetRealHeight(138);
+ frameRoomBlack.Width = frameWhiteBack.Width;
+ frameRoomBlack.BackgroundColor = 0xff232323;
+ frameRoomBlack.Radius= (uint)Application.GetRealHeight(17);
+ frameRoomBlack.Gravity = Gravity.BottomCenter;
+ frameWhiteBack.AddChidren(frameRoomBlack);
+
+ //璁╀笂閮ㄥ彉鐩磋(鍥犱负瀹夊崜杩欓噷,鍗曠嫭鎸囧畾宸︿笅鍜屽彸涓嬭鍦嗚鐨勮瘽,鍦嗕笉浜�)
+ var frameTemp = new FrameLayout();
+ frameTemp.Height = Application.GetRealHeight(30);
+ frameTemp.Width = frameWhiteBack.Width;
+ frameTemp.BackgroundColor = frameRoomBlack.BackgroundColor;
+ frameRoomBlack.AddChidren(frameTemp);
+
+ //鎴块棿鍥炬爣
+ var btnRoomIcon = new IconViewControl(81);
+ btnRoomIcon.X = ControlCommonResourse.XXLeft;
+ btnRoomIcon.UnSelectedImagePath = "Item/Room.png";
+ btnRoomIcon.Gravity = Gravity.CenterVertical;
+ frameRoomBlack.AddChidren(btnRoomIcon);
+
+ //鎴块棿鍚嶇О
+ this.btnRoomName = new NormalViewControl(600, 52, true);
+ btnRoomName.X = btnRoomIcon.Right + Application.GetRealWidth(12);
+ btnRoomName.TextSize = 12;
+ btnRoomName.TextColor = UserCenterColor.Current.White;
+ btnRoomName.Gravity = Gravity.CenterVertical;
+ btnRoomName.Text = this.room.Name;
+ frameRoomBlack.AddChidren(btnRoomName);
+
+ //鏀惰棌
+ var btnCollect = new IconBigViewControl(69, 69);
+ btnCollect.UnSelectedImagePath = "Item/Collection.png";
+ btnCollect.SelectedImagePath = "Item/CollectionSelected.png";
+ btnCollect.IsSelected = HdlRoomLogic.Current.IsCollectInRoom(i_device);
+ frameWhiteBack.AddChidren(btnCollect);
+ btnCollect.InitControl();
+ btnCollect.X = Application.GetRealWidth(850) - btnCollect.XOffset;
+ btnCollect.Y = Application.GetRealHeight(35) - btnCollect.YOffset;
+ btnCollect.ButtonClickEvent += (sender, e) =>
+ {
+ //鐘舵�佸彇鍙�
+ btnCollect.IsSelected = !btnCollect.IsSelected;
+ if (btnCollect.IsSelected == false)
+ {
+ //鍙栨秷鏀惰棌
+ HdlRoomLogic.Current.DeleteLoveDevice(i_device);
+ }
+ else
+ {
+ //娣诲姞鏀惰棌
+ HdlRoomLogic.Current.AddLoveDevice(i_device);
+ }
+ };
+
+ //搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�,璋冪敤鍚勮嚜鐣岄潰鐨勫垵濮嬪寲鍑芥暟
+ this.InitMiddleFrameAfter(frameWhiteBack);
+ }
+
+ /// <summary>
+ /// 搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�
+ /// </summary>
+ /// <param name="frameWhiteBack">鐧借壊鑳屾櫙鎺т欢</param>
+ public virtual void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
+ {
+ }
+
+ #endregion
+
+ #region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
+
+ /// <summary>
+ /// 妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ /// </summary>
+ /// <param name="listControl">闇�瑕侀檺鍒朵笉鑳界偣鍑荤殑鎺т欢(瓒呮椂鏃�,瀹冧細杩樺師Select鐘舵��)</param>
+ /// <param name="lastAction">鍑芥暟杩愯瀹屾垚鍚庣殑鍥炶皟鍑芥暟銆傚弬鏁癴alse:娌℃湁绛夊埌缃戝叧鍥炲 true:鎺ユ敹鍒颁簡缃戝叧鍥炲</param>
+ public void StartCheckResponeResult(List<ButtonBase> listControl, Action<bool> lastAction = null)
+ {
+ this.ResponeResult = 0;
+
+ //鍏堣鎸囧畾鎺т欢涓嶈兘鐐瑰嚮
+ var listSelect = new List<bool>();
+ foreach (var myContr in listControl)
+ {
+ myContr.CanClick = false;
+ listSelect.Add(myContr.IsSelected);
+ }
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ int waitime = 30;
+ while (waitime > 0)
+ {
+ System.Threading.Thread.Sleep(100);
+ if (this.ResponeResult == 1)
+ {
+ //宸茬粡鑾峰彇寰楀埌鏁版嵁
+ break;
+ }
+ waitime--;
+ }
+ if (waitime <= 0)
+ {
+ //娌℃湁鑾峰彇寰楀埌缁撴灉
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.FAIL));
+ msgContr.Show();
+ //鍙樻洿鍥炲師鏉ョ殑鐘舵��
+ for (int i = 0; i < listSelect.Count; i++)
+ {
+ if (listSelect[i] != listControl[i].IsSelected)
+ {
+ listControl[i].IsSelected = listSelect[i];
+ }
+ }
+ });
+ }
+ //寮�鍏虫寜閽彲浠ュ啀鐐瑰嚮
+ foreach (var myContr in listControl)
+ {
+ myContr.CanClick = true;
+ }
+ //鍑芥暟杩愯瀹屾垚鐨勫洖璋冨嚱鏁�
+ lastAction?.Invoke(this.ResponeResult == 1);
+ lastAction = null;
+ });
+ }
+
+ /// <summary>
+ /// 妫�娴嬬綉鍏崇殑鍙嶉缁撴灉(灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport)
+ /// </summary>
+ /// <param name="comandDiv">鍛戒护鍖哄垎</param>
+ /// <param name="report">涓婃姤鏁版嵁</param>
+ public virtual bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ return false;
+ }
+
+ /// <summary>
+ /// 娣诲姞璁惧涓婃姤浜嬩欢
+ /// </summary>
+ private void AddDeviceReportEvent()
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(this.device);
+ //鑺傜偣鍙嶉
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceDetailCardControl" + mainKeys, ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, (report) =>
+ {
+ string mainKey2 = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (mainKeys != mainKey2)
+ {
+ //涓嶆槸鍚屼竴涓笢瑗�
+ return;
+ }
+ //妫�娴嬬粨鏋�
+ if (this.CheckResponeResultStatu(ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉, report) == true)
+ {
+ //缁撴灉宸茬粡鎺ユ敹鍒�
+ this.ResponeResult = 1;
+ }
+ });
+ //灞炴�т笂鎶�
+ HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceDetailCardAttribute" + mainKeys, ReceiveComandDiv.A璁惧灞炴�т笂鎶�, (report) =>
+ {
+ string mainKey2 = Common.LocalDevice.Current.GetDeviceMainKeys(report);
+ if (mainKeys != mainKey2)
+ {
+ //涓嶆槸鍚屼竴涓笢瑗�
+ return;
+ }
+ //妫�娴嬬粨鏋�
+ if (this.CheckResponeResultStatu(ReceiveComandDiv.A璁惧灞炴�т笂鎶�, report) == true)
+ {
+ //缁撴灉宸茬粡鎺ユ敹鍒�
+ this.ResponeResult = 1;
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+
+ /// <summary>
+ /// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
+ /// </summary>
+ public override int FormActionAgainEvent()
+ {
+ //濡傛灉涓嶆槸鍠滅埍鎴块棿鐨勮瘽,瀹冪殑鎴块棿鏈夊彲鑳借鍒囨崲浜�
+ if (this.room.IsLove == false)
+ {
+ this.room = HdlRoomLogic.Current.GetRoomByDevice(this.device);
+ }
+ //濡傛灉鍔熻兘绫诲瀷鍙樻洿浜�
+ if (this.nowDeviceFuncType != this.device.DfunctionType)
+ {
+ //閲嶆柊鍒锋柊鐣岄潰,鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(this.device);
+ }
+ else
+ {
+ //鍒锋柊鍚嶅瓧
+ this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(this.device);
+ btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
+ btnDeviceName.Gravity = Gravity.CenterHorizontal;
+
+ this.btnRoomName.Text = this.room.Name;
+ }
+
+ return 1;
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(this.device);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceDetailCardControl" + mainKeys);
+ HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceDetailCardAttribute" + mainKeys);
+
+ //鍥炶皟鍑芥暟
+ this.FormCloseEvent?.Invoke(this.device, this.room);
+ this.FormCloseEvent = null;
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 璁剧疆鐘舵�佹枃鏈�(涓嶉渶瑕佹寚瀹氥�愬綋鍓嶄袱涓瓧銆�)
+ /// </summary>
+ /// <param name="text"></param>
+ public void SetStatuText(string text)
+ {
+ this.btnStatu.Text = this.CurrentText + text;
+ }
+
+ /// <summary>
+ /// 閲嶆柊璁剧疆璁惧鍚嶅瓧鎺т欢鍜岀姸鎬佹帶浠剁殑Y杞�
+ /// </summary>
+ /// <param name="i_NameY">璁惧鍚嶅瓧鎺т欢鐨刌杞�(鐪熷疄鍊�)</param>
+ /// <param name="i_StatuY">鐘舵�佹帶浠剁殑Y杞�(鐪熷疄鍊�)</param>
+ public void ResetDeviceNameAndStatuPoint(int i_NameY, int i_StatuY)
+ {
+ btnDeviceName.Y = i_NameY;
+ btnStatu.Y = i_StatuY;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
new file mode 100755
index 0000000..2c67573
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -0,0 +1,1064 @@
+锘縰sing Shared.Common;
+using Shared.Phone.Device.AC;
+using Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage.ControlForm
+{
+ /// <summary>
+ /// 绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ /// </summary>
+ public class DeviceAcDetailCardForm : DeviceDetailCardCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
+ /// </summary>
+ private List<ButtonBase> listControl = new List<ButtonBase>();
+ /// <summary>
+ /// 绌鸿皟鎺т欢
+ /// </summary>
+ private ArcScaleSeekBar arcScaleSeekBar = null;
+ /// <summary>
+ /// 绌鸿皟鎺т欢閲岄潰鐨勯偅涓樉绀哄埗鐑�,鍒跺喎鐨勬帶浠�
+ /// </summary>
+ private NormalViewControl btnNowModeView = null;
+ /// <summary>
+ /// 鍑忓彿鎺т欢
+ /// </summary>
+ private IconViewControl btnReduce = null;
+ /// <summary>
+ /// 鍔犲彿鎺т欢
+ /// </summary>
+ private IconViewControl btnAdd = null;
+ /// <summary>
+ /// 鏄惁璁剧疆杩涘害鍊�(鍙娇鐢ㄤ竴娆″悗,灏卞彉鏇村��)
+ /// </summary>
+ private bool notSetProgress = false;
+ /// <summary>
+ /// 鑳藉惁鍙戦�佽繘搴﹀�煎懡浠�
+ /// </summary>
+ private bool canSetProgress = true;
+ /// <summary>
+ /// 娓呮礂婊ょ綉鎻愮ず鐨凢rameLayout
+ /// </summary>
+ private FrameLayout frameClrean = null;
+ /// <summary>
+ /// 褰撳墠鐨勬俯搴﹁繘搴﹀��
+ /// </summary>
+ private int nowProgressValue = -1;
+ /// <summary>
+ /// 绌鸿皟鎺т欢
+ /// </summary>
+ private AC deviceAc = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
+ {
+ //宸︽粦涓嶈兘
+ this.ScrollEnabled = false;
+ this.deviceAc = (AC)this.device;
+ //鍏堟竻绌�
+ this.listControl = new List<ButtonBase>();
+ if (device.HadReadDeviceStatu == true && ACControlBase.IsOpen(deviceAc) == true)
+ {
+ //璁剧疆鐘舵�佹枃瀛� 褰撳墠瀹ゆ俯
+ this.SetStatuText(deviceAc.currentLocalTemperature + "鈩�");
+ }
+ else
+ {
+ //璁剧疆鐘舵�佹枃瀛� 鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ }
+
+ //娓呮礂婊ょ綉鎻愮ず鐨凢rameLayout
+ this.frameClrean = new FrameLayout();
+ frameClrean.Width = Application.GetRealWidth(600);
+ frameClrean.Height = Application.GetMinRealAverage(69);
+ frameClrean.X = ControlCommonResourse.XXLeft;
+ frameClrean.Y = Application.GetRealHeight(35);
+ frameWhiteBack.AddChidren(frameClrean);
+ frameClrean.Visible = false;
+ //娓呮礂婊ょ綉鎻愮ず鐨勫浘鏍�
+ var btnTipIcon = new IconViewControl(69);
+ btnTipIcon.UnSelectedImagePath = "AC/AC_TIP.png";
+ frameClrean.AddChidren(btnTipIcon);
+ //璇锋敞鎰忔竻娲楁护缃戝摝
+ var btnClrean = new NormalViewControl(Application.GetRealWidth(400), frameClrean.Height, false);
+ btnClrean.TextID = R.MyInternationalizationString.uPleaseClreanACfilter;
+ btnClrean.X = frameClrean.Right + Application.GetRealWidth(12);
+ frameClrean.AddChidren(btnClrean);
+
+ //璋冩暣璁惧鍜岀姸鎬佹帶浠剁殑Y杞�
+ this.ResetDeviceNameAndStatuPoint(Application.GetRealHeight(184), Application.GetRealHeight(256));
+
+ //鍒濆鍖栫┖璋冩帶浠�
+ this.InitAcControl(frameWhiteBack);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栫┖璋冩帶浠�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ private void InitAcControl(FrameLayout frameWhiteBack)
+ {
+ bool isAcOpen = ACControlBase.IsOpen(deviceAc);
+
+ //绌鸿皟鎺т欢鐨勫鍣�
+ var frameAcBack = new FrameLayout();
+ frameAcBack.Y = Application.GetRealHeight(412);
+ frameAcBack.Width = Application.GetMinRealAverage(671);
+ frameAcBack.Height = Application.GetMinRealAverage(671);
+ frameAcBack.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(frameAcBack);
+
+ this.nowProgressValue = ACControlBase.GetCurrentModeTemperature(deviceAc);
+ if (nowProgressValue < 16) { nowProgressValue = 16; }
+ if (nowProgressValue > 32) { nowProgressValue = 32; }
+ //绌鸿皟鎺т欢
+ this.arcScaleSeekBar = new ArcScaleSeekBar();
+ arcScaleSeekBar.Width = frameAcBack.Width;
+ arcScaleSeekBar.Height = frameAcBack.Height;
+ arcScaleSeekBar.MinValue = 16;
+ arcScaleSeekBar.MaxValue = 32;
+ arcScaleSeekBar.Progress = nowProgressValue;
+ arcScaleSeekBar.IsClickable = isAcOpen;
+ arcScaleSeekBar.ProgressBarUnitSring = string.Empty;
+ frameAcBack.AddChidren(arcScaleSeekBar);
+ if (isAcOpen == true)
+ {
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
+ }
+ else
+ {
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ }
+ //绌鸿皟鎺т欢閲岄潰鐨勯偅涓樉绀哄埗鐑�,鍒跺喎鐨勬帶浠�
+ this.btnNowModeView = new NormalViewControl(200, 55, true);
+ btnNowModeView.Y = Application.GetMinRealAverage(184);
+ btnNowModeView.Gravity = Gravity.CenterHorizontal;
+ btnNowModeView.Text = ACControlBase.GetModeNameByModeId(deviceAc.currentSystemMode);
+ btnNowModeView.TextSize = 12;
+ btnNowModeView.TextAlignment = TextAlignment.Center;
+ frameAcBack.AddChidren(btnNowModeView);
+
+ //鍑忓彿
+ this.btnReduce = new IconViewControl(81);
+ btnReduce.CanClick = isAcOpen;
+ btnReduce.UnSelectedImagePath = "AC/Reduce.png";
+ btnReduce.X = Application.GetMinRealAverage(132);
+ btnReduce.Y = Application.GetMinRealAverage(268);
+ frameAcBack.AddChidren(btnReduce);
+ btnReduce.ButtonClickEvent += (sender, e) =>
+ {
+ if (arcScaleSeekBar.Progress > 16)
+ {
+ this.nowProgressValue = arcScaleSeekBar.Progress - 1;
+ arcScaleSeekBar.Progress = this.nowProgressValue;
+ }
+ };
+
+ //鍔犲彿
+ this.btnAdd = new IconViewControl(81);
+ btnAdd.CanClick = isAcOpen;
+ btnAdd.UnSelectedImagePath = "AC/Add.png";
+ btnAdd.X = frameAcBack.Width - Application.GetMinRealAverage(81 + 132);
+ btnAdd.Y = btnReduce.Y;
+ frameAcBack.AddChidren(btnAdd);
+ btnAdd.ButtonClickEvent += (sender, e) =>
+ {
+ if (arcScaleSeekBar.Progress < 32)
+ {
+ this.nowProgressValue = arcScaleSeekBar.Progress + 1;
+ arcScaleSeekBar.Progress = this.nowProgressValue;
+ }
+ };
+
+ //鈩�
+ var btnUint = new NormalViewControl(100, 66, true);
+ btnUint.Y = Application.GetMinRealAverage(366);
+ btnUint.Gravity = Gravity.CenterHorizontal;
+ btnUint.TextAlignment = TextAlignment.Center;
+ btnUint.Text = "鈩�";
+ btnUint.TextSize = 18;
+ frameAcBack.AddChidren(btnUint);
+
+ //鏄惁鍚敤鎽嗛
+ int IconSpace = Application.GetRealWidth(156);
+ int YY = frameAcBack.Bottom + Application.GetRealHeight(69);
+ int XX = Application.GetRealWidth(207);
+
+ //鎵妯″紡(绗竴涓浘鏍�)
+ var btnFanSwingMode = new IconViewControl(81);
+ if (deviceAc.UseSwingFunction)
+ {
+ IconSpace = Application.GetRealWidth(109);
+ XX = Application.GetRealWidth(156);
+
+ btnFanSwingMode.X = XX;
+ btnFanSwingMode.Y = YY;
+ btnFanSwingMode.UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ btnFanSwingMode.SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ btnFanSwingMode.IsSelected = isAcOpen;
+ frameWhiteBack.AddChidren(btnFanSwingMode);
+ btnFanSwingMode.ButtonClickEvent += (sender, e) =>
+ {
+ //绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
+ if (ACControlBase.IsOpen(deviceAc) == true)
+ {
+ //閫夋嫨鎽嗛
+ this.SelectFanSwing(frameWhiteBack);
+ }
+ };
+
+ XX = btnFanSwingMode.Right + IconSpace;
+ }
+ this.listControl.Add(btnFanSwingMode);
+
+ //绌鸿皟妯″紡(绗簩涓浘鏍�)
+ var btnModel = new IconViewControl(81);
+ btnModel.X = XX;
+ btnModel.Y = YY;
+ btnModel.UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ btnModel.SelectedImagePath = ACControlBase.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ btnModel.IsSelected = isAcOpen;
+ frameWhiteBack.AddChidren(btnModel);
+ XX = btnModel.Right + IconSpace;
+ this.listControl.Add(btnModel);
+ btnModel.ButtonClickEvent += (sender, e) =>
+ {
+ //绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
+ if (ACControlBase.IsOpen(deviceAc) == true)
+ {
+ //閫夋嫨妯″紡
+ this.SelectAcModel(frameWhiteBack);
+ }
+ };
+
+ //寮�鍏�(绗笁涓浘鏍�)
+ var btnSwitch = new IconViewControl(81);
+ btnSwitch.X = XX;
+ btnSwitch.Y = YY;
+ btnSwitch.UnSelectedImagePath = "AC/OpenOrClose.png";
+ btnSwitch.SelectedImagePath = "AC/OpenOrCloseSelected.png";
+ btnSwitch.IsSelected = isAcOpen;
+ frameWhiteBack.AddChidren(btnSwitch);
+ XX = btnSwitch.Right + IconSpace;
+ this.listControl.Add(btnSwitch);
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ this.SetSwitchComand(!btnSwitch.IsSelected);
+ };
+
+ //椋庨�熸ā寮�(绗洓涓浘鏍�)
+ var btnFanMode = new IconViewControl(81);
+ btnFanMode.X = XX;
+ btnFanMode.Y = YY;
+ btnFanMode.UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ btnFanMode.SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ btnFanMode.IsSelected = isAcOpen;
+ frameWhiteBack.AddChidren(btnFanMode);
+ this.listControl.Add(btnFanMode);
+ btnFanMode.ButtonClickEvent += (sender, e) =>
+ {
+ //绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
+ if (ACControlBase.IsOpen(deviceAc) == true)
+ {
+ //閫夋嫨妯″紡
+ this.SelectAcWindSpeed(frameWhiteBack);
+ }
+ };
+
+ //鍒濆鍖栫┖璋冩帶浠朵簨浠�
+ this.InitAcControlEvent();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栫┖璋冩帶浠朵簨浠�
+ /// </summary>
+ private void InitAcControlEvent()
+ {
+ //婊戝姩杩囩▼涓�
+ int oldProgressValue = arcScaleSeekBar.Progress;//涔嬪墠鐨勫��
+ arcScaleSeekBar.OnProgressChangedEvent += (send2, value) =>
+ {
+ nowProgressValue = value;
+ };
+
+ //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ int timeCount = 0;
+ while (this.Parent != null)
+ {
+ if (this.canSetProgress == false)
+ {
+ //缃戝叧娌℃湁鍥炲鍓�,涓嶅啀鍙戦��
+ timeCount++;
+ if (timeCount <= 3)
+ {
+ System.Threading.Thread.Sleep(1000);
+ continue;
+ }
+ //濡傛灉3绉掑唴杩樻病鏈夋帴鏀跺埌鏁版嵁鐨勮瘽,鍙互缁х画鍙戦��
+ }
+ //璁℃暟缃┖
+ timeCount = 0;
+
+ if (nowProgressValue == oldProgressValue)
+ {
+ //鍊间竴鏍�
+ continue;
+ }
+ //鍙戦�佷竴娆″悗,涓嶈兘鍐嶆鍙戦��
+ this.canSetProgress = false;
+ oldProgressValue = nowProgressValue;
+ //鍙戦�佽繘搴﹀�肩粰璁惧
+ this.SetProgressValueToDevice(oldProgressValue);
+
+ System.Threading.Thread.Sleep(1000);
+ }
+ if (nowProgressValue != oldProgressValue)
+ {
+ //褰撶晫闈㈠叧闂椂,鍊艰繕澶勪簬涓嶄竴鏍锋椂,鐩存帴鍙戦��
+ this.SetProgressValueToDevice(nowProgressValue);
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鍙戦�佽繘搴﹀�肩粰璁惧
+ /// </summary>
+ /// <param name="value"></param>
+ private void SetProgressValueToDevice(int value)
+ {
+ //鑷繁鍙戣繃鍘荤殑涓滆タ,涓嶉渶瑕佸啀娆¤缃�(闃叉杩涘害鏉℃潵鍥炶烦鍔�),鍙娇鐢ㄤ竴娆�
+ this.notSetProgress = true;
+ //鍙戦�佽繘搴﹀��
+ if (deviceAc.currentSystemMode == 3 || deviceAc.currentSystemMode == 8)
+ {
+ deviceAc.SetCoolingTemperatureAsync(value * 100);
+ }
+ else if (deviceAc.currentSystemMode == 4)
+ {
+ deviceAc.SetHeatingTemperatureAsync(value * 100);
+ }
+ else if (deviceAc.currentSystemMode == 1)
+ {
+ deviceAc.SetAutoTemperatureAsync(value * 100);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 閫夋嫨鎽嗛(绗竴涓浘鏍�)_______________
+
+ /// <summary>
+ /// 閫夋嫨鎽嗛
+ /// </summary>
+ private void SelectFanSwing(FrameLayout frameWhiteBack)
+ {
+ var form = new DialogCommonForm();
+ //涓嶈皟鐢ㄥ簳灞傜殑鏄剧ず鐣岄潰鏂规硶
+ form.AutoLoadShowFormMethord = false;
+ form.AddForm();
+ //鐧借壊鑳屾櫙妗�
+ var frameBack = new FrameLayout();
+ //璁＄畻鍑哄畠鐨勭澶存瀵圭潃鍥剧墖涓棿鐨刋杞�
+ frameBack.X = frameWhiteBack.X + this.listControl[0].X - (Application.GetRealWidth(449) - this.listControl[0].Width) / 2;
+ //璁＄畻鍑哄畠鐨刌杞� 35涓哄簳閮ㄧ澶翠笌鍥炬爣鐨勯棿璺�
+ frameBack.Y = topFrameLayout.Bottom + frameWhiteBack.Y + this.listControl[0].Y - Application.GetRealHeight(1089 + 35);
+ frameBack.Height = Application.GetRealHeight(1089);
+ frameBack.Width = Application.GetRealWidth(449);
+ frameBack.BackgroundImagePath = "AC/SwingBackground.png";
+ form.bodyFrameLayout.AddChidren(frameBack);
+
+ //閫夋嫨鎽嗛
+ var frameTitle = new FrameLayout();
+ frameTitle.Width = frameBack.Width;
+ frameTitle.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(frameTitle);
+ var btnTitle = new NormalViewControl(frameBack.Width - Application.GetRealWidth(81), Application.GetRealHeight(60), false);
+ btnTitle.X = Application.GetRealWidth(81);
+ btnTitle.Y = Application.GetRealHeight(57);
+ btnTitle.IsBold = true;
+ btnTitle.TextID = R.MyInternationalizationString.SelectSwing;
+ frameTitle.AddChidren(btnTitle);
+
+ //1鎸�
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.First,
+ R.MyInternationalizationString.Swing_First, "AC/Swing_1.png", "AC/Swing_1Selected.png");
+ //2鎸�
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.Second,
+ R.MyInternationalizationString.Swing_Second, "AC/Swing_2.png", "AC/Swing_2Selected.png");
+ //3鎸�
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.Thrid,
+ R.MyInternationalizationString.Swing_Thrid, "AC/Swing_3.png", "AC/Swing_3Selected.png");
+ //4鎸�
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.Fourth,
+ R.MyInternationalizationString.Swing_Fourth, "AC/Swing_4.png", "AC/Swing_4Selected.png");
+ //5鎸�
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.Fifth,
+ R.MyInternationalizationString.Swing_Fifth, "AC/Swing_5.png", "AC/Swing_5Selected.png");
+ //鑷姩
+ this.InitFanSwingSelectRow(frameBack, AC.FanSwingMode.Auto,
+ R.MyInternationalizationString.Swing_Auto, "AC/Swing_Auto.png", "AC/Swing_AutoSelected.png");
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨憜椋庨�夋嫨琛屾帶浠�
+ /// </summary>
+ /// <param name="frameBack"></param>
+ /// <param name="i_div"></param>
+ /// <param name="textId"></param>
+ /// <param name="unSelectPath"></param>
+ /// <param name="selectPath"></param>
+ private void InitFanSwingSelectRow(FrameLayout frameBack, AC.FanSwingMode i_div, int textId,
+ string unSelectPath, string selectPath)
+ {
+ var rowFrame = new FrameRowControl();
+ rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(rowFrame);
+
+ //鍥炬爣
+ var btnIcon = rowFrame.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = unSelectPath;
+ btnIcon.SelectedImagePath = selectPath;
+ //鏄剧ず鏂囧瓧
+ var btnText = rowFrame.AddLeftCaption(Language.StringByID(textId), 288);
+ btnText.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
+ btnText.SelectedTextColor = ZigbeeColor.Current.GXCACSelectedTextColor2;
+ btnText.X = Application.GetRealWidth(173);
+ //搴曠嚎
+ if (i_div != AC.FanSwingMode.Auto)
+ {
+ var btnLine = rowFrame.AddBottomLine();
+ btnLine.X = Application.GetRealWidth(81);
+ }
+ if (deviceAc.currentFanSwingMode == (int)i_div)
+ {
+ //璁剧疆涓洪�夋嫨鐘舵��
+ btnIcon.IsSelected = true;
+ btnText.IsSelected = true;
+ btnText.IsBold = true;
+ }
+ //鎸夐敭鐐瑰嚮
+ rowFrame.ButtonClickEvent += (sender, e) =>
+ {
+ ((DialogCommonForm)frameBack.Parent.Parent).CloseForm();
+ //鍙戦�佹憜椋庡懡浠�
+ this.SetFanSwingComand(i_div);
+ };
+ }
+
+ /// <summary>
+ /// 鍙戦�佹憜椋庡懡浠�
+ /// </summary>
+ /// <param name="fanSwingMode">Fan mode.</param>
+ private void SetFanSwingComand(AC.FanSwingMode fanSwingMode)
+ {
+ var oldModel = (AC.FanSwingMode)deviceAc.currentFanSwingMode;
+ if (oldModel == fanSwingMode)
+ {
+ //閫夋嫨鐨勬槸鍚屼竴涓�
+ return;
+ }
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //杩樺師鐘舵��
+ listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingMode(oldModel);
+ listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingMode(oldModel);
+ });
+ }
+ });
+
+ listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
+ listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
+
+ deviceAc.SetFanSwingAsyncMode(fanSwingMode);
+ }
+
+ #endregion
+
+ #region 鈻� 閫夋嫨妯″紡(绗簩涓浘鏍�)_______________
+
+ /// <summary>
+ /// 閫夋嫨妯″紡
+ /// </summary>
+ private void SelectAcModel(FrameLayout frameWhiteBack)
+ {
+ //鑾峰彇妯″紡鑿滃崟涓暟
+ int menuCount = this.GetSupportModelMenuCount();
+ if (menuCount == 0)
+ {
+ //绌鸿皟妯″紡涓虹┖锛岃鍏堥厤缃�
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AC_Model_None));
+ return;
+ }
+ int frameBackHeight = 183 + menuCount * 150;
+
+ var form = new DialogCommonForm();
+ //涓嶈皟鐢ㄥ簳灞傜殑鏄剧ず鐣岄潰鏂规硶
+ form.AutoLoadShowFormMethord = false;
+ form.AddForm();
+ //鐧借壊鑳屾櫙妗�
+ var frameBack = new FrameLayout();
+ //璁＄畻鍑哄畠鐨勭澶存瀵圭潃鍥剧墖涓棿鐨刋杞�
+ frameBack.X = frameWhiteBack.X + this.listControl[1].X - (Application.GetRealWidth(449) - this.listControl[1].Width) / 2;
+ //璁＄畻鍑哄畠鐨刌杞� 35涓哄簳閮ㄧ澶翠笌鍥炬爣鐨勯棿璺�
+ frameBack.Y = topFrameLayout.Bottom + frameWhiteBack.Y + this.listControl[1].Y - Application.GetRealHeight(frameBackHeight + 35);
+ frameBack.Height = Application.GetRealHeight(frameBackHeight);
+ frameBack.Width = Application.GetRealWidth(449);
+ frameBack.BackgroundImagePath = "AC/SelectedModeBG.png";
+ form.bodyFrameLayout.AddChidren(frameBack);
+
+ //閫夋嫨妯″紡
+ var frameTitle = new FrameLayout();
+ frameTitle.Width = frameBack.Width;
+ frameTitle.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(frameTitle);
+ var btnTitle = new NormalViewControl(frameBack.Width - Application.GetRealWidth(81), Application.GetRealHeight(60), false);
+ btnTitle.X = Application.GetRealWidth(81);
+ btnTitle.Y = Application.GetRealHeight(57);
+ btnTitle.IsBold = true;
+ btnTitle.TextID = R.MyInternationalizationString.SelectMode;
+ frameTitle.AddChidren(btnTitle);
+
+ if (deviceAc.listSupportMode[4] == 1)
+ {
+ //鑷姩
+ this.InitAcModelSelectRow(frameBack, AC.AcMode.Auto,
+ R.MyInternationalizationString.Mode_Auto, "AC/Mode_Auto.png", "AC/Mode_AutoSelected.png", ZigbeeColor.Current.GXCTextBlackColor, frameBack.ChildrenCount != menuCount);
+ }
+ if (deviceAc.listSupportMode[0] == 1)
+ {
+ //鍒跺喎
+ this.InitAcModelSelectRow(frameBack, AC.AcMode.Cool,
+ R.MyInternationalizationString.Mode_Cool, "AC/Mode_Cool.png", "AC/Mode_CoolSelected.png", ZigbeeColor.Current.GXCACSelectedTextColor_Cool, frameBack.ChildrenCount != menuCount);
+ }
+ if (deviceAc.listSupportMode[1] == 1)
+ {
+ //鍒剁儹
+ this.InitAcModelSelectRow(frameBack, AC.AcMode.Heat,
+ R.MyInternationalizationString.Mode_Heat, "AC/Mode_Heat.png", "AC/Mode_HeatSelected.png", ZigbeeColor.Current.GXCACSelectedTextColor_Heat, frameBack.ChildrenCount != menuCount);
+ }
+ if (deviceAc.listSupportMode[3] == 1)
+ {
+ //闄ゆ箍
+ this.InitAcModelSelectRow(frameBack, AC.AcMode.Dry,
+ R.MyInternationalizationString.Mode_Dry, "AC/Mode_Dry.png", "AC/Mode_DrySelected.png", ZigbeeColor.Current.GXCACSelectedTextColor_Dry, frameBack.ChildrenCount != menuCount);
+ }
+ if (deviceAc.listSupportMode[2] == 1)
+ {
+ //閫侀
+ this.InitAcModelSelectRow(frameBack, AC.AcMode.FanOnly,
+ R.MyInternationalizationString.Mode_FanOnly, "AC/Mode_Fan.png", "AC/Mode_FanSelected.png", ZigbeeColor.Current.GXCACSelectedTextColor_Fan, frameBack.ChildrenCount != menuCount);
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨ā寮忛�夋嫨琛屾帶浠�
+ /// </summary>
+ /// <param name="frameBack"></param>
+ /// <param name="i_div"></param>
+ /// <param name="textId"></param>
+ /// <param name="unSelectPath"></param>
+ /// <param name="selectPath"></param>
+ private void InitAcModelSelectRow(FrameLayout frameBack, AC.AcMode i_div, int textId,
+ string unSelectPath, string selectPath, uint selectColor, bool addLine)
+ {
+ var rowFrame = new FrameRowControl();
+ rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(rowFrame);
+
+ //鍥炬爣
+ var btnIcon = rowFrame.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = unSelectPath;
+ btnIcon.SelectedImagePath = selectPath;
+ //鏄剧ず鏂囧瓧
+ var btnText = rowFrame.AddLeftCaption(Language.StringByID(textId), 288);
+ btnText.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
+ btnText.SelectedTextColor = selectColor;
+ btnText.X = Application.GetRealWidth(173);
+ //搴曠嚎
+ if (addLine == true)
+ {
+ var btnLine = rowFrame.AddBottomLine();
+ btnLine.X = Application.GetRealWidth(81);
+ }
+ if (deviceAc.currentSystemMode == (int)i_div)
+ {
+ //璁剧疆涓洪�夋嫨鐘舵��
+ btnIcon.IsSelected = true;
+ btnText.IsSelected = true;
+ btnText.IsBold = true;
+ }
+ //鎸夐敭鐐瑰嚮
+ rowFrame.ButtonClickEvent += (sender, e) =>
+ {
+ ((DialogCommonForm)frameBack.Parent.Parent).CloseForm();
+ //鍙戦�佹ā寮忓懡浠�
+ this.SetAcModelComand(i_div);
+ };
+ }
+
+ /// <summary>
+ /// 鍙戦�佹ā寮忓懡浠�
+ /// </summary>
+ /// <param name="mode">mode.</param>
+ private void SetAcModelComand(AC.AcMode mode)
+ {
+ var oldModel = (AC.AcMode)deviceAc.currentSystemMode;
+ if (oldModel == mode)
+ {
+ //閫夋嫨鐨勬槸鍚屼竴涓�
+ return;
+ }
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //杩樺師鐘舵��
+ listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByMode(oldModel);
+ listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByMode(oldModel);
+ });
+ }
+ else
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //閫侀鐨勬椂鍊�,娌℃湁娓╁害鐨勬蹇�
+ if (mode == AC.AcMode.FanOnly)
+ {
+ //棰滆壊鍙樻洿
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ arcScaleSeekBar.IsClickable = false;
+ //鍔犲噺涓嶅彲浠ョ偣鍑�
+ btnAdd.CanClick = false;
+ btnReduce.CanClick = false;
+ }
+ else if (oldModel == AC.AcMode.FanOnly)
+ {
+ //濡傛灉鍘熸潵鐨勭姸鎬佹槸閫侀鐨勮瘽
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
+ arcScaleSeekBar.IsClickable = true;
+ //鍔犲噺鍙互鐐瑰嚮
+ btnAdd.CanClick = true;
+ btnReduce.CanClick = true;
+ }
+ });
+ }
+ });
+
+ listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByMode(mode);
+ listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByMode(mode);
+
+ deviceAc.SetSystemModeAsync(mode);
+ }
+
+ /// <summary>
+ /// 鑾峰彇妯″紡鑿滃崟涓暟
+ /// </summary>
+ /// <returns></returns>
+ private int GetSupportModelMenuCount()
+ {
+ int count = 0;
+ foreach (var m in deviceAc.listSupportMode)
+ {
+ if (m == 1)
+ {
+ count++;
+ }
+ }
+ return count;
+ }
+
+ #endregion
+
+ #region 鈻� 寮�鍏虫寜閽�(绗笁涓浘鏍�)_______________
+
+ /// <summary>
+ /// 鍙戦�佸紑鍏冲懡浠�
+ /// </summary>
+ /// <param name="isOpen"></param>
+ private void SetSwitchComand(bool isOpen)
+ {
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ //鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == true)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //閭ｅ洓涓浘鏍囧彉鏇�
+ this.listControl[0].IsSelected = isOpen;
+ this.listControl[1].IsSelected = isOpen;
+ this.listControl[3].IsSelected = isOpen;
+ if (isOpen == true)
+ {
+ //棰滆壊鍙樻洿
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
+ arcScaleSeekBar.IsClickable = true;
+ //鍔犲噺鍙互鐐瑰嚮
+ btnAdd.CanClick = true;
+ btnReduce.CanClick = true;
+ }
+ else
+ {
+ //棰滆壊鍙樻洿
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ arcScaleSeekBar.IsClickable = false;
+ //鍔犲噺涓嶅彲浠ョ偣鍑�
+ btnAdd.CanClick = false;
+ btnReduce.CanClick = false;
+ }
+ });
+ }
+ });
+
+ this.listControl[2].IsSelected = isOpen;
+ if (isOpen == true)
+ {
+ deviceAc.Open();
+ }
+ else
+ {
+ deviceAc.Close();
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 閫夋嫨椋庨��(绗洓涓浘鏍�)_______________
+
+ /// <summary>
+ /// 閫夋嫨椋庨��
+ /// </summary>
+ private void SelectAcWindSpeed(FrameLayout frameWhiteBack)
+ {
+ var form = new DialogCommonForm();
+ //涓嶈皟鐢ㄥ簳灞傜殑鏄剧ず鐣岄潰鏂规硶
+ form.AutoLoadShowFormMethord = false;
+ form.AddForm();
+ //鐧借壊鑳屾櫙妗�
+ var frameBack = new FrameLayout();
+ //璁＄畻鍑哄畠鐨勭澶存瀵圭潃鍥剧墖涓棿鐨刋杞�
+ frameBack.X = frameWhiteBack.X + this.listControl[3].X - (Application.GetRealWidth(449) - this.listControl[3].Width) / 2;
+ //璁＄畻鍑哄畠鐨刌杞� 35涓哄簳閮ㄧ澶翠笌鍥炬爣鐨勯棿璺�
+ frameBack.Y = topFrameLayout.Bottom + frameWhiteBack.Y + this.listControl[3].Y - Application.GetRealHeight(625 + 35);
+ frameBack.Height = Application.GetRealHeight(625);
+ frameBack.Width = Application.GetRealWidth(449);
+ frameBack.BackgroundImagePath = "AC/SelectedFanModeBG.png";
+ form.bodyFrameLayout.AddChidren(frameBack);
+
+ //閫夋嫨椋庨��
+ var frameTitle = new FrameLayout();
+ frameTitle.Width = frameBack.Width;
+ frameTitle.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(frameTitle);
+ var btnTitle = new NormalViewControl(frameBack.Width - Application.GetRealWidth(81), Application.GetRealHeight(60), false);
+ btnTitle.X = Application.GetRealWidth(81);
+ btnTitle.Y = Application.GetRealHeight(57);
+ btnTitle.IsBold = true;
+ btnTitle.TextID = R.MyInternationalizationString.SelectFanMode;
+ frameTitle.AddChidren(btnTitle);
+
+ //浣庨
+ this.InitAcWindSpeedSelectRow(frameBack, AC.FanMode.Low,
+ R.MyInternationalizationString.Fan_Low, "AC/Fan_Low.png", "AC/Fan_LowSelected.png");
+ //涓
+ this.InitAcWindSpeedSelectRow(frameBack, AC.FanMode.Medium,
+ R.MyInternationalizationString.Fan_Middle, "AC/Fan_Middle.png", "AC/Fan_MiddleSelected.png");
+ //楂橀
+ this.InitAcWindSpeedSelectRow(frameBack, AC.FanMode.High,
+ R.MyInternationalizationString.Fan_Height, "AC/Fan_Height.png", "AC/Fan_HeightSelected.png");
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栭閫熼�夋嫨琛屾帶浠�
+ /// </summary>
+ /// <param name="frameBack"></param>
+ /// <param name="i_div"></param>
+ /// <param name="textId"></param>
+ /// <param name="unSelectPath"></param>
+ /// <param name="selectPath"></param>
+ private void InitAcWindSpeedSelectRow(FrameLayout frameBack, AC.FanMode i_div, int textId,
+ string unSelectPath, string selectPath)
+ {
+ var rowFrame = new FrameRowControl();
+ rowFrame.Y = frameBack.GetChildren(frameBack.ChildrenCount - 1).Bottom;
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.Height = Application.GetRealHeight(150);
+ frameBack.AddChidren(rowFrame);
+
+ //鍥炬爣
+ var btnIcon = rowFrame.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = unSelectPath;
+ btnIcon.SelectedImagePath = selectPath;
+ //鏄剧ず鏂囧瓧
+ var btnText = rowFrame.AddLeftCaption(Language.StringByID(textId), 288);
+ btnText.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
+ btnText.SelectedTextColor = ZigbeeColor.Current.GXCACSelectedTextColor_FanModel;
+ btnText.X = Application.GetRealWidth(173);
+ //搴曠嚎
+ if (i_div != AC.FanMode.High)
+ {
+ var btnLine = rowFrame.AddBottomLine();
+ btnLine.X = Application.GetRealWidth(81);
+ }
+ if (deviceAc.currentFanMode == (int)i_div)
+ {
+ //璁剧疆涓洪�夋嫨鐘舵��
+ btnIcon.IsSelected = true;
+ btnText.IsSelected = true;
+ btnText.IsBold = true;
+ }
+ //鎸夐敭鐐瑰嚮
+ rowFrame.ButtonClickEvent += (sender, e) =>
+ {
+ ((DialogCommonForm)frameBack.Parent.Parent).CloseForm();
+ //鍙戦�侀閫熷懡浠�
+ this.SetAcWindSpeedComand(i_div);
+ };
+ }
+
+ /// <summary>
+ /// 鍙戦�侀閫熷懡浠�
+ /// </summary>
+ /// <param name="mode">mode.</param>
+ private void SetAcWindSpeedComand(AC.FanMode mode)
+ {
+ var oldModel = (AC.FanMode)deviceAc.currentFanMode;
+ if (oldModel == mode)
+ {
+ //閫夋嫨鐨勬槸鍚屼竴涓�
+ return;
+ }
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //杩樺師鐘舵��
+ listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(oldModel);
+ listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(oldModel);
+ });
+ }
+ });
+
+ listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(mode);
+ listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(mode);
+
+ deviceAc.SetFanModeAsync(mode);
+ }
+
+ #endregion
+
+ #region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
+
+ /// <summary>
+ /// 妫�娴嬬綉鍏崇殑鍙嶉缁撴灉(灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport)
+ /// </summary>
+ /// <param name="comandDiv">鍛戒护鍖哄垎</param>
+ /// <param name="report">涓婃姤鏁版嵁</param>
+ /// <returns></returns>
+ public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ {
+ if (report.DeviceStatusReport.CluterID == 513)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆鐘舵�佹枃瀛� 褰撳墠瀹ゆ俯
+ this.SetStatuText(deviceAc.currentLocalTemperature + "鈩�");
+ });
+ }
+ else if (attList.AttributeId == 17)
+ {
+ if (deviceAc.currentSystemMode == 3 || deviceAc.currentSystemMode == 8)
+ {
+ //鍏佽鍚屾杩涘害鍊兼椂鎵嶅悓姝�
+ if (this.notSetProgress == false)
+ {
+ //鍒跺喎
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ arcScaleSeekBar.Progress = deviceAc.currentCoolingSetpoint;
+ });
+ }
+ //鎺ユ敹鍒版暟鎹弽棣�
+ this.canSetProgress = true;
+ //鐘舵�佽繕鍘�(鍙娇鐢ㄤ竴娆�)
+ this.notSetProgress = false;
+ }
+ }
+ else if (attList.AttributeId == 18)
+ {
+ if (deviceAc.currentSystemMode == 4)
+ {
+ //鍏佽鍚屾杩涘害鍊兼椂鎵嶅悓姝�
+ if (this.notSetProgress == false)
+ {
+ //鍒剁儹
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ arcScaleSeekBar.Progress = deviceAc.currentHeatingSetpoint;
+ });
+ }
+ //鎺ユ敹鍒版暟鎹弽棣�
+ this.canSetProgress = true;
+ //鐘舵�佽繕鍘�(鍙娇鐢ㄤ竴娆�)
+ this.notSetProgress = false;
+ }
+ }
+ else if (attList.AttributeId == 4096)
+ {
+ if (deviceAc.currentSystemMode == 1)
+ {
+ //鍏佽鍚屾杩涘害鍊兼椂鎵嶅悓姝�
+ if (this.notSetProgress == false)
+ {
+ //鑷姩
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ arcScaleSeekBar.Progress = deviceAc.currentAutoSetpoint;
+ });
+ }
+ //鎺ユ敹鍒版暟鎹弽棣�
+ this.canSetProgress = true;
+ //鐘舵�佽繕鍘�(鍙娇鐢ㄤ竴娆�)
+ this.notSetProgress = false;
+ }
+ }
+ else if (attList.AttributeId == 28)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //濡傛灉鏄叧闂┖璋冪殑璇�,鐩存帴鍙樻殫鍗冲彲
+ if (deviceAc.currentSystemMode == 0)
+ {
+ if (this.listControl[1].IsSelected == true)
+ {
+ this.listControl[0].IsSelected = false;
+ this.listControl[1].IsSelected = false;
+ this.listControl[2].IsSelected = false;
+ this.listControl[3].IsSelected = false;
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ }
+ //璁剧疆鐘舵�佹枃瀛� 鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ return;
+ }
+ else if (deviceAc.currentSystemMode == 1 || deviceAc.currentSystemMode == 3 ||
+ deviceAc.currentSystemMode == 4 || deviceAc.currentSystemMode == 7 ||
+ deviceAc.currentSystemMode == 8)
+ {
+ if (this.listControl[1].IsSelected == false)
+ {
+ this.listControl[0].IsSelected = true;
+ this.listControl[1].IsSelected = true;
+ this.listControl[2].IsSelected = true;
+ this.listControl[3].IsSelected = true;
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
+ }
+ }
+ this.listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ this.listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ this.btnNowModeView.Text = ACControlBase.GetModeNameByModeId(deviceAc.currentSystemMode);
+ arcScaleSeekBar.Progress = ACControlBase.GetCurrentModeTemperature(deviceAc);
+ arcScaleSeekBar.IsClickable = ACControlBase.IsOpen(deviceAc);
+ //璁剧疆鐘舵�佹枃瀛� 褰撳墠瀹ゆ俯
+ this.SetStatuText(deviceAc.currentLocalTemperature + "鈩�");
+ });
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ else if (attList.AttributeId == 4097)
+ {
+ //娓呯悊婊ょ綉
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ frameClrean.Visible = deviceAc.CleanStatu;
+ });
+ }
+ }
+ }
+ else if (report.DeviceStatusReport.CluterID == 514)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
+ {
+ //椋庨��
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (this.listControl[3].IsSelected == false)
+ {
+ this.listControl[3].IsSelected = true;
+ }
+ this.listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ this.listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ });
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ else if (attList.AttributeId == 4096)
+ {
+ //鎵
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (this.listControl[0].IsSelected == false)
+ {
+ this.listControl[0].IsSelected = true;
+ }
+ this.listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ this.listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ });
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs
new file mode 100755
index 0000000..53a0bff
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceColorLightDetailCardForm.cs
@@ -0,0 +1,327 @@
+锘縰sing Shared.Common;
+using Shared.Phone.Device.DeviceLogic;
+using Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage.ControlForm
+{
+ /// <summary>
+ /// 褰╃伅(璋冨厜鍣�)绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ /// </summary>
+ public class DeviceColorLightDetailCardForm : DeviceDetailCardCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
+ /// </summary>
+ private List<ButtonBase> listControl = new List<ButtonBase>();
+ /// <summary>
+ /// MaxLevel
+ /// </summary>
+ private const int MaxLevel = 254;
+ /// <summary>
+ /// 褰╃伅鎺т欢
+ /// </summary>
+ private WaveSeekBar waveSeekBar = null;
+ /// <summary>
+ /// 杩涘害鍊兼槸鍚﹀湪鏀瑰彉涓�
+ /// </summary>
+ private bool isProgressing = false;
+ /// <summary>
+ /// 鑳藉惁鍙戦�佽繘搴﹀��
+ /// </summary>
+ private bool canSetProgressValue = true;
+ /// <summary>
+ /// 鏄惁宸茬粡鍒濆鍖栦簡鎺т欢(鍥犱负搴曞眰鏈夊彲鑳戒細鍒锋柊鏁翠釜鐣岄潰)
+ /// </summary>
+ private bool hadInitControl = false;
+ /// <summary>
+ /// 褰╃伅鏄惁鏄墦寮�鐘舵��(涓嶈兘鐢ㄦ帶浠剁殑Select鏉ュ垽鏂�,澶潙)
+ /// </summary>
+ private bool IsLightOpen = false;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
+ {
+ //宸︽粦涓嶈兘
+ this.ScrollEnabled = false;
+ //鍏堟竻绌�
+ this.listControl = new List<ButtonBase>();
+ //璁剧疆鐘舵�佹枃瀛�
+ if (((LightBase)this.device).OnOffStatus == 1)
+ {
+ //浜害 XX
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + " " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ }
+ else
+ {
+ //鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ }
+
+ //褰╃伅鎺т欢
+ this.waveSeekBar = new WaveSeekBar();
+ waveSeekBar.Y = Application.GetRealHeight(377);
+ waveSeekBar.Width = Application.GetMinRealAverage(271);
+ waveSeekBar.Height = Application.GetMinRealAverage(533);
+ waveSeekBar.Gravity = Gravity.CenterHorizontal;
+ waveSeekBar.WavePadding = Application.GetRealWidth(8);
+ waveSeekBar.MaxValue = 100;
+ waveSeekBar.Progress = (int)(((DimmableLight)this.device).Level * 1.0 / MaxLevel * 100);
+ waveSeekBar.CornerRadius = Application.GetRealHeight(58);
+ frameWhiteBack.AddChidren(waveSeekBar);
+
+ //寮�鍏�
+ var btnSwitch = new IconViewControl(81);
+ btnSwitch.UnSelectedImagePath = "Item/Switch.png";
+ btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
+ btnSwitch.Y = waveSeekBar.Bottom + Application.GetRealHeight(84);
+ btnSwitch.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(btnSwitch);
+ listControl.Add(btnSwitch);
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(!btnSwitch.IsSelected);
+ };
+
+ //璁剧疆鍒濆鐘舵��
+ this.IsLightOpen = ((LightBase)this.device).OnOffStatus == 1;
+ this.canSetProgressValue = this.IsLightOpen;
+ if (IsLightOpen == true)
+ {
+ btnSwitch.IsSelected = true;
+ waveSeekBar.IsClickable = true;
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
+ }
+ else
+ {
+ waveSeekBar.IsClickable = false;
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ }
+
+ //褰╃伅鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
+ int progressY = waveSeekBar.Y - Application.GetMinReal(154);
+ var btnProgress = new NormalViewControl(Application.GetMinReal(135), Application.GetMinReal(104), false);
+ btnProgress.Y = progressY;
+ btnProgress.UnSelectedImagePath = "Item/ProgressBubbles.png";
+ btnProgress.IsBold = true;
+ btnProgress.TextColor = UserCenterColor.Current.White;
+ btnProgress.Gravity = Gravity.CenterHorizontal;
+ btnProgress.TextAlignment = TextAlignment.Center;
+ frameWhiteBack.AddChidren(btnProgress);
+ btnProgress.Visible = false;
+
+ //寮�濮嬫粦鍔ㄧ殑浜嬩欢
+ waveSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬪彉鏇�
+ this.isProgressing = true;
+ //鍙樻洿杩涘害鐧惧垎姣旂殑鏄剧ず
+ btnProgress.Y = progressY + waveSeekBar.NowProgressY;
+ btnProgress.Text = waveSeekBar.Progress + "%";
+ waveSeekBar.IsProgressTextShow = false;
+ if (btnProgress.Visible == false)
+ {
+ btnProgress.Visible = true;
+ }
+ };
+
+ //缁撴潫婊戝姩鐨勪簨浠�
+ waveSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬬粨鏉�
+ this.isProgressing = false;
+ btnProgress.Visible = false;
+ waveSeekBar.IsProgressTextShow = true;
+ };
+
+ //婊戝姩杩囩▼涓�
+ int oldProgressValue = waveSeekBar.Progress;//涔嬪墠鐨勫��
+ int nowProgressValue = oldProgressValue;//鍙樻洿鐨勫��
+ waveSeekBar.OnProgressChangedEvent += (sender, value) =>
+ {
+ //鍙樻洿杩涘害鐧惧垎姣旂殑鏄剧ず
+ btnProgress.Y = progressY + waveSeekBar.NowProgressY;
+ btnProgress.Text = value + "%";
+ nowProgressValue = value;
+ };
+
+ if (this.hadInitControl == true)
+ {
+ //宸茬粡瀹屾垚鍒濆鍖�
+ return;
+ }
+ this.hadInitControl = true;
+
+ //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ while (this.Parent != null)
+ {
+ System.Threading.Thread.Sleep(1000);
+ if (nowProgressValue == oldProgressValue
+ || this.canSetProgressValue == false)
+ {
+ //鍊间竴鏍�
+ continue;
+ }
+ oldProgressValue = nowProgressValue;
+ //鍙戦�佽繘搴﹀��
+ ((DimmableLight)this.device).SetLevel((int)(oldProgressValue * MaxLevel / 100.0));
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鍙戦�佸紑鍏冲懡浠______________________
+
+ /// <summary>
+ /// 鍙戦�佸紑鍏冲懡浠�
+ /// </summary>
+ /// <param name="isOpen"></param>
+ private void SetSwitchCommand(bool isOpen)
+ {
+ //褰撴寜涓嬪紑鍏虫寜閽椂,涓嶈兘鍐嶅彂閫佽繘搴﹀��
+ this.canSetProgressValue = false;
+
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == false)
+ {
+ bool statu = ((LightBase)this.device).OnOffStatus == 1;
+ //鍒锋柊寮�鍏崇姸鎬�
+ this.RefreshSwitchStatu(statu);
+ if (statu == true)
+ {
+ //绛夊緟缁撴灉缁撴潫鍚�,褰╃伅鎺т欢鍙互婊戝姩
+ waveSeekBar.IsClickable = true;
+ }
+ }
+ });
+ });
+
+ //鐘舵�佸彇鍙�
+ listControl[0].IsSelected = !listControl[0].IsSelected;
+ //鍙戦�佺瓑寰呯殑鏃堕棿鍐�,涓嶈兘婊戝姩褰╃伅鎺т欢
+ waveSeekBar.IsClickable = false;
+ if (isOpen == true)
+ {
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
+ }
+ else
+ {
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ }
+
+ if (isOpen == true)
+ {
+ //鎵撳紑
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
+ this.device.SwitchControl(1);
+ }
+ else
+ {
+ //鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ this.device.SwitchControl(0);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
+
+ /// <summary>
+ /// 妫�娴嬬綉鍏崇殑鍙嶉缁撴灉(灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport)
+ /// </summary>
+ /// <param name="comandDiv">鍛戒护鍖哄垎</param>
+ /// <param name="report">涓婃姤鏁版嵁</param>
+ /// <returns></returns>
+ public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ if (comandDiv == ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉)
+ {
+ return true;
+ }
+ else if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒锋柊寮�鍏崇姸鎬�
+ this.RefreshSwitchStatu(((LightBase)this.device).OnOffStatus == 1);
+ });
+ }
+ return false;
+ }
+
+ #endregion
+
+ #region 鈻� 鍒锋柊寮�鍏崇姸鎬乢______________________
+
+ /// <summary>
+ /// 鍒锋柊寮�鍏崇姸鎬�
+ /// </summary>
+ /// <param name="isOpen">鎵撳紑鐘舵��</param>
+ private void RefreshSwitchStatu(bool isOpen)
+ {
+ if (isOpen == true)
+ {
+ //浜害鏄繀椤昏鍒锋柊鐨� 浜害 XX
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uBrightness) + " " + HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ if (this.isProgressing == false)
+ {
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ waveSeekBar.Progress = (int)(((DimmableLight)this.device).Level * 1.0 / MaxLevel * 100);
+ }
+ }
+ if (isOpen == false && this.IsLightOpen == true)
+ {
+ //鐘舵�佷笉涓�鏍�,鎵嶅彉鏇村瓧鏍�:鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ }
+
+ if (listControl[0].IsSelected != isOpen)
+ {
+ //寮�鍏崇姸鎬佸彉鏇�
+ listControl[0].IsSelected = isOpen;
+ }
+
+ //鐘舵�佷笉涓�鏍锋墠鍙樻洿
+ if (this.IsLightOpen != isOpen)
+ {
+ if (isOpen == true)
+ {
+ waveSeekBar.IsClickable = true;
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarColor_Start, ZigbeeColor.Current.GXCWaveSeekBarColor_End);
+ }
+ else
+ {
+ waveSeekBar.IsClickable = false;
+ waveSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
+ }
+ }
+ this.IsLightOpen = isOpen;
+ //鍥炲鐨勭粨鏋滆,澶勪簬鎵撳紑鐘舵�佹墠鑳藉彂閫�
+ this.canSetProgressValue = this.IsLightOpen;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
new file mode 100755
index 0000000..8fb999c
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -0,0 +1,372 @@
+锘縰sing Shared.Common;
+using Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage.ControlForm
+{
+ /// <summary>
+ /// 绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ /// </summary>
+ public class DeviceCurtainDetailCardForm : DeviceDetailCardCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鎵撳紑鎺т欢
+ /// </summary>
+ private IconBigViewControl btnOpen = null;
+ /// <summary>
+ /// 鍋滄鎺т欢
+ /// </summary>
+ private IconBigViewControl btnStop = null;
+ /// <summary>
+ /// 鍏抽棴鎺т欢
+ /// </summary>
+ private IconBigViewControl btnClose = null;
+ /// <summary>
+ /// 绐楀笜绫诲瀷 4锛氬紑鍚堝笜 0锛氬嵎甯�
+ /// </summary>
+ private int WcdType = -2;
+ /// <summary>
+ /// 寮�鍚堝笜鎺т欢
+ /// </summary>
+ private CurtainSeekBar SeekBarOpenCurtain = null;
+ /// <summary>
+ /// 鍗峰笜鎺т欢
+ /// </summary>
+ private CurtainRollSeekBar SeekBarSiphonateCurtain = null;
+ /// <summary>
+ /// 杩涘害鍊兼槸鍚﹀湪鏀瑰彉涓�
+ /// </summary>
+ private bool isProgressing = false;
+ /// <summary>
+ /// 鏄惁宸茬粡鍒濆鍖栦簡鎺т欢(鍥犱负搴曞眰鏈夊彲鑳戒細鍒锋柊鏁翠釜鐣岄潰)
+ /// </summary>
+ private bool hadInitControl = false;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
+ {
+ //宸︽粦涓嶈兘
+ this.ScrollEnabled = false;
+ this.WcdType = ((Rollershade)this.device).WcdType;
+ //璁剧疆鐘舵�佹枃瀛�
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+
+ if (WcdType == 0)
+ {
+ //鍒濆鍖栧嵎甯樻帶浠�
+ this.InitSiphonateCurtainControl(frameWhiteBack);
+ }
+ else
+ {
+ //鍒濆鍖栧紑鍚堝笜鎺т欢
+ this.InitOpenCurtainControl(frameWhiteBack);
+ }
+
+ //鎵撳紑鎺т欢
+ this.btnOpen = new IconBigViewControl(81, 81);
+ btnOpen.btnIcon.UseClickStatu = true;
+ frameWhiteBack.AddChidren(btnOpen);
+ btnOpen.InitControl();
+ btnOpen.X = Application.GetRealWidth(253) - btnOpen.XOffset;
+ btnOpen.Y = Application.GetRealHeight(994) - btnOpen.YOffset;
+ btnOpen.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佺獥甯樺懡浠�
+ this.SetCurtainCommand(0);
+ };
+
+ //鍋滄鎺т欢
+ this.btnStop = new IconBigViewControl(81, 81);
+ btnStop.btnIcon.UseClickStatu = true;
+ btnStop.UnSelectedImagePath = "RollerShade/Stop.png";
+ btnStop.SelectedImagePath = "RollerShade/StopSelected.png";
+ frameWhiteBack.AddChidren(btnStop);
+ btnStop.InitControl();
+ btnStop.X = btnOpen.Right + Application.GetRealWidth(109) - btnOpen.XOffset;
+ btnStop.Y = btnOpen.Y;
+ btnStop.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佺獥甯樺懡浠�
+ this.SetCurtainCommand(2);
+ };
+
+ //鍏抽棴
+ this.btnClose = new IconBigViewControl(81, 81);
+ btnClose.btnIcon.UseClickStatu = true;
+ frameWhiteBack.AddChidren(btnClose);
+ btnClose.InitControl();
+ btnClose.X = btnStop.Right + Application.GetRealWidth(109) - btnOpen.XOffset;
+ btnClose.Y = btnOpen.Y;
+ btnClose.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佺獥甯樺懡浠�
+ this.SetCurtainCommand(1);
+ };
+
+ if (this.WcdType == 0)
+ {
+ btnOpen.UnSelectedImagePath = "RollerShade/Up.png";
+ btnOpen.SelectedImagePath = "RollerShade/UpSelected.png";
+ btnClose.UnSelectedImagePath = "RollerShade/Down.png";
+ btnClose.SelectedImagePath = "RollerShade/DownSelected.png";
+ }
+ else
+ {
+ btnOpen.UnSelectedImagePath = "RollerShade/Open.png";
+ btnOpen.SelectedImagePath = "RollerShade/OpenSelected.png";
+ btnClose.UnSelectedImagePath = "RollerShade/Close.png";
+ btnClose.SelectedImagePath = "RollerShade/CloseSelected.png";
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栧嵎甯樻帶浠禵____________________
+
+ /// <summary>
+ /// 鍒濆鍖栧嵎甯樻帶浠�
+ /// </summary>
+ private void InitSiphonateCurtainControl(FrameLayout frameWhiteBack)
+ {
+ //鍗峰笜鎺т欢
+ this.SeekBarSiphonateCurtain = new CurtainRollSeekBar();
+ SeekBarSiphonateCurtain.Y = Application.GetRealHeight(300);
+ SeekBarSiphonateCurtain.Width = Application.GetMinRealAverage(438);
+ SeekBarSiphonateCurtain.Height = Application.GetMinRealAverage(576);
+ SeekBarSiphonateCurtain.Gravity = Gravity.CenterHorizontal;
+ SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
+ frameWhiteBack.AddChidren(SeekBarSiphonateCurtain);
+ SeekBarSiphonateCurtain.IsProgressTextShow = false;
+ SeekBarSiphonateCurtain.CurtainPaddingTop = Application.GetRealHeight(110);
+
+ //鍗峰笜鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
+ int progressY = SeekBarSiphonateCurtain.Y - Application.GetMinReal(204);
+ var btnProgress = new NormalViewControl(Application.GetMinReal(135), Application.GetMinReal(104), false);
+ btnProgress.Y = progressY;
+ btnProgress.UnSelectedImagePath = "Item/ProgressBubbles.png";
+ btnProgress.IsBold = true;
+ btnProgress.TextColor = UserCenterColor.Current.White;
+ btnProgress.Gravity = Gravity.CenterHorizontal;
+ btnProgress.TextAlignment = TextAlignment.Center;
+ frameWhiteBack.AddChidren(btnProgress);
+ btnProgress.Visible = false;
+
+ //寮�濮嬫粦鍔ㄤ簨浠�
+ SeekBarSiphonateCurtain.OnStartTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬪彉鏇�
+ this.isProgressing = true;
+ //鍙樻洿杩涘害鐧惧垎姣旂殑鏄剧ず
+ btnProgress.Y = progressY + SeekBarSiphonateCurtain.NowProgressY;
+ btnProgress.Text = SeekBarSiphonateCurtain.Progress + "%";
+ if (btnProgress.Visible == false)
+ {
+ btnProgress.Visible = true;
+ }
+ };
+
+ //缁撴潫婊戝姩浜嬩欢
+ SeekBarSiphonateCurtain.OnStopTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬬粨鏉�
+ this.isProgressing = false;
+ btnProgress.Visible = false;
+ };
+
+ //婊戝姩杩囩▼涓�
+ int oldProgressValue = SeekBarSiphonateCurtain.Progress;//涔嬪墠鐨勫��
+ int nowProgressValue = oldProgressValue;//鍙樻洿鐨勫��
+ SeekBarSiphonateCurtain.OnProgressChangedEvent += (send2, value) =>
+ {
+ //鍙樻洿杩涘害鐧惧垎姣旂殑鏄剧ず
+ btnProgress.Y = progressY + SeekBarSiphonateCurtain.NowProgressY;
+ btnProgress.Text = value + "%";
+ nowProgressValue = value;
+ };
+
+ if (this.hadInitControl == true)
+ {
+ //宸茬粡瀹屾垚鍒濆鍖�
+ return;
+ }
+ this.hadInitControl = true;
+
+ //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ while (this.Parent != null)
+ {
+ System.Threading.Thread.Sleep(1000);
+ if (nowProgressValue == oldProgressValue)
+ {
+ //鍊间竴鏍�
+ continue;
+ }
+ oldProgressValue = nowProgressValue;
+ //鍙戦�佽繘搴﹀��
+ (device as Rollershade).WcdGoToTiltValue(oldProgressValue);
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栧紑鍚堝笜鎺т欢___________________
+
+ /// <summary>
+ /// 鍒濆鍖栧紑鍚堝笜鎺т欢
+ /// </summary>
+ private void InitOpenCurtainControl(FrameLayout frameWhiteBack)
+ {
+ //寮�鍚堝笜鎺т欢
+ this.SeekBarOpenCurtain = new CurtainSeekBar();
+ SeekBarOpenCurtain.Y = Application.GetRealHeight(334);
+ SeekBarOpenCurtain.Width = Application.GetMinRealAverage(570);
+ SeekBarOpenCurtain.Height = Application.GetMinRealAverage(513);
+ SeekBarOpenCurtain.Gravity = Gravity.CenterHorizontal;
+ SeekBarOpenCurtain.IsProgressTextShow = false;
+ SeekBarOpenCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
+ frameWhiteBack.AddChidren(SeekBarOpenCurtain);
+
+ //寮�鍚堝笜鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
+ int progressX = SeekBarOpenCurtain.X - Application.GetMinReal(20);
+ var btnProgress = new NormalViewControl(Application.GetMinReal(135), Application.GetMinReal(104), false);
+ btnProgress.X = progressX;
+ btnProgress.Y = SeekBarOpenCurtain.Y + SeekBarOpenCurtain.Height / 2 - Application.GetMinReal(180);
+ btnProgress.UnSelectedImagePath = "Item/ProgressBubbles.png";
+ btnProgress.IsBold = true;
+ btnProgress.TextColor = UserCenterColor.Current.White;
+ btnProgress.TextAlignment = TextAlignment.Center;
+ frameWhiteBack.AddChidren(btnProgress);
+ btnProgress.Visible = false;
+
+ //寮�濮嬫粦鍔ㄧ殑浜嬩欢
+ SeekBarOpenCurtain.OnStartTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬪彉鏇�
+ this.isProgressing = true;
+ btnProgress.X = progressX + SeekBarOpenCurtain.NowProgressX - Application.GetMinReal(5);
+ btnProgress.Text = SeekBarOpenCurtain.Progress + "%";
+ if (btnProgress.Visible == false)
+ {
+ btnProgress.Visible = true;
+ }
+ };
+
+ //缁撴潫婊戝姩鐨勪簨浠�
+ SeekBarOpenCurtain.OnStopTrackingTouchEvent += (sender, e) =>
+ {
+ //杩涘害鍊煎紑濮嬬粨鏉�
+ this.isProgressing = false;
+ btnProgress.Visible = false;
+ };
+
+ //婊戝姩杩囩▼涓�
+ int oldProgressValue = SeekBarOpenCurtain.Progress;//涔嬪墠鐨勫��
+ int nowProgressValue = oldProgressValue;//鍙樻洿鐨勫��
+ SeekBarOpenCurtain.OnProgressChangedEvent += (sender, value) =>
+ {
+ btnProgress.X = progressX + SeekBarOpenCurtain.NowProgressX - Application.GetMinReal(5);
+ btnProgress.Text = value + "%";
+ nowProgressValue = value;
+ };
+
+ //寮�涓�涓嚎绋�,鐩戣鏄惁婊戝姩鐨勬粦鍔ㄦ潯,姣忕妫�娴嬩竴娆�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ while (this.Parent != null)
+ {
+ System.Threading.Thread.Sleep(1000);
+ if (nowProgressValue == oldProgressValue)
+ {
+ //鍊间竴鏍�
+ continue;
+ }
+ oldProgressValue = nowProgressValue;
+ //鍙戦�佽繘搴﹀��
+ (device as Rollershade).WcdGoToTiltValue(oldProgressValue);
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鍙戦�佺獥甯樺懡浠______________________
+
+ /// <summary>
+ /// 鍙戦�佺獥甯樺懡浠�
+ /// </summary>
+ /// <param name="comand"></param>
+ private void SetCurtainCommand(int comand)
+ {
+ //鍦ㄦ病鏈夋帴鏀跺埌鍙嶉涔嬪墠,涓嶈兘鍐嶇偣鍑�
+ this.btnClose.CanClick = false;
+ this.btnOpen.CanClick = false;
+ this.btnStop.CanClick = false;
+
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
+ {
+ //鏃堕棿缁撴潫,鍙互鍐嶆鐐瑰嚮
+ this.btnClose.CanClick = true;
+ this.btnOpen.CanClick = true;
+ this.btnStop.CanClick = true;
+ });
+ //鍙戦�佸懡浠�
+ ((Rollershade)device).CurtainUpDownStopControl(comand);
+ }
+
+ #endregion
+
+ #region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
+
+ /// <summary>
+ /// 妫�娴嬬綉鍏崇殑鍙嶉缁撴灉(灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport)
+ /// </summary>
+ /// <param name="comandDiv">鍛戒护鍖哄垎</param>
+ /// <param name="report">涓婃姤鏁版嵁</param>
+ /// <returns></returns>
+ public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ if (comandDiv == ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉)
+ {
+ return true;
+ }
+ else if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆鐘舵�佹枃瀛�
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ if (this.isProgressing == false)
+ {
+ //褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
+ if (this.WcdType == 0)
+ {
+ SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
+ }
+ else
+ {
+ SeekBarOpenCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
+ }
+ }
+ });
+ }
+ return false;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceRelayDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceRelayDetailCardForm.cs
new file mode 100755
index 0000000..542282a
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceRelayDetailCardForm.cs
@@ -0,0 +1,308 @@
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage.ControlForm
+{
+ /// <summary>
+ /// 缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ /// </summary>
+ public class DeviceRelayDetailCardForm : DeviceDetailCardCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
+ /// </summary>
+ private List<ButtonBase> listControl = new List<ButtonBase>();
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 搴曞眰鍒濆鍖栦腑閮ㄦ帶浠跺畬鎴愪箣鍚�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
+ {
+ //鍏堟竻绌�
+ this.listControl = new List<ButtonBase>();
+
+ if (this.device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ //鍒濆鍖栧紑鍏崇被鍨嬫帶浠�
+ this.InitSwitchControl(frameWhiteBack);
+ }
+ else if (this.device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ //鍒濆鍖栨彃搴х被鍨嬫帶浠�
+ this.InitPlugControl(frameWhiteBack);
+ }
+ else
+ {
+ //鍒濆鍖栫伅鍏夌被鍨嬫帶浠�
+ this.InitLightControl(frameWhiteBack);
+ }
+ //璁剧疆鐘舵�佹枃瀛�
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栫伅鍏夌被鍨媉____________________
+
+ /// <summary>
+ /// 鍒濆鍖栫伅鍏夌被鍨嬫帶浠�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ private void InitLightControl(FrameLayout frameWhiteBack)
+ {
+ //鐏厜鍥剧墖
+ var picLight = new PicViewControl(377, 435);
+ picLight.Y = Application.GetRealHeight(389);
+ picLight.UnSelectedImagePath = "Light/DeskLamp.png";
+ picLight.SelectedImagePath = "Light/DeskLampSelected.png";
+ picLight.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(picLight);
+ listControl.Add(picLight);
+
+ //寮�鍏�
+ var btnSwitch = new IconViewControl(81);
+ btnSwitch.UnSelectedImagePath = "Item/Switch.png";
+ btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
+ btnSwitch.Y = picLight.Bottom + Application.GetRealHeight(173);
+ btnSwitch.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(btnSwitch);
+ listControl.Add(btnSwitch);
+
+ //璁剧疆鍒濆鐘舵��
+ if (((LightBase)this.device).OnOffStatus == 1)
+ {
+ picLight.IsSelected = true;
+ btnSwitch.IsSelected = true;
+ }
+
+ picLight.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(!picLight.IsSelected);
+ };
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(!btnSwitch.IsSelected);
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栧紑鍏崇被鍨媉____________________
+
+ /// <summary>
+ /// 鍒濆鍖栧紑鍏崇被鍨嬫帶浠�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ private void InitSwitchControl(FrameLayout frameWhiteBack)
+ {
+ //寮�鍏崇殑鑳屾櫙鍥剧墖
+ var picSwitchBack = new FrameLayout();
+ picSwitchBack.Height = Application.GetMinRealAverage(579);
+ picSwitchBack.Width = Application.GetMinRealAverage(579);
+ picSwitchBack.Y = Application.GetRealHeight(340);
+ picSwitchBack.BackgroundImagePath = "Light/OnOff.png";
+ picSwitchBack.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(picSwitchBack);
+
+ //鍏抽棴
+ var btnClose = new IconViewControl(81);
+ btnClose.UnSelectedImagePath = "Light/OFF.png";
+ btnClose.SelectedImagePath = "Light/OFFSelected.png";
+ btnClose.X = Application.GetMinRealAverage(101);
+ btnClose.Y = Application.GetMinRealAverage(248);
+ picSwitchBack.AddChidren(btnClose);
+ listControl.Add(btnClose);
+
+ //鎵撳紑
+ var btnOpen = new IconViewControl(81);
+ btnOpen.UnSelectedImagePath = "Light/ON.png";
+ btnOpen.SelectedImagePath = "Light/ONSelected.png";
+ btnOpen.X = Application.GetMinRealAverage(397);
+ btnOpen.Y = btnClose.Y;
+ picSwitchBack.AddChidren(btnOpen);
+ listControl.Add(btnOpen);
+
+ //璁剧疆鍒濆鐘舵��
+ if (((LightBase)this.device).OnOffStatus == 1)
+ {
+ btnOpen.IsSelected = true;
+ }
+ else
+ {
+ btnClose.IsSelected = true;
+ }
+
+ btnClose.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnClose.IsSelected == true) { return; }
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(false);
+ };
+ btnOpen.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnOpen.IsSelected == true) { return; }
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(true);
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖栨彃搴х被鍨媉____________________
+
+ /// <summary>
+ /// 鍒濆鍖栨彃搴х被鍨嬫帶浠�
+ /// </summary>
+ /// <param name="frameWhiteBack"></param>
+ private void InitPlugControl(FrameLayout frameWhiteBack)
+ {
+ //鎻掑骇鍥剧墖
+ var picPlug = new PicViewControl(567, 567);
+ picPlug.Y = Application.GetRealHeight(334);
+ picPlug.UnSelectedImagePath = "Light/Plug.png";
+ picPlug.SelectedImagePath = "Light/PlugSelected.png";
+ picPlug.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(picPlug);
+ listControl.Add(picPlug);
+
+ //寮�鍏�
+ var btnSwitch = new IconViewControl(81);
+ btnSwitch.UnSelectedImagePath = "Item/Switch.png";
+ btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
+ btnSwitch.Y = picPlug.Bottom + Application.GetRealHeight(89);
+ btnSwitch.Gravity = Gravity.CenterHorizontal;
+ frameWhiteBack.AddChidren(btnSwitch);
+ listControl.Add(btnSwitch);
+
+ //璁剧疆鍒濆鐘舵��
+ if (((LightBase)this.device).OnOffStatus == 1)
+ {
+ picPlug.IsSelected = true;
+ btnSwitch.IsSelected = true;
+ }
+
+ picPlug.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(!picPlug.IsSelected);
+ };
+ btnSwitch.ButtonClickEvent += (sender, e) =>
+ {
+ //鍙戦�佸紑鍏冲懡浠�
+ this.SetSwitchCommand(!btnSwitch.IsSelected);
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鍒锋柊寮�鍏崇姸鎬乢______________________
+
+ /// <summary>
+ /// 鍒锋柊寮�鍏崇姸鎬�
+ /// </summary>
+ /// <param name="isOpen">鎵撳紑鐘舵��</param>
+ private void RefreshSwitchStatu(bool isOpen)
+ {
+ //鐘舵�佷竴鑷�(绗簩绱㈠紩鐨勬帶浠跺鏋滄槸閫夋嫨鐘舵��,鍒欏繀瀹氫负寮�鐘舵��)
+ if (listControl[1].IsSelected == isOpen) { return; }
+
+ //鍙樻洿鐘舵��
+ if (this.device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ //寮�鐘舵��
+ listControl[1].IsSelected = isOpen;
+ //鍏崇姸鎬� 鍙栧弽寮�鐘舵��
+ listControl[0].IsSelected = !isOpen;
+ }
+ else
+ {
+ //寮�鍏充互澶�
+ listControl[0].IsSelected = isOpen;
+ listControl[1].IsSelected = isOpen;
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
+
+ /// <summary>
+ /// 妫�娴嬬綉鍏崇殑鍙嶉缁撴灉(灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport)
+ /// </summary>
+ /// <param name="comandDiv">鍛戒护鍖哄垎</param>
+ /// <param name="report">涓婃姤鏁版嵁</param>
+ /// <returns></returns>
+ public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ if (comandDiv == ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉)
+ {
+ return true;
+ }
+ else if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍙樻洿鍗＄墖鐘舵��
+ this.RefreshSwitchStatu(((LightBase)this.device).OnOffStatus == 1);
+ //璁剧疆鐘舵�佹枃瀛�
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ });
+ }
+ return false;
+ }
+
+ #endregion
+
+ #region 鈻� 鍙戦�佸紑鍏冲懡浠______________________
+
+ /// <summary>
+ /// 鍙戦�佸紑鍏冲懡浠�
+ /// </summary>
+ /// <param name="isOpen"></param>
+ private void SetSwitchCommand(bool isOpen)
+ {
+ //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
+ this.StartCheckResponeResult(this.listControl, (result) =>
+ {
+ //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆鐘舵�佹枃瀛�
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ });
+ }
+ });
+ //鍙樻洿鍗＄墖鐘舵��
+ this.RefreshSwitchStatu(isOpen);
+
+ if (isOpen == true)
+ {
+ //鎵撳紑
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
+ this.device.SwitchControl(1);
+ }
+ else
+ {
+ //鍏抽棴
+ this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
+ this.device.SwitchControl(0);
+ }
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index 9ecbb97..5868b0d 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -197,6 +197,12 @@
Common.LocalDevice.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
+ if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
+ {
+ //濡傛灉杩欎釜鍗＄墖鏈夊紑鍏冲姛鑳�,骞朵笖缃戝叧杩樻病鏈夊洖澶嶄箣鍓�,榛樿鏄叧闂姸鎬�
+ //绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
+ isOpen = false;
+ }
this.SetCardOpenStatu(isOpen);
}
@@ -303,19 +309,24 @@
/// <param name="room">鎴块棿</param>
public void CardDetailInfoBackEvent(CommonDevice device, Common.Room room)
{
- //濡傛灉鏄富椤靛彇娑堟悳钘忕殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
- if (HdlRoomLogic.Current.CurrentRoom.IsLove
- && HdlRoomLogic.Current.IsCollectInRoom(device) == false)
+ if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
{
- this.CardNeedRemoveEvent?.Invoke();
- return;
+ //濡傛灉鏄富椤靛彇娑堟悳钘忕殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
+ if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)
+ {
+ this.CardNeedRemoveEvent?.Invoke();
+ return;
+ }
}
- //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
- var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
- if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+ else
{
- this.CardNeedRemoveEvent?.Invoke();
- return;
+ //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
+ var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
+ if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+ {
+ this.CardNeedRemoveEvent?.Invoke();
+ return;
+ }
}
//濡傛灉瀹冭繕鍦ㄨ繖涓埧闂寸殑璇�,鍒锋柊鍗＄墖淇℃伅
this.RefreshControlInfo(device);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
index 343c2df..7094af3 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
@@ -60,12 +60,12 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Phone.Device.AC.ACControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.IsDrawerLockMode = true;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
+ //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new ControlForm.DeviceAcDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
index c028337..59f0a9a 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
@@ -60,12 +60,26 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Phone.Device.Light.AirSwitchControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.IsDrawerLockMode = true;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
+ int backHeight = 0;
+ if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ backHeight = 1290;
+ }
+ else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ backHeight = 1290;
+ }
+ else
+ {
+ backHeight = 1316;
+ }
+
+ //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ var form = new ControlForm.DeviceRelayDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index f764ca3..46e3cf1 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -60,12 +60,12 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var dimmableLightControl = new Phone.Device.Light.DimmableLightControl();
- UserView.HomePage.Instance.AddChidren(dimmableLightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- dimmableLightControl.IsDrawerLockMode = true;
- dimmableLightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- dimmableLightControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
+ //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
+ var form = new ControlForm.DeviceColorLightDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
index a5ac473..8944a09 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
@@ -60,13 +60,11 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
- UserView.HomePage.Instance.AddChidren(rollerShadeControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- rollerShadeControl.IsDrawerLockMode = true;
- rollerShadeControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- rollerShadeControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+ //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new ControlForm.DeviceCurtainDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
index b4c470e..5e9c574 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
@@ -36,6 +36,8 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device);
userDoorLockPage.IsDrawerLockMode = true;
UserView.HomePage.Instance.AddChidren(userDoorLockPage);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDryContactCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDryContactCardControl.cs
deleted file mode 100755
index 2b0ef1a..0000000
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDryContactCardControl.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.MainPage.Controls
-{
- /// <summary>
- /// 骞叉帴鐐瑰崱鐗囨帶浠�(鏆傛椂搴熸)
- /// </summary>
- public class DeviceDryContactCardControl: DeviceCardCommon
- {
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鍒濆鍖栨帶浠�
- /// </summary>
- /// <param name="i_device"></param>
- public override void InitControl(CommonDevice i_device)
- {
- base.InitControl(i_device);
-
- //娣诲姞寮�鍏虫帶浠�
- var btnSwitch = this.AddSwitchControl();
- btnSwitch.ButtonClickEvent += (sender, e) =>
- {
- bool setStatu = !btnSwitch.IsSelected;
- //鍙樻洿鍗＄墖鐘舵��
- this.SetCardOpenStatu(setStatu);
- //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
- this.StartCheckResponeResult(!setStatu);
-
- if (setStatu == true)
- {
- //鎵撳紑
- this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
- i_device.SwitchControl(1);
- }
- else
- {
- //鍏抽棴
- this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.Close));
- i_device.SwitchControl(0);
- }
- };
- }
-
- #endregion
-
- #region 鈻� 妫�娴嬭澶囨墦寮�鐘舵�乢__________________
-
- /// <summary>
- /// 妫�娴嬭澶囨墦寮�鐘舵��
- /// </summary>
- /// <param name="i_device"></param>
- /// <returns></returns>
- public override bool CheckIsOpenStatu(CommonDevice i_device)
- {
- return true;
- //return ((LightBase)i_device).OnOffStatus == 1;
- }
-
- #endregion
-
- #region 鈻� 鍙戦�佽幏鍙栫姸鎬佸懡浠__________________
-
- /// <summary>
- /// 鍙戦�佽幏鍙栫姸鎬佸懡浠�
- /// </summary>
- public override void SendStatuComand()
- {
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendLightStatuComand(this.device);
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
index 82b698e..2b5184e 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
@@ -60,12 +60,26 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Phone.Device.Light.OnOffControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.IsDrawerLockMode = true;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+
+ int backHeight = 0;
+ if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ backHeight = 1290;
+ }
+ else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ backHeight = 1290;
+ }
+ else
+ {
+ backHeight = 1316;
+ }
+
+ //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ var form = new ControlForm.DeviceRelayDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
index d0773fd..ae4657c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/ListRoomCardControl.cs
@@ -24,6 +24,10 @@
/// 鎴块棿鍚嶇О鎺т欢
/// </summary>
private NormalViewControl btnRoomName = null;
+ /// <summary>
+ /// 鎴块棿鍚嶅瓧鐨勮儗鏅�
+ /// </summary>
+ private NormalViewControl btnRoomNameBackGroud = null;
#endregion
@@ -66,14 +70,29 @@
frameBack.BackgroundColor = 0x33000000;
this.AddChidren(picRoom, ChidrenBindMode.BindEventOnly);
+ ////鎴块棿鍚嶅瓧鐨勮儗鏅�
+ //var btnRoomNameBackGroud = new NormalViewControl(Application.GetRealWidth(141), Application.GetRealHeight(84), false);
+ //btnRoomNameBackGroud.X = Application.GetRealWidth(14);
+ //btnRoomNameBackGroud.UnSelectedImagePath = "Room/RoomCardView_Name.png";
+ //this.AddChidren(btnRoomNameBackGroud, ChidrenBindMode.BindEventOnly);
+
+ ////鎴块棿鍚嶅瓧
+ //this.btnRoomName = new NormalViewControl(btnRoomNameBackGroud.Width, btnRoomNameBackGroud.Height, false);
+ //btnRoomName.X = Application.GetRealWidth(14);
+ //btnRoomName.TextSize = 12;
+ //btnRoomName.IsBold = true;
+ //btnRoomName.TextAlignment = TextAlignment.Center;
+ //btnRoomName.TextColor = UserCenterColor.Current.White;
+ //this.AddChidren(btnRoomName, ChidrenBindMode.BindEventOnly);
+
//鎴块棿鍚嶅瓧鐨勮儗鏅�
- var btnRoomNameBackGroud = new NormalViewControl(Application.GetRealWidth(141), Application.GetRealHeight(84), false);
+ this.btnRoomNameBackGroud = new NormalViewControl(Application.GetRealWidth(141), Application.GetRealHeight(84), false);
btnRoomNameBackGroud.X = Application.GetRealWidth(14);
- btnRoomNameBackGroud.UnSelectedImagePath = "Room/RoomCardView_Name.png";
+ btnRoomNameBackGroud.BackgroundColor = 0x80000000;
this.AddChidren(btnRoomNameBackGroud, ChidrenBindMode.BindEventOnly);
//鎴块棿鍚嶅瓧
- this.btnRoomName = new NormalViewControl(btnRoomNameBackGroud.Width, btnRoomNameBackGroud.Height, false);
+ this.btnRoomName = new NormalViewControl(50, Application.GetRealHeight(84), false);
btnRoomName.X = Application.GetRealWidth(14);
btnRoomName.TextSize = 12;
btnRoomName.IsBold = true;
@@ -99,15 +118,19 @@
{
//鍒锋柊鍚嶅瓧
btnRoomName.Text = room.Name;
- if (btnRoomName.GetRealWidthByText() > Application.GetRealWidth(141))
+ int realWidth = btnRoomName.GetRealWidthByText() + Application.GetRealWidth(70);
+ if (realWidth < Application.GetRealWidth(141))
{
- //瀛椾綋闀垮害瓒呰繃
- btnRoomName.TextAlignment = TextAlignment.CenterLeft;
+ realWidth = Application.GetRealWidth(141);
}
- else
+ else if (realWidth > Application.GetRealWidth(420))
{
- btnRoomName.TextAlignment = TextAlignment.Center;
+ realWidth = Application.GetRealWidth(420);
}
+ btnRoomName.Width = realWidth;
+ btnRoomNameBackGroud.Width = realWidth;
+ btnRoomNameBackGroud.SetCornerWithSameRadius(picRoom.Radius, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomRight);
+
//鍒锋柊鍥剧墖
if (room.BackgroundImageType == 0)
{
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
new file mode 100755
index 0000000..71524d2
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -0,0 +1,437 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using Shared.Common;
+using Shared.Phone.UserCenter;
+using ZigBee.Device;
+
+namespace Shared.Phone.MainPage
+{
+ /// <summary>
+ /// 涓婚〉鐨勮澶囦俊鎭晫闈�
+ /// </summary>
+ public class DeviceDetailInfoForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴浜嬩欢(璇ヤ簨浠剁洰鍓嶇粰鍒嗙被鐣岄潰鐨勮嚜瀹氫箟琛屾帶浠朵娇鐢�)
+ /// </summary>
+ public Action<CommonDevice, Room> FormCloseEvent = null;
+ /// <summary>
+ /// 璁惧瀵硅薄
+ /// </summary>
+ private CommonDevice device;
+ /// <summary>
+ /// 鎴块棿瀵硅薄(杩欎釜鎴块棿鏈夊彲鑳芥槸鍠滅埍)
+ /// </summary>
+ private Room room = null;
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listview = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_device">璁惧瀵硅薄</param>
+ /// <param name="i_room">鎴块棿瀵硅薄(杩欎釜鎴块棿鏈夊彲鑳芥槸鍠滅埍)</param>
+ public void ShowForm(CommonDevice i_device, Room i_room)
+ {
+ this.device = i_device;
+ this.room = i_room;
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.FunctionSetting));
+
+ //涓讳汉鍜岀鐞嗗憳鎵嶈兘鏇存敼
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�(涓讳汉,绠＄悊鍛�)
+ this.InitMiddleFrameByAdmin();
+ }
+ //鎴愬憳涓嶅厑璁稿彉鏇�
+ else
+ {
+ //鍒濆鍖栦腑閮ㄦ帶浠�(鎴愬憳)
+ this.InitMiddleFrameByMember();
+ }
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�(涓讳汉,绠＄悊鍛�)
+ /// </summary>
+ private void InitMiddleFrameByAdmin()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鍒濆鍖栨甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 418, 1319);
+
+ //鍥剧墖
+ var btnPic = new DeviceInfoIconControl();
+ btnPic.Y = Application.GetRealHeight(46);
+ btnPic.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnPic);
+ btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint);
+ btnPic.ButtonClickEvent += (sender, e) =>
+ {
+ var localPic = new Device.CommonForm.DeviceIconSelectedIMGByLocal();
+ UserView.HomePage.Instance.AddChidren(localPic);
+ UserView.HomePage.Instance.PageIndex += 1;
+ localPic.Show();
+ localPic.action = (unSelectedImagePath, selectedImagePath) =>
+ {
+ //鍙樻洿鍥剧墖
+ device.IconPath = unSelectedImagePath;
+ device.IsCustomizeImage = true;
+ device.ReSave();
+ //鍒锋柊鎺т欢
+ btnPic.RefreshControl();
+ };
+ };
+
+ //璁惧鎵�灞炵被鍨�
+ var infoType = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ var btnBelongType = new NormalViewControl(700, 62, true);
+ btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
+ btnBelongType.Gravity = Gravity.CenterHorizontal;
+ btnBelongType.TextID = infoType.BeloneTextId;
+ btnBelongType.TextSize = 15;
+ btnBelongType.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(btnBelongType);
+
+ //鍔熻兘鍚嶇О
+ string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
+ string deviceName = LocalDevice.Current.GetDeviceEpointName(device);
+ var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
+ listview.AddChidren(btnNote);
+ btnNote.InitControl();
+ //鍒掔嚎
+ btnNote.AddBottomLine();
+ btnNote.txtInput.FinishInputEvent += () =>
+ {
+ string oldName = LocalDevice.Current.GetDeviceEpointName(device);
+ if (btnNote.Text == string.Empty)
+ {
+ btnNote.Text = oldName;
+ }
+ if (oldName != btnNote.Text)
+ {
+ //淇敼鍚嶅瓧
+ this.DeviceReName(btnNote.Text, false);
+ }
+ };
+
+ //鍠滅埍鎴块棿涓嶅厑璁稿彉鏇村尯鍩�
+ if (this.room.IsLove == false)
+ {
+ //鎵�灞炲尯鍩�
+ var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
+ listview.AddChidren(rowBeloneArea);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.device);
+ //搴曠嚎
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
+ {
+ //鎴块棿閲嶆柊鑾峰彇
+ this.room = HdlRoomLogic.Current.GetRoomById(roomKeys);
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ };
+ }
+
+ //鎵�灞炴ā鍧�
+ caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
+ deviceName = Common.LocalDevice.Current.GetDeviceMacName(device);
+ var rowBelongModul = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
+ listview.AddChidren(rowBelongModul);
+ rowBelongModul.InitControl();
+ //鍒掔嚎
+ rowBelongModul.AddBottomLine();
+
+ //娣诲姞銆愬姛鑳界被鍨嬨�戣(涓讳汉,绠＄悊鍛�)
+ this.AddFunctionTypeRowByAdmin(btnBelongType);
+
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr = null;
+
+ //淇濆瓨
+ var btnFinish = new BottomClickButton();
+ btnFinish.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnFinish);
+ btnFinish.ButtonClickEvent += (sender, e) =>
+ {
+ string oldName = LocalDevice.Current.GetDeviceEpointName(device);
+ if (btnNote.Text.Trim() == string.Empty)
+ {
+ btnNote.Text = oldName;
+ }
+ if (oldName != btnNote.Text.Trim())
+ {
+ //淇敼鍚嶅瓧
+ this.DeviceReName(btnNote.Text.Trim(), true);
+ }
+ else
+ {
+ //鍏抽棴鑷韩
+ this.CloseForm();
+ }
+ };
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�(鎴愬憳)
+ /// </summary>
+ private void InitMiddleFrameByMember()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //鍒濆鍖栨甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 418, 1319);
+
+ //鍥剧墖
+ var btnPic = new DeviceInfoIconControl();
+ btnPic.Y = Application.GetRealHeight(92);
+ btnPic.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnPic);
+ btnPic.InitControl(device.DeviceAddr, device.DeviceEpoint);
+
+ //璁惧鎵�灞炵被鍨�
+ var infoType = LocalDevice.Current.GetDeviceBelongEnumInfo(device);
+ var btnBelongType = new NormalViewControl(700, 62, true);
+ btnBelongType.Y = btnPic.Bottom + Application.GetRealHeight(35);
+ btnBelongType.Gravity = Gravity.CenterHorizontal;
+ btnBelongType.TextID = infoType.BeloneTextId;
+ btnBelongType.TextSize = 15;
+ btnBelongType.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(btnBelongType);
+
+ //鍔熻兘鍚嶇О
+ string caption = Language.StringByID(R.MyInternationalizationString.FunctionName);
+ string nameValue = LocalDevice.Current.GetDeviceEpointName(device);
+ var btnNote = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
+ btnNote.UseClickStatu = false;
+ listview.AddChidren(btnNote);
+ btnNote.InitControl();
+ //鍒掔嚎
+ btnNote.AddBottomLine();
+
+ //鍠滅埍鎴块棿涓嶅厑璁稿嚭鐜板尯鍩�
+ if (this.room.IsLove == false)
+ {
+ //鎵�灞炲尯鍩�
+ caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);
+ nameValue = HdlRoomLogic.Current.GetRoomNameByDevice(device);
+ var rowBeloneArea = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
+ rowBeloneArea.UseClickStatu = false;
+ listview.AddChidren(rowBeloneArea);
+ rowBeloneArea.InitControl();
+ //鍒掔嚎
+ rowBeloneArea.AddBottomLine();
+ }
+
+ //鎵�灞炴ā鍧�
+ caption = Language.StringByID(R.MyInternationalizationString.BelongModel);
+ nameValue = Common.LocalDevice.Current.GetDeviceMacName(device);
+ var rowBelongModul = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
+ rowBelongModul.UseClickStatu = false;
+ listview.AddChidren(rowBelongModul);
+ rowBelongModul.InitControl();
+ //鍒掔嚎
+ rowBelongModul.AddBottomLine();
+
+ //娣诲姞銆愬姛鑳界被鍨嬨�戣(鎴愬憳)
+ this.AddFunctionTypeRowByMember();
+
+ //鍒濆鍖栨甯冨畬鎴�
+ tableContr.FinishInitControl(bodyFrameLayout, this.listview);
+ tableContr = null;
+ }
+
+ #endregion
+
+ #region 鈻� 鍔熻兘绫诲瀷___________________________
+
+ /// <summary>
+ /// 娣诲姞銆愬姛鑳界被鍨嬨�戣(涓讳汉,绠＄悊鍛�)
+ /// </summary>
+ private void AddFunctionTypeRowByAdmin(NormalViewControl btnBelongType)
+ {
+ //濡傛灉鏄户鐢靛櫒,绌烘皵寮�鍏�,璋冨厜鍣ㄧ殑璇�
+ if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight
+ || device.Type == DeviceType.ColorDimmableLight || device.Type == DeviceType.AirSwitch)
+ {
+ //鍔熻兘绫诲瀷鐨勭炕璇戝悕瀛�
+ int nowSelectNo = 1;
+ string strType = string.Empty;
+ if (this.device.DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uLight);
+ nowSelectNo = 1;
+ }
+ else if (this.device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
+ nowSelectNo = 0;
+ }
+ else if (this.device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
+ nowSelectNo = 2;
+ }
+ //鍔熻兘绫诲瀷
+ var btnFunction = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uFunctionType), strType, listview.rowSpace / 2);
+ btnFunction.UseClickStatu = false;
+ listview.AddChidren(btnFunction);
+ btnFunction.InitControl();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ //濡傛灉鏄┖姘斿紑鍏冲拰缁х數鍣�,鎵嶈兘淇敼
+ if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.AirSwitch)
+ {
+ //鍙崇澶�
+ btnFunction.AddRightArrow();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず鍒楄〃
+ var listText = new List<string>();
+ listText.Add(Language.StringByID(R.MyInternationalizationString.uSwitch));//寮�鍏�
+ listText.Add(Language.StringByID(R.MyInternationalizationString.uLight));//鐏厜
+ listText.Add(Language.StringByID(R.MyInternationalizationString.uSocket1));//鎻掑骇
+ //鏍囬:閫夋嫨鍔熻兘绫诲瀷
+ var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);
+
+ var form = new BottomItemSelectForm();
+ form.AddForm(title, listText, nowSelectNo);
+ form.FinishSelectEvent += (selectNo) =>
+ {
+ btnFunction.Text = listText[selectNo];
+ //褰撶被鍨嬪彉鏇存椂,澶翠笂鐨勭被鍨嬩篃涓�璧峰彉鏇�
+ btnBelongType.Text = listText[selectNo];
+ nowSelectNo = selectNo;
+ //璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
+ if (selectNo == 0)
+ {
+ this.device.DfunctionType = DeviceFunctionType.A寮�鍏�;
+ if (this.device.IsCustomizeImage == false)
+ {
+ //閲嶆柊璁剧疆鍥剧墖
+ this.device.IconPath = "Device/Switch.png";
+ }
+ }
+ else if (selectNo == 1)
+ {
+ this.device.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (this.device.IsCustomizeImage == false)
+ {
+ //閲嶆柊璁剧疆鍥剧墖
+ this.device.IconPath = "Device/Light.png";
+ }
+ }
+ else
+ {
+ this.device.DfunctionType = DeviceFunctionType.A鎻掑骇;
+ if (this.device.IsCustomizeImage == false)
+ {
+ //閲嶆柊璁剧疆鍥剧墖
+ this.device.IconPath = "Device/Socket1.png";
+ }
+ }
+ this.device.ReSave();
+ };
+ };
+ }
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞銆愬姛鑳界被鍨嬨�戣(鎴愬憳)
+ /// </summary>
+ private void AddFunctionTypeRowByMember()
+ {
+ //濡傛灉鏄户鐢靛櫒,绌烘皵寮�鍏�,璋冨厜鍣ㄧ殑璇�
+ if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight
+ || device.Type == DeviceType.ColorDimmableLight || device.Type == DeviceType.AirSwitch)
+ {
+ //鍔熻兘绫诲瀷鐨勭炕璇戝悕瀛�
+ string strType = string.Empty;
+ if (this.device.DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uLight);
+ }
+ else if (this.device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
+ }
+ else if (this.device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
+ }
+
+ //鍔熻兘绫诲瀷
+ var btnFunction = new FrameCaptionViewControl(Language.StringByID(R.MyInternationalizationString.uFunctionType), strType, listview.rowSpace / 2);
+ btnFunction.UseClickStatu = false;
+ listview.AddChidren(btnFunction);
+ btnFunction.InitControl();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 淇敼鍚嶅瓧___________________________
+
+ /// <summary>
+ /// 璁惧閲嶅懡鍚�
+ /// </summary>
+ /// <param name="i_deviceName">deviceName.</param>
+ private async void DeviceReName(string i_deviceName, bool closeForm)
+ {
+ //淇敼MAC鍚�
+ string deviceName = i_deviceName.Trim();
+ var result = await LocalDevice.Current.ReName(this.device, deviceName);
+ if (result == false)
+ {
+ return;
+ }
+ if (closeForm == true)
+ {
+ //鍏抽棴鐣岄潰
+ this.CloseForm();
+ }
+ else
+ {
+ //璁惧澶囨敞淇敼鎴愬姛!
+ string msg = Language.StringByID(R.MyInternationalizationString.uDeviceReNoteSuccess);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ this.FormCloseEvent?.Invoke(this.device, this.room);
+ this.FormCloseEvent = null;
+
+ base.CloseFormBefore();
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 2dfd8a5..9d850cb 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -16,6 +16,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 鏁翠釜鐣岄潰鐨勪笂涓嬫粦鍔ㄦ帶浠�
+ /// </summary>
+ private VerticalFrameControl listBodyContr = null;
+ /// <summary>
/// 鎴块棿鐨勬粦鍔ㄥ鍣ㄦ帶浠�
/// </summary>
private HorizontalPages roomPageView = null;
@@ -45,16 +49,23 @@
/// </summary>
public void ShowForm()
{
- //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰
- if (ListRoomViewFrom.Instance == null)
+ //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
+ if (ListRoomViewFrom.Instance == null) { }
+
+ //鏁翠釜鑳屾櫙鐨勪笂涓嬫粦鍔ㄦ帶浠�
+ if (this.listBodyContr == null)
{
- var roomList = new ListRoomViewFrom();
- CommonPage.Instance.AddLeftView(roomList);
- roomList.ShowForm();
+ this.listBodyContr = new VerticalFrameControl();
+ listBodyContr.Height = this.Height;
+ listBodyContr.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
+ this.AddChidren(listBodyContr);
}
- this.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- //娓呴櫎鍏ㄩ儴
- this.RemoveAll();
+ else
+ {
+ //娓呴櫎鍏ㄩ儴
+ this.listBodyContr.frameTable.RemoveAll();
+ listBodyContr.RecoverTableHeight();
+ }
//鍒濆鍖栧ご閮ㄦ帶浠�
this.InitTopFrameLayoutControl();
@@ -78,23 +89,26 @@
topFrameLayout.Y = Application.GetRealHeight(60);
topFrameLayout.Height = Application.GetRealHeight(127);
topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
- this.AddChidren(topFrameLayout);
+ listBodyContr.frameTable.AddChidren(topFrameLayout);
+
+ //妤煎眰鍥炬爣
+ var btnFloorIcon = new IconViewControl(69);
+ btnFloorIcon.X = ControlCommonResourse.XXLeft;
+ btnFloorIcon.Gravity = Gravity.CenterVertical;
+ btnFloorIcon.UnSelectedImagePath = "Item/Floor.png";
+ topFrameLayout.AddChidren(btnFloorIcon);
//鎷ユ湁妤煎眰
this.btnFloorName = null;
if (Config.Instance.Home.FloorDics.Count > 0)
{
- //妤煎眰鍥炬爣
- var btnFloorIcon = new IconViewControl(69);
- btnFloorIcon.X = ControlCommonResourse.XXLeft;
- btnFloorIcon.Gravity = Gravity.CenterVertical;
- btnFloorIcon.UnSelectedImagePath = "Item/Floor.png";
- topFrameLayout.AddChidren(btnFloorIcon);
+ //鎷ユ湁妤煎眰鐨勬椂鍊�,鐐瑰嚮鎵嶆湁鏁�
btnFloorIcon.ButtonClickEvent += (sender, e) =>
{
//鏄剧ず閫夋嫨妤煎眰鐨勭晫闈�
this.ShowSelectFloorForm(btnFloorName);
};
+
//妤煎眰鍚�
this.btnFloorName = new NormalViewControl(500, 100, true);
btnFloorName.X = btnFloorIcon.Right;
@@ -135,7 +149,7 @@
btnHouseName.IsBold = true;
btnHouseName.Text = Config.Instance.Home.Name;
btnHouseName.Width = btnHouseName.GetRealWidthByText();
- this.AddChidren(btnHouseName);
+ this.listBodyContr.frameTable.AddChidren(btnHouseName);
//鍒囨崲浣忓畢
btnHouseName.MouseLongEventHandler += (sender, e) =>
@@ -162,6 +176,16 @@
/// </summary>
private void InitMidFrameLayoutControl()
{
+ //鎴愬憳韬唤涓嶅厑璁告坊鍔犵綉鍏�
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ {
+ //鍒濆鍖栧満鏅�,鍔熻兘鐨勫垏鎹㈡帶浠�
+ this.InitSceneFunctionSwitchControl();
+ //鍒濆鍖栨埧闂存粦鍔ㄦ帶浠�
+ this.InitRoomHorizontalPagesControl();
+ return;
+ }
+
//妫�娴嬫槸鍚︾粦瀹氭湁缃戝叧
if (this.CheckHadBindGateway() == false)
{
@@ -172,7 +196,6 @@
{
//鍒濆鍖栧満鏅�,鍔熻兘鐨勫垏鎹㈡帶浠�
this.InitSceneFunctionSwitchControl();
-
//鍒濆鍖栨埧闂存粦鍔ㄦ帶浠�
this.InitRoomHorizontalPagesControl();
}
@@ -190,7 +213,7 @@
functionSceneView.Height = Application.GetRealHeight(167);
functionSceneView.Gravity = Gravity.CenterHorizontal;
functionSceneView.BackgroundImagePath = "Item/SceneFunctionBG.png";
- this.AddChidren(functionSceneView);
+ this.listBodyContr.frameTable.AddChidren(functionSceneView);
//鍦烘櫙
var btnScene = new NormalViewControl(350, 100, true);
@@ -216,13 +239,13 @@
if (UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 1)
{
btnScene.IsSelected = true;
- btnScene.TextSize = 16;
+ btnScene.TextSize = 17;
btnScene.IsBold = true;
}
else if (UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 2)
{
btnFunction.IsSelected = true;
- btnFunction.TextSize = 16;
+ btnFunction.TextSize = 17;
btnFunction.IsBold = true;
}
@@ -234,7 +257,7 @@
Gravity = Gravity.CenterHorizontal,
BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
};
- this.AddChidren(bodyFrameLayout);
+ this.listBodyContr.frameTable.AddChidren(bodyFrameLayout);
//閫夋嫨鍔熻兘鍒嗘爮
btnFunction.ButtonClickEvent += (sender, e) =>
@@ -251,7 +274,7 @@
btnScene.IsBold = false;
btnFunction.IsSelected = true;
- btnFunction.TextSize = 16;
+ btnFunction.TextSize = 17;
btnFunction.IsBold = true;
//鍒锋柊璁惧妗屽竷鎺т欢
this.RefreshBodyView();
@@ -267,7 +290,7 @@
UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
btnScene.IsSelected = true;
- btnScene.TextSize = 16;
+ btnScene.TextSize = 17;
btnScene.IsBold = true;
btnFunction.IsSelected = false;
@@ -287,7 +310,7 @@
bg.Y = Application.GetRealHeight(302);
bg.Gravity = Gravity.CenterHorizontal;
bg.UnSelectedImagePath = "Item/NoBindGW.png";
- this.AddChidren(bg);
+ this.listBodyContr.frameTable.AddChidren(bg);
var tip = new NormalViewControl(Application.GetMinRealAverage(717), Application.GetMinRealAverage(58), false);
tip.Y = Application.GetRealHeight(815);
@@ -295,19 +318,19 @@
tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW;
tip.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
tip.TextAlignment = TextAlignment.Center;
- this.AddChidren(tip);
+ this.listBodyContr.frameTable.AddChidren(tip);
var addBG = new PicViewControl(971, 366);
addBG.Y = Application.GetRealHeight(1048);
addBG.UnSelectedImagePath = "Item/VirtualFrame.png";
addBG.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(addBG);
+ this.listBodyContr.frameTable.AddChidren(addBG);
var addGatewayBtn = new IconViewControl(89);
addGatewayBtn.Y = Application.GetRealHeight(1143);
addGatewayBtn.UnSelectedImagePath = "Item/Add_GW.png";
addGatewayBtn.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(addGatewayBtn);
+ this.listBodyContr.frameTable.AddChidren(addGatewayBtn);
addGatewayBtn.ButtonClickEvent += (sender, e) =>
{
var form = new UserCenter.GatewayAdd.NewGateWayMenuSelectForm();
@@ -320,7 +343,7 @@
addTip.TextID = R.MyInternationalizationString.AddSmartGW;
addTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
addTip.TextAlignment = TextAlignment.Center;
- AddChidren(addTip);
+ this.listBodyContr.frameTable.AddChidren(addTip);
addTip.ButtonClickEvent += (sender, e) =>
{
@@ -343,7 +366,7 @@
frameBack.Y = Application.GetRealHeight(302);
frameBack.Width = Application.GetRealWidth(CommonPage.AppRealWidth);
frameBack.Height = Application.GetRealHeight(478);
- this.AddChidren(frameBack);
+ this.listBodyContr.frameTable.AddChidren(frameBack);
this.roomPageView = new HorizontalPages();
roomPageView.Width = frameBack.Width;
@@ -358,7 +381,7 @@
btnRoomBottomShadow.Y = frameBack.Bottom;
btnRoomBottomShadow.Gravity = Gravity.CenterHorizontal;
btnRoomBottomShadow.UnSelectedImagePath = "Room/RoomCardShadow.png";
- this.AddChidren(btnRoomBottomShadow);
+ this.listBodyContr.frameTable.AddChidren(btnRoomBottomShadow);
//褰撳墠鎴块棿
var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
@@ -368,7 +391,7 @@
var roomView = new RoomView(0, 0);
roomPageView.AddChidren(roomView);
roomView.Init(listRoom[i]);
-
+
if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)
{
//褰撳墠鎴块棿,鍒欐樉绀洪偅浜涙暟鎹嚭鏉�
@@ -381,8 +404,6 @@
roomView.HideName(true);
}
}
- //璁剧疆鎴块棿鐨勫垵濮嬮�夋嫨
- roomPageView.PageIndex = curIndex;
//鎴块棿鑳藉婊戝姩鐨勬椂鍊欐墠鏄剧ず
FrameLayout btnRoomLeftShadow = null;
FrameLayout btnRoomRightShadow = null;
@@ -447,6 +468,15 @@
this.isRoomChanging = false;
this.RefreshBodyView();
};
+ //璁剧疆鎴块棿鐨勫垵濮嬮�夋嫨
+ roomPageView.PageIndex = curIndex;
+#if iOS
+ //Ios濡傛灉绱㈠紩鏄涓�涓椂锛屽畠瑙﹀彂涓嶄簡浜嬩欢,闇�瑕佹墜鍔ㄨЕ鍙�
+ if (curIndex == 0)
+ {
+ roomPageView.EndScrollAction();
+ }
+#endif
}
/// <summary>
@@ -455,6 +485,11 @@
/// <param name="room"></param>
public void SetRoomPageViewSelect(Room room)
{
+ if (roomPageView == null)
+ {
+ //褰撴病鏈夌粦瀹氭湁缃戝叧,宸︽粦鏃�,鐐瑰嚮鎴块棿鍒楄〃,鍒欎笉楦熷畠
+ return;
+ }
var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
for (int i = 0; i < listRoom.Count; i++)
{
@@ -486,6 +521,8 @@
{
//鍏堟竻绌虹紦瀛�
bodyFrameLayout.RemoveAll();
+ bodyFrameLayout.Height = Application.GetRealHeight(750);
+ this.listBodyContr.RecoverTableHeight();
this.dicSceneCardControl.Clear();
this.dicDeviceCardControl.Clear();
@@ -493,10 +530,9 @@
foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice)
{
var device = LocalDevice.Current.GetDevice(mainkeys);
- if (device == null
- || device.Type == DeviceType.OnOffSwitch)//骞叉帴鐐�
+ //鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
+ if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
{
- //杩欎釜璁惧涓嶈浜�
continue;
}
listDevice.Add(device);
@@ -508,23 +544,23 @@
ShowNoFunctionTip();
return;
}
- //鍒楄〃鎺т欢
- var listView = new VerticalFrameControl();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
+ //璁惧鍒楄〃瀹瑰櫒鎺т欢
+ var listDeviceBackContr = new FrameLayout();
+ listDeviceBackContr.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listDeviceBackContr);
HdlThreadLogic.Current.RunThread(() =>
{
//鍒濆鍖栬澶囧崱鐗囧垪琛ㄦ帶浠�
- this.InitDeviceListCardControl(listView, listDevice);
+ this.InitDeviceListCardControl(listDeviceBackContr, listDevice);
});
}
/// <summary>
/// 鍒濆鍖栬澶囧崱鐗囧垪琛ㄦ帶浠�
/// </summary>
- /// <param name="listView"></param>
- private void InitDeviceListCardControl(VerticalFrameControl listView, List<CommonDevice> listDevice)
+ /// <param name="listDeviceBackContr"></param>
+ private void InitDeviceListCardControl(FrameLayout listDeviceBackContr, List<CommonDevice> listDevice)
{
//璁惧璁℃暟
int contrCount = 0;
@@ -535,7 +571,7 @@
var listContr = new List<Controls.DeviceCardCommon>();
foreach (var device in listDevice)
{
- if (this.isRoomChanging == true || listView.Parent == null)
+ if (this.isRoomChanging == true || listDeviceBackContr.Parent == null)
{
//鏀惧純鍒濆鍖栨帶浠�
return;
@@ -592,7 +628,7 @@
//鍒濆鍖栧崱鐗�
cardContr.X = XX;
cardContr.Y = YY;
- listView.frameTable.AddChidren(cardContr);
+ listDeviceBackContr.AddChidren(cardContr);
cardContr.InitControl(device);
//鍗＄墖闇�瑕佽绉婚櫎鐨勪簨浠�
cardContr.CardNeedRemoveEvent += () =>
@@ -617,16 +653,21 @@
if (contrCount == listDevice.Count)
{
//璋冩暣妗屽竷澶у皬
- listView.AdjustTableHeight();
+ if (contrCount > 4)
+ {
+ bodyFrameLayout.Height = listDeviceBackContr.GetChildren(listDeviceBackContr.ChildrenCount - 1).Bottom;
+ listDeviceBackContr.Height = bodyFrameLayout.Height;
+ this.listBodyContr.frameTable.Height = bodyFrameLayout.Bottom;
+ }
HdlThreadLogic.Current.RunThread(() =>
{
for (int i = 0; i < listContr.Count; i++)
{
- if (listView.Parent == null)
+ if (listDeviceBackContr.Parent == null)
{
return;
}
- System.Threading.Thread.Sleep(20);
+ System.Threading.Thread.Sleep(200);
//鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
listContr[i].SendStatuComand();
}
@@ -685,7 +726,7 @@
//璁惧璁℃暟
int contrCount = 0;
-
+
bool canMove = false;
int YY = 0;
foreach (var mainkey in this.dicDeviceCardControl.Keys)
@@ -727,14 +768,19 @@
}
}
//鍘绘壘涓�涓嬭繖涓帶浠剁殑鍒楄〃瀹瑰櫒
- var listView = deleteContr.Parent.Parent as VerticalFrameControl;
+ var listView = deleteContr.Parent as FrameLayout;
//鍒犻櫎鎺夐偅寮犲崱鐗囩殑涓婚敭
deleteContr.RemoveFromParent();
this.dicDeviceCardControl.Remove(deleteKey);
//璋冩暣妗屽竷楂樺害
- listView?.AdjustTableHeight();
+ if (listView.ChildrenCount >= 4)
+ {
+ bodyFrameLayout.Height = listView.GetChildren(listView.ChildrenCount - 1).Bottom;
+ listView.Height = bodyFrameLayout.Height;
+ this.listBodyContr.frameTable.Height = bodyFrameLayout.Bottom;
+ }
}
#endregion
@@ -748,6 +794,8 @@
{
//鍏堟竻绌虹紦瀛�
bodyFrameLayout.RemoveAll();
+ bodyFrameLayout.Height = Application.GetRealHeight(750);
+ this.listBodyContr.RecoverTableHeight();
this.dicSceneCardControl.Clear();
this.dicDeviceCardControl.Clear();
@@ -770,22 +818,22 @@
return;
}
//鍒楄〃鎺т欢
- var listView = new VerticalFrameControl();
- listView.Height = bodyFrameLayout.Height;
- bodyFrameLayout.AddChidren(listView);
+ var listSceneBackContr = new FrameLayout();
+ listSceneBackContr.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listSceneBackContr);
HdlThreadLogic.Current.RunThread(() =>
{
//鍒濆鍖栬澶囧崱鐗囧垪琛ㄦ帶浠�
- this.InitSceneListCardControl(listView, listScene);
+ this.InitSceneListCardControl(listSceneBackContr, listScene);
});
}
/// <summary>
/// 鍒濆鍖栧満鏅崱鐗囧垪琛ㄦ帶浠�
/// </summary>
- /// <param name="listView"></param>
- private void InitSceneListCardControl(VerticalFrameControl listView, List<SceneUI> listScene)
+ /// <param name="listSceneBackContr"></param>
+ private void InitSceneListCardControl(FrameLayout listSceneBackContr, List<SceneUI> listScene)
{
//鍦烘櫙璁℃暟
int contrCount = 0;
@@ -795,7 +843,7 @@
int YY = 0;
foreach (var sceneUi in listScene)
{
- if (this.isRoomChanging == true || listView.Parent == null)
+ if (this.isRoomChanging == true || listSceneBackContr.Parent == null)
{
//鏀惧純鍒濆鍖栨帶浠�
return;
@@ -806,7 +854,7 @@
var cardContr = new Controls.SceneCardControl();
cardContr.X = XX;
cardContr.Y = YY;
- listView.frameTable.AddChidren(cardContr);
+ listSceneBackContr.AddChidren(cardContr);
cardContr.InitControl(sceneUi);
//鍗＄墖闇�瑕佽绉婚櫎鐨勪簨浠�
cardContr.CardNeedRemoveEvent += () =>
@@ -825,14 +873,20 @@
}
//鎺т欢璁板綍鍒扮紦瀛樹腑
this.dicSceneCardControl[sceneUi.Id] = cardContr;
+
if (contrCount == listScene.Count)
{
//璋冩暣妗屽竷楂樺害
- listView.AdjustTableHeight();
+ if (contrCount > 4)
+ {
+ bodyFrameLayout.Height = listSceneBackContr.GetChildren(listSceneBackContr.ChildrenCount - 1).Bottom;
+ listSceneBackContr.Height = bodyFrameLayout.Height;
+ this.listBodyContr.frameTable.Height = bodyFrameLayout.Bottom;
+ }
HdlThreadLogic.Current.RunThread(() =>
{
//璁剧疆鐩墠鍦烘櫙鐨勫欢杩熺姸鎬�
- this.SetSceneDelayTime(listView);
+ this.SetSceneDelayTime(listSceneBackContr);
});
}
});
@@ -869,11 +923,11 @@
/// <summary>
/// 璁剧疆鍦烘櫙鐨勫欢杩熺姸鎬�
/// </summary>
- /// <param name="listView"></param>
- private async void SetSceneDelayTime(VerticalFrameControl listView)
+ /// <param name="listSceneBackContr"></param>
+ private async void SetSceneDelayTime(FrameLayout listSceneBackContr)
{
await System.Threading.Tasks.Task.Delay(1500);
- if (listView.Parent == null)
+ if (listSceneBackContr.Parent == null)
{
//鎺т欢宸茬粡琚Щ闄�
return;
@@ -884,7 +938,7 @@
{
return;
}
- if (listView.Parent == null)
+ if (listSceneBackContr.Parent == null)
{
//鎺т欢宸茬粡琚Щ闄�
return;
@@ -970,14 +1024,19 @@
}
}
//鍘绘壘涓�涓嬭繖涓帶浠剁殑鍒楄〃瀹瑰櫒
- var listView = deleteContr.Parent.Parent as VerticalFrameControl;
+ var listView = deleteContr.Parent as FrameLayout;
//鍒犻櫎鎺夐偅寮犲崱鐗囩殑涓婚敭
deleteContr.RemoveFromParent();
this.dicSceneCardControl.Remove(deleteId);
//璋冩暣妗屽竷楂樺害
- listView?.AdjustTableHeight();
+ if (listView.ChildrenCount >= 4)
+ {
+ bodyFrameLayout.Height = listView.GetChildren(listView.ChildrenCount - 1).Bottom;
+ listView.Height = bodyFrameLayout.Height;
+ this.listBodyContr.frameTable.Height = bodyFrameLayout.Bottom;
+ }
}
#endregion
@@ -1068,6 +1127,11 @@
{
//鍒锋柊鍗＄墖淇℃伅
var locadevice = LocalDevice.Current.GetDevice(mainKeys);
+ if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)
+ {
+ //绌鸿皟鏄壒娈婄殑,瀹冪殑寮�鍏虫槸灞炴�т笂鎶ユ潵鐫�.宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
+ }
this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
}
}, ShowErrorMode.NO);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
index f5d841a..009eccd 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
@@ -22,7 +22,14 @@
public static ListRoomViewFrom Instance
{
get
- {
+ {
+ if (roomManagement == null)
+ {
+ //鍒濆鍖栧乏婊戣彍鍗�
+ roomManagement = new ListRoomViewFrom();
+ CommonPage.Instance.AddLeftView(roomManagement);
+ roomManagement.ShowForm();
+ }
return roomManagement;
}
}
@@ -83,12 +90,12 @@
};
//鑾峰彇妤煎眰
+ this.curFloorId = Config.Instance.Home.CurrentFloorId;
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
return;
}
- this.curFloorId = Config.Instance.Home.CurrentFloorId;
//妤煎眰鍥炬爣
var btnIconContr = new MostRightIconControl(69, 69);
btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
@@ -142,6 +149,11 @@
/// </summary>
public void RefreshListRoom()
{
+ //鎶婂ご閮ㄤ篃涓�璧峰垵濮嬪寲浜�
+ this.topFrameLayout.RemoveAll();
+ //鍒濆鍖栧ご閮ㄤ俊鎭�
+ this.InitTopFrame();
+
//鍏堟竻绌�
this.listView.frameTable.RemoveAll();
this.listView.frameTable.Height = Application.GetRealHeight(100);
@@ -208,8 +220,12 @@
});
};
}
- //鍒濆鍖栨湭鍒嗛厤鍗＄墖
- this.InitRoomCardControl(XX, YY);
+ //鎴愬憳鏄病鏈夋湭鍒嗛厤杩欎釜涓滆タ鍑烘潵鐨�
+ if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ {
+ //鍒濆鍖栨湭鍒嗛厤鍗＄墖
+ this.InitRoomCardControl(XX, YY);
+ }
//璋冩暣妗屽竷楂樺害
this.listView.AdjustTableHeight();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index e04b70b..c0e1669 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -613,6 +613,13 @@
dic = dicMsg[keys];
//鎸囧畾鐨勪綇瀹呬笉瀛樺湪
dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
+
+ //瀛愯处鍙峰垹闄や富甯愬彿鍒嗕韩杩囨潵鐨勪綇瀹�
+ keys = "ZigbeeUsers/SubAccountDelShareHome";
+ dicMsg[keys] = new Dictionary<string, int>();
+ dic = dicMsg[keys];
+ //鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+ dic["NoRecord"] = R.MyInternationalizationString.uZigbeeHome_NoRecord;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
index 18d80cf..d623e7e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
@@ -45,6 +45,11 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public int CategoryPageSwitchIndex = 0;
+ /// <summary>
+ /// 褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public bool TheSameLoginAccount = false;
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index cf4ba8c..a22a1b6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -917,11 +917,11 @@
/// </summary>
public bool IsHdlDevice = true;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
+ /// 璁惧鐨勫叿浣撶被鍨嬬殑缈昏瘧鍚嶅瓧ID,涔熷彨瀹樻柟鍚嶅瓧锛圧鏂囦欢閲岄潰鐨勶級
/// </summary>
public int ConcreteTextId = R.MyInternationalizationString.UnknowDevice;
/// <summary>
- /// 璁惧鐨勫叿浣撶被鍨�(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
+ /// 璁惧鐨勫叿浣撶被鍨�,涔熷彨瀹樻柟绫诲瀷(鍊间负鑷畾涔夌殑鍊�,濂藉儚鍙互鏄暅鍍廔D)
/// </summary>
public DeviceConcreteType ConcreteType = DeviceConcreteType.UnKownDevice;
/// <summary>
@@ -932,6 +932,27 @@
/// 璁惧鎵�灞炵被鍨嬬殑缈昏瘧鍚嶅瓧ID锛圧鏂囦欢閲岄潰鐨勶級
/// </summary>
public int BeloneTextId = R.MyInternationalizationString.UnknowDevice;
+ /// <summary>
+ /// 璁惧鐨勯粯璁ゅ娉ㄧ炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int DefultNameId
+ {
+ get
+ {
+ int value = ConcreteTextId + 20000;
+ if (value >= 60000)
+ {
+ //澶т簬60000锛屽垯琛ㄧず杩欎釜涓滆タ涓嶆槸浠庢渤涓滅殑鍚嶇О鍒楄〃涓潵鐨�,瀹冩槸浠庣涓夋柟鍒楄〃鏉ョ殑
+ //鐩存帴杩斿洖瀹冪殑瀹樻柟鍚嶅瓧鍗冲彲
+ return ConcreteTextId;
+ }
+ return value;
+ }
+ }
+ /// <summary>
+ /// 璁惧鐨勭被鍨嬬炕璇戝悕瀛桰D(涓汉涓績涓撶敤,Language鏂囦欢閲岄潰鐨�)
+ /// </summary>
+ public int ObjectTypeNameId = R.MyInternationalizationString.UnknowDevice;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 52af78a..b4aea46 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -39,6 +39,11 @@
}
/// <summary>
+ /// 鐐瑰嚮鐨勫潗鏍�
+ /// </summary>
+ private System.Drawing.Point downPoint = new System.Drawing.Point();
+
+ /// <summary>
/// 鎺т欢鐨勭偣鍑讳簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
public Action<Button, MouseEventArgs> ButtonClickEvent = null;
@@ -46,6 +51,10 @@
/// 鎺т欢鐨勬寜涓嬩簨浠�(鑷畾涔夊皝瑁呬簨浠�,姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠�,鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
public Action<Button, MouseEventArgs> ButtonDownClickEvent = null;
+ /// <summary>
+ /// 鎺т欢瑙﹀彂绉诲姩鐨勪簨浠�(鑷韩鎷ユ湁绠楁硶,褰撶Щ鍔ㄥ灏戝儚绱犲悗,瑙﹀彂浜嬩欢,娉ㄦ剰,璇ヤ簨浠跺彲鑳戒細棰戠箒鐨勮Е鍙�)
+ /// </summary>
+ public Action ButtonHappenMoveEvent = null;
#endregion
@@ -66,6 +75,8 @@
this.MouseUpEventHandler += ButtonBase_MouseUpEventHandler;
//鎸変笅浜嬩欢
this.MouseDownEventHandler += ButtonBase_MouseDownEventHandler;
+ //绉诲姩浜嬩欢
+ this.MouseMoveEventHandler += ButtonBase_MouseMoveEventHandler;
}
/// <summary>
@@ -166,6 +177,10 @@
/// <param name="e"></param>
private void ButtonBase_MouseDownEventHandler(object sender, MouseEventArgs e)
{
+ //璁板綍璧峰綋鍓嶇偣鍑荤殑鍧愭爣
+ downPoint.X = (int)e.X;
+ downPoint.Y = (int)e.Y;
+
if (CanClick == false || this.ButtonDownClickEvent == null)
{
//涓嶈兘鐐瑰嚮
@@ -183,6 +198,38 @@
alert.Show();
//Log鍑哄姏
HdlLogLogic.Current.WriteLog(ex);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 绉诲姩浜嬩欢___________________________
+
+ /// <summary>
+ /// 绉诲姩浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ButtonBase_MouseMoveEventHandler(object sender, MouseEventArgs e)
+ {
+ if (this.ButtonHappenMoveEvent == null)
+ {
+ this.MouseMoveEventHandler -= ButtonBase_MouseMoveEventHandler;
+ return;
+ }
+ int value = (int)e.X - this.downPoint.X;
+ if (value >= 30 || value <= -30)
+ {
+ //瑙﹀彂绉诲姩浜嬩欢
+ this.ButtonHappenMoveEvent();
+ return;
+ }
+ value = (int)e.Y - this.downPoint.Y;
+ if (value >= 30 || value <= -30)
+ {
+ //瑙﹀彂绉诲姩浜嬩欢
+ this.ButtonHappenMoveEvent();
+ return;
}
}
@@ -216,7 +263,10 @@
ButtonClickEvent = null;
ButtonDownClickEvent = null;
- base.RemoveFromParent();
+ if (this.Parent != null)
+ {
+ base.RemoveFromParent();
+ }
}
/// <summary>
@@ -240,6 +290,7 @@
/// <returns></returns>
public int GetRealWidthByText()
{
+ if (string.IsNullOrEmpty(this.Text) == true) { return Application.GetRealWidth(25); }
#if Android
//闇�瑕佸鍔犱竴涓宸��
return this.GetTextWidth() + Application.GetRealWidth(12);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 0557f56..cf71a30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -55,6 +55,17 @@
}
/// <summary>
+ /// 鍒濆鍖栨帶浠�(閽堝鐨勬槸缃戝叧)
+ /// </summary>
+ /// <param name="i_caption">鏍囬鏂囨湰</param>
+ /// <param name="i_gateway">缃戝叧瀵硅薄</param>
+ public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
+ {
+ var room = HdlGatewayLogic.Current.GetRoomByGateway(i_gateway);
+ this.InitControl(i_caption, room);
+ }
+
+ /// <summary>
/// 鍒濆鍖栨帶浠�(閽堝鐨勬槸鍥炶矾)
/// </summary>
/// <param name="i_caption">鏍囬鏂囨湰</param>
@@ -161,23 +172,29 @@
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
+ //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤
+ var listKeys = new List<string>() { "" };
+ var listName = new List<string>() { Language.StringByID(R.MyInternationalizationString.uUndistributed) };
+ //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty, false);
- if (listRoom.Count > 0)
+ foreach (var myRoom in listRoom)
{
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listName = new List<string>();
- var listKeys = new List<string>();
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
+ listName.Add(myRoom.Name);
+ listKeys.Add(myRoom.Id);
}
+ listRoomName.Add(listName);
+ listRoomKeys.Add(listKeys);
}
else
{
+ //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤(鏈垎閰嶆斁鍦ㄦゼ灞傞偅涓彍鍗�)
+ var listKeys = new List<string>() { "" };
+ var listName = new List<string>() { "" };
+ listRoomName.Add(listName);
+ listRoomKeys.Add(listKeys);
+ this.listFloorKeys.Add("");
+ this.listFloorName.Add(Language.StringByID(R.MyInternationalizationString.uUndistributed));
+
foreach (string fKeys in dicFloor.Keys)
{
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);
@@ -187,8 +204,8 @@
this.listFloorKeys.Add(fKeys);
this.listFloorName.Add(dicFloor[fKeys]);
//鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listName = new List<string>();
- var listKeys = new List<string>();
+ listName = new List<string>();
+ listKeys = new List<string>();
foreach (var myRoom in listRoom)
{
listName.Add(myRoom.Name);
@@ -222,9 +239,16 @@
//鏃犳ゼ灞傛ā寮�
PickerView.Show(this.listRoomName[0], (value) =>
{
- //妤煎眰+鎴块棿
- txtView.Text = this.listRoomName[0][value];
RoomKey = this.listRoomKeys[0][value];
+ if (RoomKey != string.Empty)
+ {
+ //鎴块棿
+ txtView.Text = this.listRoomName[0][value];
+ }
+ else
+ {
+ txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
this.SelectRoomEvent?.Invoke(RoomKey);
}, index2, i_caption,
@@ -236,10 +260,17 @@
//鏈夋ゼ灞傛ā寮�
PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
{
- //妤煎眰+鎴块棿
- txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
FloorKey = this.listFloorKeys[value1];
RoomKey = this.listRoomKeys[value1][value2];
+ if (RoomKey != string.Empty)
+ {
+ //妤煎眰+鎴块棿
+ txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
+ }
+ else
+ {
+ txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
this.SelectRoomEvent?.Invoke(RoomKey);
}, index1, index2, i_caption,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs
index 3412d86..d0599a6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs
@@ -100,7 +100,8 @@
frameTemp.Width = ControlCommonResourse.XXLeft / 2;
scrolContr.AddChidren(frameTemp);
- int defultIndex = 0;
+ var btnTempWidth = new ButtonBase();
+ btnTempWidth.TextSize = 12;
if (this.dicRoom != null)
{
//鍒濆鍖栨埧闂存ā寮忕殑鎺т欢
@@ -110,9 +111,11 @@
{
//鍒濆鍊�
oldSelectKeys = keys;
- defultIndex = keys;
}
- this.DoInitControl(scrolContr, keys, dicRoom[keys].Name);
+
+ //璁＄畻瀛楃鐨勭湡瀹炲搴�
+ btnTempWidth.Text = dicRoom[keys].Name;
+ this.DoInitControl(scrolContr, keys, dicRoom[keys].Name, btnTempWidth.GetRealWidthByText());
}
}
else
@@ -125,14 +128,15 @@
{
//鍒濆鍊�
oldSelectKeys = keys;
- defultIndex = index;
}
- this.DoInitControl(scrolContr, keys, Language.StringByID(keys));
+ //璁＄畻瀛楃鐨勭湡瀹炲搴�
+ btnTempWidth.Text = Language.StringByID(keys);
+ this.DoInitControl(scrolContr, keys, btnTempWidth.Text, btnTempWidth.GetRealWidthByText());
index++;
}
}
//璁╂帶浠舵粦鍔ㄥ埌鎸囧畾鐨勭储寮曚綅缃�
- scrolContr.ScrollToViewIndex(defultIndex);
+ scrolContr.ScrollToViewIndex(oldSelectKeys + 1);
}
/// <summary>
@@ -141,14 +145,24 @@
/// <param name="scrolContr">鍒楄〃鎺т欢</param>
/// <param name="keys">瀛楀吀鐨勪富閿�</param>
/// <param name="text">鏄剧ず鏂囨湰</param>
- private void DoInitControl(HorizontalScrolViewLayout scrolContr, int keys, string text)
+ /// <param name="textWidth">鏂囨湰鐪熷疄瀹藉害</param>
+ private void DoInitControl(HorizontalScrolViewLayout scrolContr, int keys, string text, int textWidth)
{
+ //甯﹀簳鍥炬帶浠剁殑鏈�灏忓搴�
+ int minWidth = Application.GetRealWidth(255);
+ //甯﹀簳鍥炬帶浠剁殑鐪熷疄瀹藉害 <鏂囧瓧鐨勫搴︾殑璁＄畻 frameBack.Width - (int)(frameBack.Height * 0.47)>
+ int realWidth = textWidth + (int)(Application.GetRealHeight(159) * 0.47);
+ if (realWidth < minWidth)
+ {
+ realWidth = minWidth;
+ }
+
//甯﹀浘鐗囩殑
var frameBack = new FrameLayoutControl();
frameBack.UseClickStatu = false;
frameBack.Gravity = Gravity.Center;
frameBack.Height = Application.GetRealHeight(159);
- frameBack.Width = Application.GetRealWidth(255);
+ frameBack.Width = realWidth;
if (oldSelectKeys == keys)
{
frameBack.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
@@ -160,7 +174,7 @@
}
scrolContr.AddChidren(frameBack);
//鏂囧瓧
- var btnText = new NormalViewControl(frameBack.Width - (int)(frameBack.Height * 0.47), frameBack.Height, false);
+ var btnText = new NormalViewControl(textWidth, frameBack.Height, false);
btnText.Gravity = Gravity.CenterHorizontal;
btnText.Text = text;
btnText.TextSize = 12;
@@ -256,10 +270,16 @@
}
else if (keys != string.Empty)
{
+ int i = 0;
int textId = Convert.ToInt32(keys);
- if (dicDevice.ContainsKey(textId) == true)
+ foreach (int rId in dicDevice.Keys)
{
- oldSelectKeys = textId;
+ if (rId == textId)
+ {
+ oldSelectKeys = i;
+ break;
+ }
+ i++;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
new file mode 100755
index 0000000..9238cc3
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
@@ -0,0 +1,257 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑妤煎眰鑿滃崟鎺т欢
+ /// </summary>
+ public class TopRightFloorMenuControl : FrameLayout
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鍒楄〃鎺т欢
+ /// </summary>
+ private VerticalListControl listView = null;
+ /// <summary>
+ /// 鍓嶅洖閫夋嫨鐨勮
+ /// </summary>
+ private FrameRowControl oldRowFrame = null;
+ /// <summary>
+ /// 鑳屾櫙瀹瑰櫒鎺т欢
+ /// </summary>
+ private FrameLayout frameBack = null;
+ /// <summary>
+ /// 琛岄珮搴�
+ /// </summary>
+ private int RowHeight = 150;
+ /// <summary>
+ /// 琛屽搴�
+ /// </summary>
+ private int RowWidth = 395;
+ /// <summary>
+ /// 琛屾暟
+ /// </summary>
+ private int RowCount = 0;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑妤煎眰鑿滃崟鎺т欢
+ /// </summary>
+ /// <param name="i_RowCount">涓�鍏辨湁鍑犺(涓嶅惈鏍囬)</param>
+ /// <param name="i_widthType">杩欎釜鑿滃崟鐨勫搴︽ā寮�,鐩墠鍙敮鎸�
+ /// <para>1: 395瀹藉害</para>
+ /// <para>2: 449瀹藉害</para>
+ /// </param>
+ /// <param name="titleText">鏍囬鏂囨湰(濡傛灉涓嶄负绌�,鑿滃崟妯″紡鍙樻洿涓烘嫢鏈夋爣棰樼殑妯″紡)</param>
+ public TopRightFloorMenuControl(int i_RowCount, int i_widthType, string titleText = null)
+ {
+ this.RowCount = i_RowCount;
+ if (i_widthType == 1)
+ {
+ this.RowWidth = 395;
+ }
+ else if (i_widthType == 2)
+ {
+ this.RowWidth = 449;
+ }
+ //鍒濆鍖栫敾闈㈢殑鎺т欢
+ this.InitFormControl(titleText, i_widthType);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栫敾闈㈢殑鎺т欢
+ /// </summary>
+ private void InitFormControl(string titleText, int i_widthType)
+ {
+ this.BackgroundColor = UserCenterColor.Current.DialogBackColor;
+ this.MouseUpEventHandler += (sender2, e2) =>
+ {
+ //鍏抽棴鑷韩
+ this.RemoveFromParent();
+ };
+ var frame = (FrameLayout)UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+ frame.AddChidren(this);
+
+ //鏈�澶ф樉绀�5涓�
+ int rowCount = this.RowCount > 5 ? 5 : this.RowCount;
+ if (titleText != null)
+ {
+ //449瀹藉害鐨勬椂鍊欙紝鍗充娇鏄庣粏宸茬粡瓒呰繃浜�5涓紝浣嗘槸杩樻槸鍙互+1鐨�,鍥犱负杩欎釜妯″紡澶氫簡涓�寮犲浘鐗�
+ if (rowCount < 5 || i_widthType == 2)
+ {
+ //鑿滃崟+1
+ rowCount++;
+ }
+ }
+
+ //鑳屾櫙
+ this.frameBack = new FrameLayout();
+ frameBack.X = Application.GetRealWidth(662 - (RowWidth - 395));
+ frameBack.Y = Application.GetRealHeight(161);
+ frameBack.Width = Application.GetRealWidth(RowWidth);
+ frameBack.Height = Application.GetRealHeight(RowHeight * rowCount + 16);
+ frameBack.BackgroundImagePath = "MenuGroud/TopRightMenu" + i_widthType + "_" + rowCount + ".png";
+ this.AddChidren(frameBack);
+
+ var frameTable = new FrameLayout();
+ frameTable.Y = Application.GetRealHeight(16);
+ frameTable.Height = Application.GetRealHeight(RowHeight * rowCount);
+ frameBack.AddChidren(frameTable);
+
+ if (titleText != null)
+ {
+ var btnTitle = new NormalViewControl(frameBack.Width - Application.GetRealWidth(81), Application.GetRealHeight(58), false);
+ btnTitle.X = Application.GetRealWidth(81);
+ btnTitle.Y = Application.GetRealHeight(58 + 16);
+ btnTitle.Text = titleText;
+ frameTable.AddChidren(btnTitle);
+ }
+
+ //鍒楄〃鎺т欢
+ this.listView = new VerticalListControl();
+ listView.Radius = (uint)Application.GetRealHeight(17);
+ if (titleText != null)
+ {
+ //鎷ユ湁鏍囬
+ listView.Y = Application.GetRealHeight(RowHeight);
+ listView.Height = frameTable.Height - Application.GetRealHeight(RowHeight);
+ }
+ else
+ {
+ //娌℃湁鏍囬
+ listView.Height = frameTable.Height;
+ }
+ frameTable.AddChidren(listView);
+ }
+
+ #endregion
+
+ #region 鈻� 娣诲姞鑿滃崟___________________________
+
+ /// <summary>
+ /// 娣诲姞鑿滃崟琛�
+ /// </summary>
+ /// <param name="floorId">妤煎眰id</param>
+ /// <param name="action">鍗曞嚮鑿滃崟鎵ц鐨勪簨浠�</param>
+ /// <param name="closeOnClick">鍗曞嚮鐨勬椂鍊欙紝鍏抽棴鑿滃崟</param>
+ public void AddRowMenu(string floorId, Action action, bool closeOnClick = true)
+ {
+ var rowFrame = new FrameRowControl();
+ rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
+ rowFrame.Height = Application.GetRealHeight(RowHeight);
+ listView.AddChidren(rowFrame);
+ rowFrame.MainKeys = listView.ChildrenCount.ToString();
+ //鍥炬爣
+ var btnIcon = rowFrame.AddLeftIcon(81);
+ btnIcon.UnSelectedImagePath = "Floor/Floor.png";
+ btnIcon.SelectedImagePath = "Floor/FloorSelected.png";
+ //鏄剧ず鏂囧瓧
+ string TextValue = HdlResidenceLogic.Current.GetFloorNameById(floorId);
+ var btnText = rowFrame.AddLeftCaption(TextValue, RowWidth - 173);
+ btnText.X = Application.GetRealWidth(173);
+ //搴曠嚎
+ if (listView.ChildrenCount != this.RowCount)
+ {
+ var btnLine = rowFrame.AddBottomLine();
+ btnLine.X = Application.GetRealWidth(81);
+ }
+
+ if (floorId == Common.Config.Instance.Home.CurrentFloorId)
+ {
+ //褰撳墠妤煎眰榛樿璁剧疆涓洪�夋嫨鐘舵��
+ this.SetRowSelectStatu(rowFrame, true);
+ this.oldRowFrame = rowFrame;
+ }
+ else
+ {
+ //鍏朵粬鑿滃崟涓虹伆鑹�
+ btnIcon.IsSelected = false;
+ btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
+ }
+
+ //閫夋嫨鐘舵��
+ rowFrame.SelectStatuEvent += (statu) =>
+ {
+ //false涓烘帶浠惰嚜韬嚜鍔ㄦ墽琛�,杩欓噷涓嶉渶瑕佽繕鍘�
+ if (statu == true)
+ {
+ //璁剧疆涓洪�夋嫨鐘舵��
+ this.SetRowSelectStatu(rowFrame, true);
+ this.oldRowFrame = rowFrame;
+ }
+ };
+
+ //鎸夐敭鐐瑰嚮
+ rowFrame.ButtonClickEvent += (sender, e) =>
+ {
+ if (closeOnClick == true)
+ {
+ this.RemoveFromParent();
+ }
+ action?.Invoke();
+ };
+ }
+ #endregion
+
+ #region 鈻� 璁剧疆閫夋嫨鐘舵�乢______________________
+
+ /// <summary>
+ /// 璁剧疆閫夋嫨鐘舵��
+ /// </summary>
+ /// <param name="frame">琛屾帶浠�</param>
+ /// <param name="select">閫夋嫨鐨勭姸鎬�</param>
+ private void SetRowSelectStatu(FrameRowControl frame, bool select)
+ {
+ //鍥炬爣
+ var btnIcon = (IconViewControl)frame.GetChildren(0);
+ if (btnIcon != null)
+ {
+ btnIcon.IsSelected = select;
+ }
+ //鏂囨湰
+ var btnText = (NormalViewControl)frame.GetChildren(1);
+ if (btnText != null)
+ {
+ btnText.TextColor = select == true ? UserCenterColor.Current.TextColor1 : UserCenterColor.Current.TextGrayColor1;
+ btnText.IsBold = select;
+ }
+ //鍓嶅洖閫夋嫨鐨勮彍鍗曚负null,鎴栬�呮槸鐩稿悓鐨勪笢瑗�,鍒欎笉澶勭悊
+ if (this.oldRowFrame == null || this.oldRowFrame.MainKeys == frame.MainKeys)
+ {
+ return;
+ }
+
+ //鍓嶅洖閫夋嫨鐨勮杩樺師
+ this.SetRowSelectStatu(this.oldRowFrame, false);
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 閲嶆柊璁剧疆鐧借壊閮ㄥ垎鐨勫潗鏍�
+ /// </summary>
+ /// <param name="XX">鐪熷疄鍊�(涓嶆敼鍙樼殑璇濆～-1)</param>
+ /// <param name="YY">鐪熷疄鍊�(涓嶆敼鍙樼殑璇濆～-1)</param>
+ public void SetLocation(int XX = -1, int YY = -1)
+ {
+ if (XX != -1)
+ {
+ frameBack.X = XX;
+ }
+ if (YY != -1)
+ {
+ frameBack.Y = YY;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index b53b1c9..4593695 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -5,7 +5,7 @@
namespace Shared.Phone.UserCenter
{
/// <summary>
- /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢
+ /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢(闈炴ゼ灞傝彍鍗�,閮藉彲浠ヤ娇鐢�)
/// </summary>
public class TopRightMenuControl : FrameLayout
{
@@ -16,9 +16,9 @@
/// </summary>
private VerticalListControl listView = null;
/// <summary>
- /// 鍓嶅洖閫夋嫨鐨勮
+ /// 鑳屾櫙瀹瑰櫒鎺т欢
/// </summary>
- private FrameRowControl oldRowFrame = null;
+ private FrameLayout frameBack = null;
/// <summary>
/// 琛岄珮搴�
/// </summary>
@@ -37,7 +37,7 @@
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
- /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢
+ /// 鍋氭垚涓�涓瓨鍦ㄤ簬鍙充笂瑙掔殑鑿滃崟鎺т欢(闈炴ゼ灞傝彍鍗�,閮藉彲浠ヤ娇鐢�)
/// </summary>
/// <param name="i_RowCount">涓�鍏辨湁鍑犺(涓嶅惈鏍囬)</param>
/// <param name="i_widthType">杩欎釜鑿滃崟鐨勫搴︽ā寮�,鐩墠鍙敮鎸�
@@ -87,7 +87,7 @@
}
//鑳屾櫙
- var frameBack = new FrameLayout();
+ this.frameBack = new FrameLayout();
frameBack.X = Application.GetRealWidth(662 - (RowWidth - 395));
frameBack.Y = Application.GetRealHeight(161);
frameBack.Width = Application.GetRealWidth(RowWidth);
@@ -131,20 +131,22 @@
#region 鈻� 娣诲姞鑿滃崟___________________________
/// <summary>
- /// 娣诲姞鑿滃崟琛�
+ /// 娣诲姞鑿滃崟琛�(UI濂囪懇鍙樻洿浜�,鏆楄壊鍥剧墖涓洪�変腑,榛戣壊鍥剧墖涓洪潪閫変腑)
/// </summary>
/// <param name="TextValue">鏄剧ず鐨勬枃瀛�</param>
- /// <param name="unSelectPic">鍥剧墖</param>
- /// <param name="selectPic">鍥剧墖</param>
+ /// <param name="selectPic">鍥剧墖(鏆楄壊鍥剧墖)</param>
+ /// <param name="unSelectPic">鍥剧墖(榛戣壊鍥剧墖)</param>
/// <param name="action">鍗曞嚮鑿滃崟鎵ц鐨勪簨浠�</param>
/// <param name="closeOnClick">鍗曞嚮鐨勬椂鍊欙紝鍏抽棴鑿滃崟</param>
- public void AddRowMenu(string TextValue, string unSelectPic, string selectPic, Action action, bool closeOnClick = true)
+ public void AddRowMenu(string TextValue, string selectPic, string unSelectPic, Action action, bool closeOnClick = true)
{
var rowFrame = new FrameRowControl();
rowFrame.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;
rowFrame.Height = Application.GetRealHeight(RowHeight);
listView.AddChidren(rowFrame);
rowFrame.MainKeys = listView.ChildrenCount.ToString();
+ //杩欓噷鐗规畩锛岀Щ闄ゆ帀鑷韩鐨勫崟鍑讳簨浠�
+ rowFrame.RemoveBaseClickEvent();
//鍥炬爣
var btnIcon = rowFrame.AddLeftIcon(81);
btnIcon.UnSelectedImagePath = unSelectPic;
@@ -159,39 +161,43 @@
btnLine.X = Application.GetRealWidth(81);
}
- if (listView.ChildrenCount == 1)
- {
- //绗竴涓彍鍗曢粯璁よ缃负閫夋嫨鐘舵��
- this.SetRowSelectStatu(rowFrame, true);
- this.oldRowFrame = rowFrame;
- }
- else
- {
- //鍏朵粬鑿滃崟涓虹伆鑹�
- btnIcon.IsSelected = false;
- btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
- }
+ //鍒濆鐘舵�佸叏涓洪潪閫変腑鐘舵��
+ this.SetRowSelectStatu(rowFrame, false);
- //閫夋嫨鐘舵��
+ bool happenMove = false;
+ //閫夋嫨鐘舵��(閲嶅啓搴曞眰鏁堟灉)
rowFrame.SelectStatuEvent += (statu) =>
{
- //false涓烘帶浠惰嚜韬嚜鍔ㄦ墽琛�,杩欓噷涓嶉渶瑕佽繕鍘�
+ //false涓虹姸鎬佽繕鍘�,浣嗘槸鐘舵�佽繕鍘熸斁鍦ㄩ紶鏍囧脊璧蜂簨浠堕噷闈�
if (statu == true)
{
//璁剧疆涓洪�夋嫨鐘舵��
this.SetRowSelectStatu(rowFrame, true);
- this.oldRowFrame = rowFrame;
+ happenMove = false;
}
};
-
//鎸夐敭鐐瑰嚮
rowFrame.ButtonClickEvent += (sender, e) =>
{
+ //璁剧疆涓洪潪閫夋嫨鐘舵��
+ this.SetRowSelectStatu(rowFrame, false);
+
if (closeOnClick == true)
{
this.RemoveFromParent();
}
action?.Invoke();
+ };
+
+ //寮�濮嬭Е鍙戠Щ鍔ㄤ簨浠�(杩欎釜浜嬩欢浼氶绻佺殑瑙﹀彂)
+ btnIcon.ButtonHappenMoveEvent += () =>
+ {
+ if (happenMove == false)
+ {
+ //璁剧疆涓洪潪閫夋嫨鐘舵��
+ this.SetRowSelectStatu(rowFrame, false);
+ }
+ happenMove = true;
};
}
#endregion
@@ -215,17 +221,30 @@
var btnText = (NormalViewControl)frame.GetChildren(1);
if (btnText != null)
{
- btnText.TextColor = select == true ? UserCenterColor.Current.TextColor1 : UserCenterColor.Current.TextGrayColor1;
- btnText.IsBold = select;
+ btnText.TextColor = select == true ? UserCenterColor.Current.TextGrayColor1 : UserCenterColor.Current.TextColor1;
+ btnText.IsBold = !select;
}
- //鍓嶅洖閫夋嫨鐨勮彍鍗曚负null,鎴栬�呮槸鐩稿悓鐨勪笢瑗�,鍒欎笉澶勭悊
- if (this.oldRowFrame == null || this.oldRowFrame.MainKeys == frame.MainKeys)
- {
- return;
- }
+ }
- //鍓嶅洖閫夋嫨鐨勮杩樺師
- this.SetRowSelectStatu(this.oldRowFrame, false);
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 閲嶆柊璁剧疆鐧借壊閮ㄥ垎鐨勫潗鏍�
+ /// </summary>
+ /// <param name="XX">鐪熷疄鍊�(涓嶆敼鍙樼殑璇濆～-1)</param>
+ /// <param name="YY">鐪熷疄鍊�(涓嶆敼鍙樼殑璇濆～-1)</param>
+ public void SetLocation(int XX = -1, int YY = -1)
+ {
+ if (XX != -1)
+ {
+ frameBack.X = XX;
+ }
+ if (YY != -1)
+ {
+ frameBack.Y = YY;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
index 91b3a36..ac4866c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
@@ -8,7 +8,7 @@
/// <summary>
/// 璁惧淇℃伅鐣岄潰鐨勮澶囧浘鏍囨帶浠�(鍏煎缃戝叧)
/// </summary>
- public class DeviceInfoIconControl : FrameLayout
+ public class DeviceInfoIconControl : FrameLayoutControl
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -16,6 +16,10 @@
/// 璁惧Mac鍦板潃
/// </summary>
private string deviceMac = null;
+ /// <summary>
+ /// 璁惧绔偣
+ /// </summary>
+ private int deviceEpoint = -1;
/// <summary>
/// 缃戝叧瀵硅薄
/// </summary>
@@ -39,6 +43,7 @@
this.Width = Application.GetMinRealAverage(207);
this.BackgroundColor = UserCenterColor.Current.White;
this.Radius = (uint)Application.GetMinRealAverage(207) / 2;
+ this.UseClickStatu = false;
}
/// <summary>
@@ -53,7 +58,7 @@
btnIcon2.BackgroundColor = 0xfffef1ed;
btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;
btnIcon2.Gravity = Gravity.Center;
- this.AddChidren(btnIcon2);
+ this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
//璁惧鍥炬爣
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
@@ -65,7 +70,30 @@
btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);
btnIcon.Gravity = Gravity.Center;
Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
- this.AddChidren(btnIcon);
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖�(璁惧绔偣)
+ /// </summary>
+ /// <param name="i_device">璁惧瀵硅薄</param>
+ public void InitControl(string deviceMacAddr, int epoint)
+ {
+ this.deviceMac = deviceMacAddr;
+ this.deviceEpoint = epoint;
+
+ //绗簩灞傚簳鑹�
+ var btnIcon2 = new NormalViewControl(Application.GetMinRealAverage(184), Application.GetMinRealAverage(184), false);
+ btnIcon2.BackgroundColor = 0xfffef1ed;
+ btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;
+ btnIcon2.Gravity = Gravity.Center;
+ this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
+
+ //璁惧鍥炬爣
+ btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);
+ btnIcon.Gravity = Gravity.Center;
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(deviceMacAddr, epoint));
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
}
/// <summary>
@@ -80,13 +108,13 @@
btnIcon2.BackgroundColor = 0xfffef1ed;
btnIcon2.Radius = (uint)Application.GetMinRealAverage(184) / 2;
btnIcon2.Gravity = Gravity.Center;
- this.AddChidren(btnIcon2);
+ this.AddChidren(btnIcon2, ChidrenBindMode.BindEventOnly);
//璁惧鍥炬爣
btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);
btnIcon.Gravity = Gravity.Center;
HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, i_gateway);
- this.AddChidren(btnIcon);
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
}
#endregion
@@ -98,7 +126,12 @@
/// </summary>
public void RefreshControl()
{
- if (this.deviceMac != null)
+ if (this.deviceEpoint != -1)
+ {
+ //鍒锋柊鍥炬爣
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(this.deviceMac, this.deviceEpoint));
+ }
+ else if (this.deviceMac != null)
{
//鍒锋柊鍥炬爣
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index b35a549..0a70c26 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -138,6 +138,17 @@
this.AddChidrenFrame(frameBackTemp);
}
+ /// <summary>
+ /// 杩樺師妗屽竷楂樺害
+ /// </summary>
+ public void RecoverTableHeight()
+ {
+ if (this.m_frameTable != null)
+ {
+ m_frameTable.Height = this.Height;
+ }
+ }
+
#endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index 908648b..5f5a143 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -93,6 +93,12 @@
var frameMain = new FrameLayout();
frameMain.BackgroundColor = UserCenterColor.Current.DialogBackColor;
Common.CommonPage.Instance.AddChidren(frameMain);
+ frameMain.MouseUpEventHandler += (sender, e) =>
+ {
+ //绉婚櫎鐣岄潰
+ frameMain.RemoveFromParent();
+ this.ConfirmClickEvent = null;
+ };
//鐧借壊鑳屾櫙妗�
var frameBack = new FrameLayout();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconBigViewControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconBigViewControl.cs
new file mode 100755
index 0000000..cec8d6f
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/IconBigViewControl.cs
@@ -0,0 +1,81 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 鍋氭垚涓�涓姞澶х偣鍑诲尯鍩熺殑鍥炬爣鎺т欢
+ /// </summary>
+ public class IconBigViewControl : FrameLayoutControl
+ {
+ /// <summary>
+ /// 鍥炬爣鎺т欢(杩笉寰楀繁锛岃繖涓笢瑗垮紑鏀惧嚭鍘�)
+ /// </summary>
+ public IconControlCommon btnIcon = null;
+ /// <summary>
+ /// UnSelectedImagePath
+ /// </summary>
+ public string UnSelectedImagePath
+ {
+ get { return btnIcon.UnSelectedImagePath; }
+ set { btnIcon.UnSelectedImagePath = value; }
+ }
+ /// <summary>
+ /// SelectedImagePath
+ /// </summary>
+ public string SelectedImagePath
+ {
+ get { return btnIcon.SelectedImagePath; }
+ set { btnIcon.SelectedImagePath = value; }
+ }
+ /// <summary>
+ /// IsSelected
+ /// </summary>
+ public bool IsSelected
+ {
+ get { return btnIcon.IsSelected; }
+ set { btnIcon.IsSelected = value; }
+ }
+
+ /// <summary>
+ /// X杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忚皟鐢↖nitControl鍒濆鍖栧嚱鏁�,鐢ㄦ硶:钃濇箹涓婄殑X杞�,鍑忔帀杩欎釜鍊煎嵆鍙�)
+ /// </summary>
+ public int XOffset
+ {
+ get { return (this.Width - btnIcon.Width) / 2; }
+ }
+
+ /// <summary>
+ /// Y杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忚皟鐢↖nitControl鍒濆鍖栧嚱鏁�,鐢ㄦ硶:钃濇箹涓婄殑Y杞�,鍑忔帀杩欎釜鍊煎嵆鍙�)
+ /// </summary>
+ public int YOffset
+ {
+ get { return (this.Height - btnIcon.Height) / 2; }
+ }
+
+ /// <summary>
+ /// 鍋氭垚涓�涓姞澶х偣鍑诲尯鍩熺殑鍥炬爣鎺т欢
+ /// </summary>
+ /// <param name="i_width">鎺т欢绌哄害</param>
+ /// <param name="i_height">鎺т欢楂樺害</param>
+ public IconBigViewControl(int i_width, int i_height)
+ {
+ this.Width = Application.GetMinRealAverage(110);
+ this.Height = Application.GetMinRealAverage(110);
+
+ this.btnIcon = new IconControlCommon();
+ btnIcon.Width = Application.GetMinRealAverage(i_width);
+ btnIcon.Height = Application.GetMinRealAverage(i_height);
+ btnIcon.Gravity = Gravity.Center;
+ }
+
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ public void InitControl()
+ {
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ }
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
index c4b3515..673e824 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MostRightIconControl.cs
@@ -39,7 +39,7 @@
}
/// <summary>
- /// X杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忓姞鍏ョ埗鎺т欢)
+ /// X杞寸殑鐪熷疄鍋忕Щ閲�(璇风‘淇濆凡缁忚皟鐢↖nitControl鍒濆鍖栧嚱鏁�,鐢ㄦ硶:钃濇箹涓婄殑X杞�,鍑忔帀杩欎釜鍊煎嵆鍙�)
/// </summary>
public int XOffset
{
@@ -53,6 +53,8 @@
/// <param name="i_height">鎺т欢楂樺害</param>
public MostRightIconControl(int i_width, int i_height)
{
+ this.UseClickStatu = false;
+
this.Width = Application.GetMinRealAverage(110);
this.Height = this.Parent != null ? this.Parent.Height : ControlCommonResourse.ListViewRowHeight;
this.Gravity = Gravity.CenterVertical;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index 25ed175..179faf5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -104,6 +104,11 @@
{
if (device.Type == DeviceType.OnOffOutput)
{
+ //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
+ if (device.HadReadDeviceStatu == false)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uOffLine);
+ }
if ((device as ToggleLight).OnOffStatus == 1)
{
return Language.StringByID(R.MyInternationalizationString.uOpen1);
@@ -112,6 +117,11 @@
}
else if (device.Type == DeviceType.AirSwitch)
{
+ //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
+ if (device.HadReadDeviceStatu == false)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uOffLine);
+ }
if ((device as AirSwitch).OnOffStatus == 1)
{
return Language.StringByID(R.MyInternationalizationString.uOpen1);
@@ -120,6 +130,11 @@
}
else if (device.Type == DeviceType.DimmableLight)
{
+ //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
+ if (device.HadReadDeviceStatu == false)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uOffLine);
+ }
if ((device as DimmableLight).OnOffStatus == 0 || (device as DimmableLight).Level == 0)
{
return Language.StringByID(R.MyInternationalizationString.Close);
@@ -128,6 +143,11 @@
}
else if (device.Type == DeviceType.WindowCoveringDevice)
{
+ //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
+ if (device.HadReadDeviceStatu == false)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uOffLine);
+ }
if ((device as Rollershade).WcdCurrentPositionLiftPercentage == 0)
{
return Language.StringByID(R.MyInternationalizationString.Close);
@@ -136,6 +156,11 @@
}
else if (device.Type == DeviceType.Thermostat)
{
+ //鍦ㄧ綉鍏虫病鏈夊洖澶嶄箣鍓�,榛樿绂荤嚎
+ if (device.HadReadDeviceStatu == false)
+ {
+ return Language.StringByID(R.MyInternationalizationString.uOffLine);
+ }
//娓╁害锛屾ā寮忥紝椋庨��
string tempareture = string.Empty;
string model = string.Empty;
@@ -150,7 +175,7 @@
else if (ac.currentSystemMode == 1)
{
model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
- tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ tempareture = $"{ac.currentAutoSetpoint} 鈩�";
}
else if (ac.currentSystemMode == 3)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 3f1200f..3e23033 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -1400,10 +1400,10 @@
if (mode == GetNameMode.SpecialGateway && localWay.getGwInfo != null)
{
string keyName = Common.LocalDevice.deviceModelIdName + this.GetGwInfoAttribute(localWay, "LinuxImageType").ToString();
- if (Common.LocalDevice.Current.dicDeviceDefultNameID.ContainsKey(keyName) == true)
+ if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
{
- //娌℃湁鍚嶇О鏃讹紝鍒欎娇鐢≧鏂囦欢閲岄潰璁剧疆鐨勪笢瑗�
- return Language.StringByID(Common.LocalDevice.Current.dicDeviceDefultNameID[keyName]);
+ //娌℃湁鍚嶇О鏃讹紝鍒欎娇鐢≧鏂囦欢閲岄潰璁剧疆鐨勯粯璁よ澶囧悕绉�
+ return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);
}
}
@@ -1442,10 +1442,10 @@
if (zbGateway.getGwInfo != null && zbGateway.getGwInfo.LinuxImageType != 0)
{
string keyName = Common.LocalDevice.deviceModelIdName + zbGateway.getGwInfo.LinuxImageType;
- if (Common.LocalDevice.Current.dicDeviceDefultNameID.ContainsKey(keyName) == true)
+ if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
{
//浣跨敤R鏂囦欢閲岄潰璁剧疆鐨勪笢瑗�
- button.TextID = LocalDevice.Current.dicDeviceDefultNameID[keyName];
+ button.TextID = LocalDevice.Current.dicDeviceAllNameID[keyName];
}
}
else
@@ -1460,10 +1460,10 @@
HdlThreadLogic.Current.RunMain(() =>
{
string keyName = Common.LocalDevice.deviceModelIdName + zbGateway.getGwInfo.LinuxImageType;
- if (Common.LocalDevice.Current.dicDeviceDefultNameID.ContainsKey(keyName) == true)
+ if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
{
//浣跨敤R鏂囦欢閲岄潰璁剧疆鐨勪笢瑗�
- button.TextID = LocalDevice.Current.dicDeviceDefultNameID[keyName];
+ button.TextID = LocalDevice.Current.dicDeviceAllNameID[keyName];
}
});
}
@@ -1473,10 +1473,10 @@
else
{
string keyName = Common.LocalDevice.deviceModelIdName + this.dicGateway[gwId].getGwInfo.LinuxImageType;
- if (Common.LocalDevice.Current.dicDeviceDefultNameID.ContainsKey(keyName) == true)
+ if (Common.LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
{
//浣跨敤R鏂囦欢閲岄潰璁剧疆鐨勪笢瑗�
- button.TextID = Common.LocalDevice.Current.dicDeviceDefultNameID[keyName];
+ button.TextID = Common.LocalDevice.Current.dicDeviceAllNameID[keyName];
}
}
}
@@ -1569,6 +1569,54 @@
#endregion
+ #region 鈻� 缃戝叧鎴块棿鐩稿叧_______________________
+
+ /// <summary>
+ /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+ /// </summary>
+ /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+ /// <returns></returns>
+ public Room GetRoomByGateway(ZbGateway zbGateway)
+ {
+ var gatewayId = this.GetGatewayId(zbGateway);
+ return this.GetRoomByGateway(gatewayId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇缃戝叧鎵�鍦ㄧ殑鎴块棿
+ /// </summary>
+ /// <param name="gatewayId">缃戝叧ID</param>
+ /// <returns></returns>
+ public Room GetRoomByGateway(string gatewayId)
+ {
+ var localGateway = this.GetLocalGateway(gatewayId);
+ if (localGateway == null)
+ {
+ return null;
+ }
+ return HdlRoomLogic.Current.GetRoomById(localGateway.RoomId);
+ }
+
+ /// <summary>
+ /// 鍙樻洿缃戝叧鎴块棿
+ /// </summary>
+ /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+ /// <param name="roomId">鎴块棿ID</param>
+ public void ChangedGatewayRoom(ZbGateway zbGateway, string roomId)
+ {
+ var gatewayId = this.GetGatewayId(zbGateway);
+ var localGateway = this.GetLocalGateway(gatewayId);
+ if (localGateway != null)
+ {
+ localGateway.RoomId = roomId;
+ localGateway.ReSave();
+ //娣诲姞澶囦唤
+ HdlAutoBackupLogic.AddOrEditorFile(localGateway.FilePath);
+ }
+ }
+
+ #endregion
+
#region 鈻� 娓呯┖鐪熷疄缃戝叧鍒楄〃___________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 4cab21b..fd81325 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -93,10 +93,10 @@
});
return;
}
- else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Deleted"
- || topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/DeletedShareData")
+ else if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/Deleted"
+ || topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Guid + "/Push/DeletedShareData")
{
HdlThreadLogic.Current.RunMain(() =>
{
@@ -107,9 +107,23 @@
UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
});
+ return;
}
- return;
+ else if (topic == "ZigbeeGateWayToClient/" + Common.Config.Instance.Home.Id + "_" + Common.Config.Instance.Guid + "/PrimaryUserDelYou")
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
+ string msg = Language.StringByID(R.MyInternationalizationString.uShardResidenceHadDeletePleaseTakeToAdmin);
+ var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+ contr.Show();
+
+ UserCenterLogic.ReLoginAgain(UserCenterResourse.UserInfo.Account, false);
+ });
+ return;
+ }
}
+
try
{
if (HdlGatewayLogic.Current.IsGatewayExist(gatewayId) == false)
@@ -290,6 +304,24 @@
//宸茬粡鎺ユ敹鍒扮姸鎬�
locadevice.HadReadDeviceStatu = true;
}
+ else if (attData.AttributeId == 4097)
+ {
+ //杩囪檻缃戞竻娲楁爣蹇�:42
+ ((AC)locadevice).CleanStatu = attData.AttriButeData == 42;
+ }
+ else if (attData.AttributeId == 4099)
+ {
+ //杞崲涓轰簩杩涘埗
+ var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
+ //杩欎簲涓缃槸鏀惧湪鍚庨潰鐨�
+ value = value.Substring(value.Length - 5, 5);
+ for (int i = 0; i < value.Length; i++)
+ {
+ //鑷畾涔夌殑绌鸿皟妯″紡
+ ((AC)locadevice).listSupportMode[i] = Convert.ToInt32(value[i].ToString());
+ }
+ locadevice.ReSave();
+ }
}
}
//绌鸿皟鏁版嵁
@@ -312,6 +344,16 @@
//宸茬粡鎺ユ敹鍒扮姸鎬�
locadevice.HadReadDeviceStatu = true;
}
+ else if (attData.AttributeId == 4097)
+ {
+ //杞崲涓轰簩杩涘埗
+ var value = Convert.ToString(attData.AttriButeData, 2).PadLeft(16, '0');
+ //杩欎釜璁剧疆鏄斁鍦ㄥ悗闈㈢殑
+ value = value.Substring(value.Length - 1, 1);
+ //鍚敤鎽嗛鍔熻兘
+ ((AC)locadevice).UseSwingFunction = value == "1";
+ locadevice.ReSave();
+ }
}
}
#endregion
@@ -321,7 +363,7 @@
else if (report.DeviceStatusReport.CluterID == 8)
{
locadevice.DeviceStatusReport = report.DeviceStatusReport;
- if (report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
+ if (locadevice.Type == DeviceType.DimmableLight && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
{
//姝ゅ睘鎬ц〃鏄庡綋鍓嶄寒搴︾▼搴�
((DimmableLight)locadevice).Level = report.DeviceStatusReport.AttriBute[0].AttriButeData;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index f0ea83f..4952414 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -510,6 +510,13 @@
/// <param name="saveRealRoom">鏄惁淇敼鐪熷疄鐗╃悊璁惧鐨勬埧闂�,涓嶅嚭鎰忓,杩欎釜鍊奸粯璁や负true鍗冲彲</param>
public void ChangedRoom(CommonDevice device, string roomId, bool saveRealRoom = true)
{
+ //閫夋嫨鐨勬槸鏈垎閰�
+ if (roomId == string.Empty)
+ {
+ //浠庡師鏉ョ殑鎴块棿绉婚櫎璁惧
+ this.DeleteDevice(device);
+ return;
+ }
//鎴块棿鏄惁淇敼
if (this.IsRoomChanged(device, roomId) == false)
{
@@ -763,6 +770,11 @@
var listEsxit = new HashSet<string>();
foreach (var room in this.dicRooms.Values)
{
+ if (room.IsLove == true)
+ {
+ //涓嶅寘鍚敹钘忔埧闂�
+ continue;
+ }
foreach (string mainkeys in room.ListDevice)
{
if (listEsxit.Contains(mainkeys) == false)
@@ -776,6 +788,11 @@
var commonDeviceList = LocalDevice.Current.listAllDevice;
foreach (var device in commonDeviceList)
{
+ //鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
+ if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
+ {
+ continue;
+ }
string mainkeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (listEsxit.Contains(mainkeys) == false)
{
@@ -1010,7 +1027,7 @@
if (Config.Instance.Home.ListRooms.Contains("Favorite") == false)
{
//榛樿娣诲姞鍠滅埍鐨勬埧闂�--绂佹淇敼鎴块棿鍚�
- var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.JPG", Id = "Favorite" };
+ var love = new Room { Name = Language.StringByID(R.MyInternationalizationString.Favorite), BackgroundImage = "RoomIcon/0.jpg", Id = "Favorite" };
love.Save(false);
//娣诲姞鍒癶ouse 鎴块棿璺緞鍒楄〃
var currentHome = Config.Instance.Home;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index 0d8549e..048a5e9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -428,6 +428,11 @@
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
foreach (var room in listAllRoom)
{
+ if (room.IsLove == true)
+ {
+ //涓嶅寘鍚敹钘忔埧闂�
+ continue;
+ }
foreach (int sceneId in room.ListSceneId)
{
if (listEsxit.Contains(sceneId) == false)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 8ec74ce..5c673dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -1412,7 +1412,11 @@
int floorCount = 0;
foreach (var myRoom in memberShardInfo.dicShardRoom.Values)
{
- if (myRoom.FloorId == roomTemp.FloorId) { floorCount++; }
+ //2020.03.24杩藉姞:涓嶈兘鏄嚜韬埧闂�
+ if (myRoom.FloorId == roomTemp.FloorId && myRoom.Id != roomTemp.Id)
+ {
+ floorCount++;
+ }
}
if (floorCount == 0)
{
@@ -1421,7 +1425,6 @@
//鎵ц涓婁紶瀵硅薄
result = await this.DoUploadFloorObject(memberShardInfo);
}
-
}
if (result == false)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 97d8067..0ba8540 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -655,6 +655,8 @@
HdlThreadLogic.Current.RunMain(() =>
{
+ //鏀惰捣宸﹁彍鍗�
+ CommonPage.Instance.CloseLeftMenu();
//鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
CloseAllOpenForm();
@@ -676,7 +678,7 @@
/// 鍏抽棴鎵�鏈夋墦寮�浜嗙殑鐣岄潰
/// </summary>
/// <param name="tagetFrom">鐩爣鐣岄潰,濡傛灉鎸囧畾浜嗙殑璇�,鍒欏叧闂洰鏍囩晫闈笂灞傜殑鍏ㄩ儴鐣岄潰(瀹冭嚜韬笉鍏抽棴)</param>
- public static void CloseAllOpenForm(string tagetFrom = "")
+ public static void CloseAllOpenForm(string tagetFrom = null)
{
while (UserView.HomePage.Instance.ChildrenCount > 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
index 7b1109c..07b2928 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/IndoorUnitListForm.cs
@@ -211,21 +211,13 @@
{
for (int i = 0; i < listDevice.Count; i++)
{
- if (i != 0 && i % 3 == 0)
+ if (this.Parent == null)
{
- //璇诲彇5涓悗锛岄棿闅斾竴娈垫椂闂�
- System.Threading.Thread.Sleep(200);
- if (this.Parent == null)
- {
- return;
- }
+ return;
}
- //鑾峰彇褰撳墠瀹ゆ俯
- ((AC)listDevice[i]).ReadLocalTemperature();
- //鑾峰彇寮�鍏崇姸鎬�(澶勪簬鏌愮宸ヤ綔鐘舵��,鍗充负鎵撳紑鐘舵��)
- ((AC)listDevice[i]).ReadSystemMode();
- //娓呮礂婊ょ綉
- listDevice[i].ReadAttri(Cluster_ID.Thermostat, AttriButeId.FilterCleaningStatus);
+ //璇诲彇鐘舵��
+ Phone.Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendThermostatStatuComand(listDevice[i]);
+ System.Threading.Thread.Sleep(200);
}
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index 7e06c98..1477384 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -121,22 +121,31 @@
//鍒掔嚎
btnType.AddBottomLine();
- //鎵�灞炲尯鍩�
+ //瀹夎浣嶇疆
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
listview.AddChidren(rowBeloneArea);
- rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
//搴曠嚎
rowBeloneArea.AddBottomLine();
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
{
if (device is OTADevice)
{
continue;
}
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
+ }
+
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
index 1ec0c90..4462aa1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
@@ -51,11 +51,12 @@
bodyFrameLayout.AddChidren(listView);
//璁惧鍚嶇О
+ var myInfoType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
var rowName = new FrameRowControl(listView.rowSpace / 2);
rowName.UseClickStatu = false;
listView.AddChidren(rowName);
rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uDeviceName), 400);
- rowName.AddMostRightView(Common.LocalDevice.Current.GetDeviceObjectText(listDevice), 600);
+ rowName.AddMostRightView(Language.StringByID(myInfoType.ConcreteTextId), 600);
rowName.AddBottomLine();
//璁惧鍨嬪彿
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index a80cecc..04fb935 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -22,6 +22,10 @@
/// </summary>
private VerticalListRefreshControl listView = null;
/// <summary>
+ /// 鍓嶄竴娆℃樉绀哄嚭宸︽粦鑿滃崟鐨凴owLayout
+ /// </summary>
+ private RowLayoutControl oldShowRightMuneRow = null;
+ /// <summary>
/// 琛屾帶浠剁殑淇℃伅(Keys锛歁ac鍦板潃)
/// </summary>
private Dictionary<string, DeviceObjRowInfo> dicRowInfo = new Dictionary<string, DeviceObjRowInfo>();
@@ -214,6 +218,7 @@
//鎺т欢
var rowMenu = new DeviceObjectControl(deviceMac, listView.rowSpace / 2);
+ rowMenu.MainKeys = deviceMac;
frameTable.AddChidren(rowMenu);
rowMenu.InitControl();
rowInfo.MenuRow = rowMenu;
@@ -276,6 +281,16 @@
//鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
this.nowActionDeviceMac = deviceMac;
};
+ //宸︽粦鑿滃崟浜嬩欢
+ rowMenu.OpenMenuAction += () =>
+ {
+ if (this.oldShowRightMuneRow != null && this.oldShowRightMuneRow.MainKeys != rowMenu.MainKeys)
+ {
+ //宸︽粦鑿滃崟鍙兘婊戜竴涓�
+ this.oldShowRightMuneRow.HideMenu();
+ }
+ this.oldShowRightMuneRow = rowMenu;
+ };
}
#endregion
@@ -331,6 +346,7 @@
//琛屾帶浠�
var rowDevice = new DeviceRoomControl(device, frame.rowSpace / 2);
+ rowDevice.MainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
frame.AddChidren(rowDevice);
rowDevice.frameTable.LeftOffset = Application.GetRealWidth(173) - ControlCommonResourse.XXLeft;
rowDevice.InitControl();
@@ -370,6 +386,16 @@
//鏄剧ず璁惧鍔熻兘閰嶇疆鐣岄潰
this.ShowDeviceFunctionSettionForm(device, deviceEnumInfo);
};
+ //宸︽粦鑿滃崟浜嬩欢
+ rowDevice.OpenMenuAction += () =>
+ {
+ if (this.oldShowRightMuneRow != null && this.oldShowRightMuneRow.MainKeys != rowDevice.MainKeys)
+ {
+ //宸︽粦鑿滃崟鍙兘婊戜竴涓�
+ this.oldShowRightMuneRow.HideMenu();
+ }
+ this.oldShowRightMuneRow = rowDevice;
+ };
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 083edd8..29791bd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -124,16 +124,18 @@
//鍒掔嚎
btnType.AddBottomLine();
- //鎵�灞炲尯鍩�
+ //瀹夎浣嶇疆
var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
listview.AddChidren(rowBeloneArea);
- rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
//搴曠嚎
rowBeloneArea.AddBottomLine();
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
{
if (device is OTADevice)
@@ -141,6 +143,12 @@
//閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
continue;
}
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
+ }
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index b38c2f3..faf2482 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -563,7 +563,7 @@
for (int i = 0; i < listOtherId.Count; i++)
{
pra2.Id = listOtherId[i];
- result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra);
+ result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra2);
if (result == false)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index 870a8e0..79d580c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -73,29 +73,31 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- listview = new VerticalScrolViewLayout();
- listview.Height = Application.GetRealHeight(1981 - 184);
- bodyFrameLayout.AddChidren(listview);
HdlThreadLogic.Current.RunMain(() =>
- {
+ {
+ listview = new VerticalScrolViewLayout();
+ listview.Height = Application.GetRealHeight(1981 - 184);
+ bodyFrameLayout.AddChidren(listview);
+
//娣诲姞鑺傝兘妯″紡
this.AddEnergyConservationRow();
//娣诲姞鐐瑰嚮鍓嶏紝浜害杩涘害鏉�
this.AddBeforeClickProgress();
//娣诲姞鐐瑰嚮鍚庯紝浜害杩涘害鏉�
this.AddAfterClickProgress();
- });
- //瀹瑰櫒琛ュ厖
- FinishInitControl(listview);
- //淇濆瓨
- var btnSave = new BottomClickButton();
- btnSave.TextID = R.MyInternationalizationString.uSave;
- bodyFrameLayout.AddChidren(btnSave);
- btnSave.ButtonClickEvent += (sender, e) =>
- {
- //淇濆瓨闈㈡澘鏁版嵁
- this.SavePanelData();
- };
+
+ this.FinishInitControl(listview, energyModeInfo.enable);
+
+ //淇濆瓨
+ var btnSave = new BottomClickButton();
+ btnSave.TextID = R.MyInternationalizationString.uSave;
+ bodyFrameLayout.AddChidren(btnSave);
+ btnSave.ButtonClickEvent += (sender, e) =>
+ {
+ //淇濆瓨闈㈡澘鏁版嵁
+ this.SavePanelData();
+ };
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
index 21d70d7..085aae4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLightSettionForm.cs
@@ -112,6 +112,10 @@
frameBack.Height = Application.GetRealHeight(170);
bodyFrameLayout.AddChidren(frameBack);
+ //褰撳墠浜害(鍏堝０鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+
//鑺傝兘妯″紡
frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
//寮�鍏虫帶浠�
@@ -126,11 +130,15 @@
{
frameBack.Height += value;
frameLinght.Y += value;
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
else
{
frameBack.Height -= value;
frameLinght.Y -= value;
+ btnProgressView1.Visible = false;
+ btnProgress1.Visible = false;
}
};
if (energyModeInfo.enable == true)
@@ -139,20 +147,20 @@
}
//褰撳墠浜害
- var btnProgressView1 = new NormalViewControl(200, 49, true);
btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(164);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
- var btnProgress1 = new NormalViewControl(200, 49, true);
+ btnProgressView1.Visible = false;
btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(164);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
btnProgress1.Text = energyModeInfo.level + "%";
frameBack.AddChidren(btnProgress1);
+ btnProgress1.Visible = false;
//杩涘害鏉�
var seekBar1 = new SeekBarControl();
@@ -190,6 +198,9 @@
var value = Application.GetRealHeight(259);
frameBack.Height += value;
frameLinght.Y += value;
+
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
}
@@ -285,19 +296,24 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xff666666;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+ var frameColorLine = new FrameLayoutControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = Application.GetMinRealAverage(79);
+ frameColorLine.Width = Application.GetMinRealAverage(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.Y = Application.GetRealHeight(5);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+ btnColor.Gravity = Gravity.Center;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
@@ -422,19 +438,24 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xff666666;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+ var frameColorLine = new FrameLayoutControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = Application.GetMinRealAverage(79);
+ frameColorLine.Width = Application.GetMinRealAverage(79);
+ frameColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+ frameColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Y = Application.GetRealHeight(5);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+ btnColor.Gravity = Gravity.Center;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = backColor;
- frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
index 5475445..54474b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
@@ -132,7 +132,7 @@
nowSelectIcon1.BorderColor = UserCenterColor.Current.White;
}
wheelSelectIcon2.BackgroundColor = this.GetColorByRGB(eColor[0], eColor[1], eColor[2]);
- wheelSelectIcon1.BorderColor = 0xff666666;
+ wheelSelectIcon1.BorderColor = 0xffcccccc;
wheelSelectIcon1.Name = listRGB[0] + "-" + listRGB[1] + "-" + listRGB[2];
nowSelectIcon1 = wheelSelectIcon1;
};
@@ -179,7 +179,9 @@
btnFrame.BorderColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(btnFrame);
- var btnIcon = new IconViewControl(60);
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int iconWidth = btnFrame.Height - Application.GetMinRealAverage(10) - Application.GetMinRealAverage(10);
+ var btnIcon = new IconViewControl(iconWidth, false);
btnIcon.Gravity = Gravity.Center;
btnIcon.Radius = (uint)btnIcon.IconSize / 2;
btnFrame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
@@ -193,7 +195,7 @@
else
{
//鍘熸潵鐨勯鑹�
- btnFrame.BorderColor = 0xff666666;
+ btnFrame.BorderColor = 0xffcccccc;
btnIcon.BackgroundColor = this.GetColorByRGB((byte)i_R, (byte)i_G, (byte)i_B);
wheelSelectIcon1 = btnFrame;
wheelSelectIcon2 = btnIcon;
@@ -207,7 +209,7 @@
{
nowSelectIcon1.BorderColor = UserCenterColor.Current.White;
}
- btnFrame.BorderColor = 0xff666666;
+ btnFrame.BorderColor = 0xffcccccc;
nowSelectIcon1 = btnFrame;
if (btnFrame.Name != null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
index 6ae4781..ef714aa 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentLightSettionForm.cs
@@ -235,19 +235,23 @@
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
//棰滆壊澶栨
- var btnColorLine = new NormalViewControl(Application.GetMinRealAverage(79), Application.GetMinRealAverage(79), false);
- btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
- btnColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
- btnColorLine.BorderWidth = 1;
- btnColorLine.BorderColor = 0xff666666;
- frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEventOnly);
+ var frameColorLine = new FrameLayoutControl();
+ frameColorLine.UseClickStatu = false;
+ frameColorLine.Height = Application.GetMinRealAverage(79);
+ frameColorLine.Width = Application.GetMinRealAverage(79);
+ frameColorLine.Radius = (uint)Application.GetMinRealAverage(79) / 2;
+ frameColorLine.BorderWidth = 1;
+ frameColorLine.BorderColor = 0xffcccccc;
+ frameColor.AddChidren(frameColorLine, ChidrenBindMode.NotBind);
- var btnColor = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(69), false);
- btnColor.Y = Application.GetRealHeight(5);
- btnColor.X = btnColorView.Right + Application.GetRealHeight(23);
- btnColor.Radius = (uint)Application.GetMinRealAverage(69) / 2;
+ //鍒嗕袱姝ヨ绠楋紝涓嶇劧鏈夊彲鑳藉畠寰楀嚭鐨勭粨鏋滄湁璇樊瀵艰嚧涓嶅眳涓�
+ int btnColorWidth = frameColorLine.Height - Application.GetMinRealAverage(7) - Application.GetMinRealAverage(7);
+ var btnColor = new NormalViewControl(btnColorWidth, btnColorWidth, false);
+ btnColor.Gravity = Gravity.Center;
+ btnColor.Radius = (uint)btnColorWidth / 2;
btnColor.BackgroundColor = UserCenterColor.Current.ErrorColor;
- frameColor.AddChidren(btnColor, ChidrenBindMode.BindEventOnly);
+ frameColorLine.AddChidren(btnColor, ChidrenBindMode.NotBind);
+ frameColor.ChangedChidrenBindMode(frameColorLine, ChidrenBindMode.BindEventOnly);
//鍙樻洿婊戝姩鏉＄殑棰滆壊
seekBar1.ProgressBarColor = backColor;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 8e4e596..f81d8a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -139,6 +139,10 @@
frameBack.Height = Application.GetRealHeight(170);
bodyFrameLayout.AddChidren(frameBack);
+ //褰撳墠浜害(鍏堝０鏄�,涓轰簡瀵瑰簲IOS鐨勬姌鍙犲悗,娌℃湁瀹屽叏閬尅鐨勯棶棰�)
+ var btnProgressView1 = new NormalViewControl(200, 49, true);
+ var btnProgress1 = new NormalViewControl(200, 49, true);
+
//鑺傝兘妯″紡
frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
//寮�鍏虫帶浠�
@@ -154,12 +158,16 @@
frameBack.Height += value;
btnClickStatu.Y += value;
frameLinght.Y += value;
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
else
{
frameBack.Height -= value;
btnClickStatu.Y -= value;
frameLinght.Y -= value;
+ btnProgressView1.Visible = false;
+ btnProgress1.Visible = false;
}
//鏁版嵁鍙樻洿
valueChanged = true;
@@ -170,20 +178,20 @@
}
//褰撳墠浜害
- var btnProgressView1 = new NormalViewControl(200, 49, true);
btnProgressView1.X = ControlCommonResourse.XXLeft;
btnProgressView1.Y = Application.GetRealHeight(161);
btnProgressView1.TextSize = 12;
btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
frameBack.AddChidren(btnProgressView1);
- var btnProgress1 = new NormalViewControl(200, 49, true);
+ btnProgressView1.Visible = false;
btnProgress1.X = Application.GetRealWidth(222);
btnProgress1.Y = Application.GetRealHeight(158);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
btnProgress1.Text = energyModeInfo.level + "%";
frameBack.AddChidren(btnProgress1);
+ btnProgress1.Visible = false;
//杩涘害鏉�
var seekBar1 = new SeekBarControl();
@@ -223,6 +231,9 @@
frameBack.Height += value;
btnClickStatu.Y += value;
frameLinght.Y += value;
+
+ btnProgressView1.Visible = true;
+ btnProgress1.Visible = true;
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 4c8f07e..b4c3023 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -9,13 +9,9 @@
{
public class DoorLockCommonInfo : CommonDevice
{
- #region 鏈湴鍙橀噺
+ #region 鏈湴鍙橀噺
/// <summary>
- /// 鏄惁甯稿紑妯″紡[褰撴暟鎹幏鍙栧け璐ワ紝杩斿洖绌篯
- /// </summary>
- public static bool? IsDoorLockNormallyMode = new bool?();
- /// <summary>
- /// 甯稿紑妯″紡鏃堕棿
+ /// 甯稿紑妯″紡鎵ц鏃堕棿
/// </summary>
public static int NormallyOpenModeInvalidTime = 12;
/// <summary>
@@ -83,6 +79,7 @@
/// <returns></returns>
public static async System.Threading.Tasks.Task<bool?> GetNormallyOpenMode(ZigBee.Device.DoorLock doorLock)
{
+ bool? IsDoorLockNormallyMode = null;
var result = await doorLock.ReadNormallyOpenModeFuncAsync();
//鍏遍�氶敊璇娴�
string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
@@ -100,7 +97,6 @@
{
IsDoorLockNormallyMode = false;
}
-
return IsDoorLockNormallyMode;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 08dbd3b..a589934 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -251,7 +251,7 @@
if (DateTime.Now < ZigBee.Device.DoorLock.minValue)
{
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoFiftySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NoFiftySeconds));
return;
}
@@ -266,7 +266,7 @@
ZigBee.Device.DoorLock.minValue = DateTime.Now.AddSeconds(+15);
oldTime = ZigBee.Device.DoorLock.minValue;
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AfterFiftySeconds), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AfterFiftySeconds));
return;
}
@@ -275,7 +275,7 @@
ZigBee.Device.DoorLock.RemoteUnlockCount--;
string tipText = Language.StringByID(R.MyInternationalizationString.PasswordError) + "," + Language.StringByID(R.MyInternationalizationString.Surplus) + ZigBee.Device.DoorLock.RemoteUnlockCount.ToString() + Language.StringByID(R.MyInternationalizationString.Opportunity);
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = tipText, Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
+ this.ShowMassage(ShowMsgType.Tip, tipText);
return;
}
@@ -299,7 +299,7 @@
if (!UserCenterResourse.AccountOption.DoorUnLockByRemote)
{
string msg = Language.StringByID(R.MyInternationalizationString.RemoteUnlockBindSucessTip).Replace("{0}", "\r\n");
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -315,14 +315,14 @@
ZigBee.Device.DoorLock.RemoteUnlockCount--;
string tipText = Language.StringByID(R.MyInternationalizationString.OperrateFailed) + "," + Language.StringByID(R.MyInternationalizationString.Surplus) + ZigBee.Device.DoorLock.RemoteUnlockCount.ToString() + Language.StringByID(R.MyInternationalizationString.Opportunity);
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = tipText, Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
+ this.ShowMassage(ShowMsgType.Tip, tipText);
return;
}
}
else
{
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
return;
}
};
@@ -344,7 +344,7 @@
public static void SecurityRequest(ZigBee.Device.DoorLock doorLock, Action action)
{
string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -362,7 +362,7 @@
public void BindRemoteUnlockDoorlock(ZigBee.Device.DoorLock doorLock, Button btnDoorLockTitle = null)
{
string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
- var alertRemoteUnlockRequest = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ var alertRemoteUnlockRequest = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
alertRemoteUnlockRequest.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alertRemoteUnlockRequest.ConfirmClickEvent += () =>
@@ -390,7 +390,7 @@
public void SystemSecondAuthentication()
{
string msgDoorUnLockByRemote = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
- var alertDoorUnLockByRemote = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgDoorUnLockByRemote, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ var alertDoorUnLockByRemote = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msgDoorUnLockByRemote, Language.StringByID(R.MyInternationalizationString.GoSetting));
alertDoorUnLockByRemote.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alertDoorUnLockByRemote.ConfirmClickEvent += () =>
@@ -422,7 +422,7 @@
}
string msg = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -472,7 +472,7 @@
if (btnStatus != null)
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.DoorLockOpen);
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UnlockSuccess));
}
});
//寮�閿佹垚鍔燂紝榛樿5绉掑悗闂ㄩ攣鑷姩鍏抽攣锛屾牴鎹笉鍚岀殑闂ㄩ攣鍙兘鏃堕棿涓嶅悓锛岃繖閲屼互鈥淗06C鈥濋棬閿佺粰鐨勬椂闂�
@@ -480,10 +480,7 @@
}
else
{
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
- });
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UnlockFailed));
}
}
//鐢ㄤ簬杩滅▼寮�閿佺殑闂ㄩ攣涓殑瀵嗙爜琚垹闄ゆ儏鍐�
@@ -493,17 +490,14 @@
ZigBee.Device.DoorLock.failedCount--;
if (ZigBee.Device.DoorLock.failedCount != 0)
{
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
- });
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UnlockFailed));
}
else
{
//3娆℃搷浣滃け璐ヨ繙绋嬪紑閿佸け璐ュ悗锛岄噸鍐欒缃繙绋嬪紑閿佸瘑鐮�
Application.RunOnMainThread(() =>
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear));
doorLock.RemoteUnlockPassword = "";
var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
@@ -525,10 +519,7 @@
//杩滅▼寮�閿佸け璐ョ殑鎯呭喌
else
{
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
- });
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.GwResponseOvertime));
}
}
catch { }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index aba9c27..d91ff33 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -171,8 +171,16 @@
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
- {
+ {
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
+ }
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index b1fb776..e31c7df 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -135,28 +135,8 @@
{
///澶囨敞锛歐JC鐨�
///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
- Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
- }
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
+ Shared.Phone.Device.Logic.SkipView.SkipAddLogic(1, doorLock, accountObj);
+
}
};
btnRight.MouseUpEventHandler += eHandler;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 141413a..e694c22 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -592,6 +592,10 @@
void HasRemoteUnlockAccessMethod(bool hasAccess)
{
string msg = Language.StringByID(R.MyInternationalizationString.SureGiveAccessToSubaccount);
+ if (!hasAccess)
+ {
+ msg = Language.StringByID(R.MyInternationalizationString.SureCancelAccessToSubaccount);
+ }
var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
index 366e7e6..d1de6cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
@@ -11,27 +11,38 @@
public class ShowDoorLockMsgControl
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 鐐瑰嚮澶辨晥鍥炶皟鐨勪簨浠�
+ /// </summary>
public Action<string> InvalidTimeAction = null;
/// <summary>
- /// 鐐瑰嚮鍙栨秷鐨勪簨浠�
+ /// 鐐瑰嚮鍙栨秷鐨勫洖璋冧簨浠�
/// </summary>
public Action CancelClickEvent = null;
/// <summary>
- /// 鐐瑰嚮鑷姩鍖栫殑浜嬩欢
+ /// 鐐瑰嚮鑷姩鍖栫殑鍥炶皟浜嬩欢
/// </summary>
public Action LogicClickEvent = null;
/// <summary>
- /// 鐐瑰嚮纭鐨勪簨浠�
+ /// 鐐瑰嚮纭鐨勫洖璋冧簨浠�
/// </summary>
public Action InvalidClickEvent = null;
/// <summary>
- /// 鐐瑰嚮纭鐨勪簨浠�
+ /// 鐐瑰嚮纭鐨勫洖璋冧簨浠�
/// </summary>
public Action ConfirmClickEvent = null;
+ /// <summary>
+ /// 鐐瑰嚮寮圭獥鑳屾櫙鍥炶皟浜嬩欢
+ /// </summary>
+ public Action MsgControlClickEvent = null;
/// <summary>
/// 淇℃伅绫诲瀷
/// </summary>
private DoorLockMsgType msgType = DoorLockMsgType.Confirm;
+ /// <summary>
+ /// 寮圭獥鑳屾櫙
+ /// </summary>
+ public FrameLayout MsgControlFrameLayout = null;
/// <summary>
/// 娑堟伅
/// </summary>
@@ -96,9 +107,17 @@
return;
}
//涓绘帶浠�
- var frameMain = new FrameLayout();
- frameMain.BackgroundColor = UserCenterColor.Current.DialogBackColor;
- ((ViewGroup)nowForm).AddChidren(frameMain);
+ MsgControlFrameLayout = new FrameLayout();
+ MsgControlFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
+ ((ViewGroup)nowForm).AddChidren(MsgControlFrameLayout);
+ MsgControlFrameLayout.MouseDownEventHandler += (sender, e) =>
+ {
+ //绉婚櫎鐣岄潰
+ MsgControlFrameLayout.RemoveFromParent();
+ //鍥炶皟鍑芥暟
+ this.MsgControlClickEvent?.Invoke();
+ this.MsgControlClickEvent = null;
+ };
//鐧借壊鑳屾櫙妗�
var frameBack = new FrameLayout();
@@ -117,7 +136,7 @@
frameBack.Width = Application.GetRealWidth(792);
frameBack.Y = Application.GetRealHeight(706);
}
- frameMain.AddChidren(frameBack);
+ MsgControlFrameLayout.AddChidren(frameBack);
//鏍囬
var btnTitle = new NormalViewControl(frameBack.Width, Application.GetRealHeight(65), false);
@@ -163,12 +182,12 @@
if (msgType == DoorLockMsgType.Confirm || msgType == DoorLockMsgType.InValid || msgType == DoorLockMsgType.NomallyOpenMode)
{
//鍒濆鍖栫‘璁ょ被鍨嬬殑搴曢儴鎸夐挳
- this.InitBottomConfirmButton(frameMain, frameBack);
+ this.InitBottomConfirmButton(MsgControlFrameLayout, frameBack);
}
else if (msgType == DoorLockMsgType.DoorLockLogic || msgType == DoorLockMsgType.CancelNomallyOpenModeWithLogic)
{
//澶辨晥璁剧疆鐨勫簳閮ㄦ寜閽�
- this.InitBottomLogicButton(frameMain, frameBack);
+ this.InitBottomLogicButton(MsgControlFrameLayout, frameBack);
}
}
@@ -243,8 +262,10 @@
TextSize = 14,
Text = DoorLockCommonInfo.NormallyOpenModeInvalidTime.ToString(),
PlaceholderTextColor = ZigbeeColor.Current.XMGray3,
+ IsNumberKeyboardType = true,
};
editTextFrameLayout.AddChidren(editInvalidTime);
+
var btnMsg2 = new Button()
{
@@ -325,13 +346,22 @@
btnConfirm.InitControl(buttonOkText);
btnConfirm.ButtonClickEvent += (sender, e) =>
{
+ string textValue = string.Empty;
+ if (editInvalidTime != null)
+ {
+ textValue = editInvalidTime.Text.Trim();
+ if (this.CheckInvalidTime(textValue.TrimStart('0')) == false)
+ {
+ return;
+ }
+ }
//绉婚櫎鐣岄潰
frameMain.RemoveFromParent();
if (msgType == DoorLockMsgType.InValid)
{
if (InvalidTimeAction != null)
{
- InvalidTimeAction(editInvalidTime.Text);
+ InvalidTimeAction(textValue);
}
}
else
@@ -343,6 +373,49 @@
};
}
+ /// <summary>
+ /// 妫�娴嬪け鏁堟椂闂�
+ /// </summary>
+ /// <param name="tetxValue"></param>
+ /// <returns></returns>
+ private bool CheckInvalidTime(string tetxValue)
+ {
+ if (tetxValue == string.Empty)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘鐪佺暐");
+ msgContr.Show();
+ return false;
+ }
+ foreach (var c in tetxValue)
+ {
+ if (char.IsNumber(c) == false)
+ {
+ return false;
+ }
+ }
+ if (tetxValue.Length >= 3)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂");
+ msgContr.Show();
+ return false;
+ }
+
+ int value = Convert.ToInt32(tetxValue);
+ if (value <= 0)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘灏忎簬1灏忔椂");
+ msgContr.Show();
+ return false;
+ }
+ if (value > 36)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬36灏忔椂");
+ msgContr.Show();
+ return false;
+ }
+ return true;
+ }
+
#endregion
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index cd8183c..1ad9beb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -920,12 +920,14 @@
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMinute = cur.Minute;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateSecond = cur.Second;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateSecond = cur.Second;
+
+ var InValidTime = cur.AddDays(1);
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateYear = cur.Year;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = cur.Year;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = InValidTime.Year;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth = cur.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = cur.Month;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
//doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
index 8e98169..81832f0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TimeSettignPage.cs
@@ -409,7 +409,7 @@
textZone.Text = zoneData();
textZone.MouseDownEventHandler += (sender, e) =>
{
- GetSpecificZoneNowDate();
+ //GetSpecificZoneNowDate();
};
var btnLine = new FrameLayout()
@@ -697,12 +697,40 @@
{
if (setTimeType == "ValidTime")
{
+ string nowValue1 = DateTime.Now.ToString("yyyyMMdd");
+ string nowValue2 = dtNow.Year.ToString() + curMonth.ToString().PadLeft(2, '0') + curDay.ToString().PadLeft(2, '0');
+ if (nowValue1.CompareTo(nowValue2) == 1)
+ {
+ this.ShowMassage(ShowMsgType.Error, "鐢熸晥鏃ユ湡涓嶈兘澶т簬褰撳墠鏃ユ湡");
+ return;
+ }
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(dtNow.Year, curMonth, curDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "鐢熸晥鏃堕棿涓嶈兘灏忎簬澶辨晥鏃堕棿");
+ return;
+ }
DoorLockCommonInfo.ValidDateYear = dtNow.Year;
DoorLockCommonInfo.ValidDateMonth = curMonth;
DoorLockCommonInfo.ValidDateDay = curDay;
}
else
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ dtNow.Year, curMonth, curDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.InValidDateYear = dtNow.Year;
DoorLockCommonInfo.InValidDateMonth = curMonth;
DoorLockCommonInfo.InValidDateDay = curDay;
@@ -875,13 +903,35 @@
btnOk.MouseUpEventHandler += (sender1, e1) =>
{
if (setTimeType == "ValidTime")
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ curHour, curMin, curSec,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ DoorLockCommonInfo.InValidDateHour, DoorLockCommonInfo.InValidDateMinute, DoorLockCommonInfo.InValidDateSecond);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.ValidDateHour = curHour;
DoorLockCommonInfo.ValidDateMinute = curMin;
DoorLockCommonInfo.ValidDateSecond = curSec;
}
else
- {
+ {
+ //妫�鏌ユ椂闂�
+ var flage = this.CheckValidTime(DoorLockCommonInfo.ValidDateYear, DoorLockCommonInfo.ValidDateMonth, DoorLockCommonInfo.ValidDateDay,
+ DoorLockCommonInfo.ValidDateHour, DoorLockCommonInfo.ValidDateMinute, DoorLockCommonInfo.ValidDateSecond,
+ DoorLockCommonInfo.InValidDateYear, DoorLockCommonInfo.InValidDateMonth, DoorLockCommonInfo.InValidDateDay,
+ curHour, curMin, curSec);
+ if (flage == false)
+ {
+ this.ShowMassage(ShowMsgType.Error, "澶辨晥鏃堕棿涓嶈兘澶т簬鐢熸晥鏃堕棿");
+ return;
+ }
+
DoorLockCommonInfo.InValidDateHour = curHour;
DoorLockCommonInfo.InValidDateMinute = curMin;
DoorLockCommonInfo.InValidDateSecond = curSec;
@@ -896,6 +946,36 @@
}
}
}
+
+ /// <summary>
+ /// 妫�鏌ユ椂闂�
+ /// </summary>
+ /// <returns></returns>
+ private bool CheckValidTime(int validYear, int validMoth, int validDay, int validHour, int validMinute, int validSecond
+ , int inValidYear, int inValidMoth, int inValidDay, int inValidHour, int inValidMinute, int inValidSecond)
+ {
+ //鐢熸晥鏃堕棿
+ string nowValue1 = validYear.ToString()
+ + validMoth.ToString().PadLeft(2, '0')
+ + validDay.ToString().PadLeft(2, '0')
+ + validHour.ToString().PadLeft(2, '0')
+ + validMinute.ToString().PadLeft(2, '0')
+ + validSecond.ToString().PadLeft(2, '0');
+ //澶辨晥鏃堕棿
+ string nowValue2 = inValidYear.ToString()
+ + inValidMoth.ToString().PadLeft(2, '0')
+ + inValidDay.ToString().PadLeft(2, '0')
+ + inValidHour.ToString().PadLeft(2, '0')
+ + inValidMinute.ToString().PadLeft(2, '0')
+ + inValidSecond.ToString().PadLeft(2, '0');
+
+ if (nowValue1.CompareTo(nowValue2) == 1)
+ {
+ return false;
+ }
+ return true;
+ }
+
#endregion
#region 绉婚櫎鏂规硶
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index ac08e64..d29988a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -25,10 +25,6 @@
#region 鍙橀噺鐢虫槑
/// <summary>
- /// IsDrawerLockMode
- /// </summary>
- public bool IsDrawerLockMode;
- /// <summary>
/// 褰撳墠闂ㄩ攣
/// </summary>
ZigBee.Device.DoorLock doorLock;
@@ -52,6 +48,10 @@
/// 淇濈暀涓婁竴娆￠煶閲�
/// </summary>
bool canOpenNormallyMode = false;
+ /// <summary>
+ /// IsDrawerLockMode[涓婚〉宸︽粦]
+ /// </summary>
+ public bool IsDrawerLockMode;
/// <summary>
/// 褰撳墠鐢甸噺
/// </summary>
@@ -211,6 +211,12 @@
{
ReadDoorLockUserInfo();
}
+ else
+ {
+ string msg1 = Language.StringByID(R.MyInternationalizationString.DoorLockOffLine);
+ this.ShowTipMsg(msg1);
+ return;
+ }
}
/// <summary>
@@ -305,7 +311,10 @@
TextSize = 10,
TextAlignment = TextAlignment.CenterLeft,
};
- midTopFrameLayout.AddChidren(btnCurrentPowerText);
+ midTopFrameLayout.AddChidren(btnCurrentPowerText);
+#if Android
+ btnCurrentPowerText.X = btnStatus.Right + Application.GetRealWidth(20);
+#endif
//闂ㄩ攣寮�/鍏冲浘鐗�
btnDoorLockPic = new Button()
@@ -517,13 +526,14 @@
};
flMain.AddChidren(progressBackground);
+ var progressValue = (currentVolume * (Convert.ToInt32(((float)100 / 15) * 100))) / 100;
progressText = new Button()
{
Height = Application.GetRealHeight(58),
Y = Application.GetRealHeight(89),
TextColor = ZigbeeColor.Current.XMGray2,
TextAlignment = TextAlignment.Center,
- Text = currentVolume.ToString(),
+ Text = progressValue.ToString() + "%",
};
diyImageVerticalSeekBar = new DiyImageVerticalSeekBar()
@@ -539,7 +549,7 @@
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉＄殑瀹藉害
- Progress = (currentVolume * (Convert.ToInt32(((float)100 / 15) * 100))) / 100,
+ Progress = progressValue,
};
progressBackground.AddChidren(progressText);
progressBackground.AddChidren(diyImageVerticalSeekBar);
@@ -561,7 +571,7 @@
curVolume = comandValueTemp;
}
currentVolume = curVolume;
- progressText.Text = curVolume.ToString();
+ progressText.Text = e.ToString() + "%";
};
}
@@ -582,7 +592,21 @@
var tempDoor = (ZigBee.Device.DoorLock)tempDevice;
if (tempDoor.doorLockOperatingEventNotificationCommand != null)
{
- Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
+ //闈炰富浜轰笉寮硅繖涓獥鍙�
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ return;
+ }
+ //闈炵鐞嗗憳鐨勫瘑鐮�,涓嶅脊杩欎釜绐楀彛
+ if (tempDoor.doorLockOperatingEventNotificationCommand.UserID > 9)
+ {
+ return;
+ }
+
+ if (canOpenNormallyMode)
+ {
+ Application.RunOnMainThread(() => { NomallyOpenModeInvalidDialog(true); });
+ }
}
}
@@ -624,25 +648,102 @@
{
CommonPage.Loading.Start("");
});
+
//鏄惁鏀寔甯稿紑
canOpenNormallyMode = DoorLockCommonInfo.CanNormallyOpen(doorLock);
+ if (canOpenNormallyMode)
+ {
+ //鑾峰彇闂ㄩ攣甯稿紑妯″紡
+ var resultRes = await DoorLockCommonInfo.GetNormallyOpenMode(doorLock);
+ if (resultRes == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnNormallyOpen.UnSelectedImagePath = "DoorLock/NormallyOpenOffline.png";
+ btnNormallyOpen.Enable = false;
+ string msg = Language.StringByID(R.MyInternationalizationString.GetNormallyOpenModeFailed);
+ this.ShowTipMsg(msg);
+ });
+ }
+ else
+ {
+ var tempRes = false;
+ if (resultRes == true)
+ {
+ tempRes = true;
+ }
+ else
+ {
+ tempRes = false;
+ }
+
+ NormallyOpenModeValue(tempRes);
+
+ Application.RunOnMainThread(() =>
+ {
+ UpdateNomallyOpenStatus();
+ });
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
+ });
+ }
+
//鏄惁鏀寔闊抽噺
canVolume = DoorLockCommonInfo.CanVolume(doorLock);
+ if (canVolume)
+ {
+ //璇诲彇闊抽噺
+ var resultRes = await doorLock.GetVolumeAsync();
+ if (resultRes == null || resultRes.volumeResponseData == null)
+ {
+ var listDevice = new List<CommonDevice> { };
+ listDevice.Add(doorLock);
+ var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var volumeMsg = Language.StringByID(R.MyInternationalizationString.GetVolumeFailed);
+ this.ShowTipMsg(volumeMsg);
+ });
+ }
+ }
+ else
+ {
+ volumeData = resultRes.volumeResponseData;
+ Application.RunOnMainThread(() =>
+ {
+ UpdateVolume();
+ });
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnVolumeFrameLayout.Width = Application.GetRealWidth(0);
+ btnPower.X = Application.GetRealWidth(444);
+ });
+ }
+
//璇诲彇闂ㄩ攣鐢甸噺锛氱皣ID锛�1 灞炴�D 33
doorLock.ReadAttri(Cluster_ID.Power, AttriButeId.DoorLockPower);
//涓婃姤鐢甸噺绛�1绉�
System.Threading.Thread.Sleep(1000);
- //鑾峰彇闂ㄩ攣甯稿紑妯″紡
- await DoorLockCommonInfo.GetNormallyOpenMode(doorLock);
- //璇诲彇闊抽噺
- ReadVolume();
}
- catch { }
+ catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
finally
{
Application.RunOnMainThread(() =>
{
- UpdateNomallyOpenStatus();
CommonPage.Loading.Hide();
});
}
@@ -732,15 +833,13 @@
//寮�閿佷簨浠�
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
{
- if (DoorLockCommonInfo.IsDoorLockNormallyMode == true)
- {
- string msg0 = Language.StringByID(R.MyInternationalizationString.CurrentNormallyOpenMode);
- this.ShowTipMsg(msg0);
- }
- else
- {
- OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
- }
+ //甯稿紑妯″紡涓�,鐐瑰嚮寮�閿佹棤鏁�
+ if (btnNormallyOpen.IsSelected == true)
+ {
+ this.ShowMassage(ShowMsgType.Remind, "褰撳墠鐘舵�佷负甯稿紑妯″紡");
+ return;
+ }
+ OpenDoorLockHandle(progressButton, btnDoorLockPic, btnStatus);
};
openFrameLayout.MouseUpEventHandler += hander1;
btnDoorOpenPic.MouseUpEventHandler += hander1;
@@ -748,9 +847,16 @@
//鍏抽攣浜嬩欢
EventHandler<MouseEventArgs> hander2 = (sender, e) =>
{
- if (DoorLockCommonInfo.IsDoorLockNormallyMode == true)
+ if (canOpenNormallyMode)
{
- NomallyOpenModeInvalidDialog();
+ var key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ {
+ if (doorLock.IsDoorLockNormallyMode[key] == true)
+ {
+ NomallyOpenModeInvalidDialog();
+ }
+ }
}
else
{
@@ -768,11 +874,6 @@
{
VolumeDialog(progressText, diyImageVerticalSeekBar);
}
- else
- {
- var volumeMsg = Language.StringByID(R.MyInternationalizationString.NoSupport);
- this.ShowTipMsg(volumeMsg);
- }
};
btnVolumeFrameLayout.MouseDownEventHandler += handerVolume;
btnVolume.MouseDownEventHandler += handerVolume;
@@ -781,16 +882,8 @@
//甯稿紑妯″紡鐐瑰嚮浜嬩欢
EventHandler<MouseEventArgs> handerNormallyOpen = (sender, e) =>
{
- if (canOpenNormallyMode)
- {
- btnNormallyOpen.IsSelected = !btnNormallyOpen.IsSelected;
- NomallyOpenDialog();
- }
- else
- {
- var volumeMsg = Language.StringByID(R.MyInternationalizationString.NoSupport);
- this.ShowTipMsg(volumeMsg);
- }
+ NomallyOpenDialog();
+
};
btnNormallyOpenFrameLayout.MouseUpEventHandler += handerNormallyOpen;
btnNormallyOpen.MouseUpEventHandler += handerNormallyOpen;
@@ -831,39 +924,7 @@
}
#endregion
- #region 闊抽噺
- /// <summary>
- /// 璇诲彇闊抽噺
- /// </summary>
- private async void ReadVolume()
- {
- //鑾峰彇闂ㄩ攣闊抽噺
- if (!canVolume)
- {
- return;
- }
- var resultRes = await doorLock.GetVolumeAsync();
-
- if (resultRes == null || resultRes.volumeResponseData == null)
- {
- var listDevice = new List<CommonDevice> { };
- listDevice.Add(doorLock);
- var devTemp = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- if (devTemp.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
- {
- var volumeMsg = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
- this.ShowTipMsg(volumeMsg);
- }
- }
- else
- {
- volumeData = resultRes.volumeResponseData;
- Application.RunOnMainThread(() =>
- {
- UpdateVolume();
- });
- }
- }
+ #region 闊抽噺
/// <summary>
/// 鏇存柊闊抽噺
/// </summary>
@@ -923,12 +984,12 @@
return;
}
Application.RunOnMainThread(() =>
- {
- var volumeMsg = Language.StringByID(R.MyInternationalizationString.SetVolumeSuccess);
- this.ShowTipMsg(volumeMsg);
- oldVolume = currentVolume;
- CommonPage.Loading.Hide();
- });
+ {
+ var volumeMsg = Language.StringByID(R.MyInternationalizationString.SetVolumeSuccess);
+ this.ShowTipMsg(volumeMsg);
+ oldVolume = currentVolume;
+ CommonPage.Loading.Hide();
+ });
}
catch (Exception ex)
{
@@ -938,13 +999,29 @@
}
#endregion
- #region 甯稿紑妯″紡
+ #region 甯稿紑妯″紡
+ /// <summary>
+ /// 闂ㄩ攣甯稿紑妯″紡鍊�
+ /// </summary>
+ public void NormallyOpenModeValue(bool value)
+ {
+ string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ if (doorLock.IsDoorLockNormallyMode.ContainsKey(key))
+ {
+ doorLock.IsDoorLockNormallyMode[key] = value;
+ }
+ else
+ {
+ doorLock.IsDoorLockNormallyMode.Add(key, value);
+ }
+ }
+
/// <summary>
/// 甯稿紑妯″紡澶勭悊
/// </summary>
private async void NomallyOpenDialog()
{
- if (btnNormallyOpen.IsSelected)
+ if (!btnNormallyOpen.IsSelected)
{
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
@@ -964,10 +1041,7 @@
var confirm = Language.StringByID(R.MyInternationalizationString.Confrim);
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.Confirm, msg, confirm);
alert.Show();
- alert.CancelClickEvent += () =>
- {
- btnNormallyOpen.IsSelected = false;
- };
+
alert.ConfirmClickEvent += async () =>
{
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
@@ -976,19 +1050,19 @@
{
string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
this.ShowTipMsg(msg0);
- btnNormallyOpen.IsSelected = false;
return;
}
if (result.defaultControlResponseData.status != 0)
{
string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
this.ShowTipMsg(msg1);
- btnNormallyOpen.IsSelected = false;
return;
}
else
{
- DoorLockCommonInfo.IsDoorLockNormallyMode = true;
+ //姣忔閲嶆柊璁剧疆甯稿紑锛岄粯璁ゆ椂闂撮兘鏄�12灏忔椂
+ DoorLockCommonInfo.NormallyOpenModeInvalidTime = 12;
+ NormallyOpenModeValue(true);
UpdateNomallyOpenStatus();
CommonPage.Loading.Hide();
@@ -997,9 +1071,12 @@
var doorLockInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockInValidSetting);
var alertNomallyModeIsTurnOn = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.DoorLockLogic, msgNomallyModeIsTurnOn, doorLockInValidSetting);
alertNomallyModeIsTurnOn.Show();
+
alertNomallyModeIsTurnOn.LogicClickEvent += () =>
{
- //鑷姩鍖�
+ //鑷姩鍖�
+ Shared.Phone.Device.Logic.SkipView.SkipAddLogic(2);
+
};
alertNomallyModeIsTurnOn.InvalidClickEvent += async () =>
{
@@ -1021,6 +1098,11 @@
/// </summary>
public void NomallyOpenModeInvalidDialog(bool IsFromReport = false)
{
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+ {
+ //this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NoAccess));
+ return;
+ }
string msg = Language.StringByID(R.MyInternationalizationString.NomallyModeIsCanceled).Replace("{0}", "\r\n");
var confirm = Language.StringByID(R.MyInternationalizationString.SureCancel);
var alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.NomallyOpenMode, msg, confirm);
@@ -1030,49 +1112,63 @@
alert = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.CancelNomallyOpenModeWithLogic, msg, confirm);
}
alert.Show();
+ alert.MsgControlClickEvent += async () =>
+ {
+ if (IsFromReport)
+ {
+ //鍙栨秷甯稿紑
+ NormallyOpenModeValue(false);
+ UpdateNomallyOpenStatus();
+ }
+ else
+ {
+ //淇濇寔甯稿紑
+ NormallyOpenModeValue(true);
+ UpdateNomallyOpenStatus();
+ }
+ };
alert.CancelClickEvent += async () =>
- {
- //淇濇寔甯稿紑
- if (IsFromReport)
- {
- Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
- var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
- if (result == null || result.defaultControlResponseData == null)
- {
- string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
- this.ShowTipMsg(msg0);
- btnNormallyOpen.IsSelected = false;
- DoorLockCommonInfo.IsDoorLockNormallyMode = false;
- return;
- }
- if (result.defaultControlResponseData.status != 0)
- {
- string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
- this.ShowTipMsg(msg1);
- btnNormallyOpen.IsSelected = false;
- DoorLockCommonInfo.IsDoorLockNormallyMode = false;
- return;
- }
- else
- {
- DoorLockCommonInfo.IsDoorLockNormallyMode = true;
- btnNormallyOpen.IsSelected = true;
- UpdateNomallyOpenStatus();
- CommonPage.Loading.Hide();
- }
- }
- else
- {
- btnNormallyOpen.IsSelected = true;
- }
- };
+ {
+ //淇濇寔甯稿紑
+ if (IsFromReport)
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+ var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
+ if (result == null || result.defaultControlResponseData == null)
+ {
+ string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
+ this.ShowTipMsg(msg0);
+ NormallyOpenModeValue(false);
+ UpdateNomallyOpenStatus();
+ return;
+ }
+ if (result.defaultControlResponseData.status != 0)
+ {
+ string msg1 = Language.StringByID(R.MyInternationalizationString.OpenNormallyOpenModeFailed);
+ this.ShowTipMsg(msg1);
+ NormallyOpenModeValue(false);
+ UpdateNomallyOpenStatus();
+ return;
+ }
+ else
+ {
+ NormallyOpenModeValue(true);
+ UpdateNomallyOpenStatus();
+ CommonPage.Loading.Hide();
+ }
+ }
+ else
+ {
+ NormallyOpenModeValue(true);
+ UpdateNomallyOpenStatus();
+ }
+ };
alert.ConfirmClickEvent += async () =>
{
//纭鍙栨秷甯稿紑
if (IsFromReport)
{
- DoorLockCommonInfo.IsDoorLockNormallyMode = false;
- btnNormallyOpen.IsSelected = false;
+ NormallyOpenModeValue(true);
UpdateNomallyOpenStatus();
}
else
@@ -1083,22 +1179,22 @@
{
string msg0 = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
this.ShowTipMsg(msg0);
- btnNormallyOpen.IsSelected = true;
return;
}
if (result.defaultControlResponseData.status != 0)
{
string msg1 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeFailed);
this.ShowTipMsg(msg1);
- btnNormallyOpen.IsSelected = true;
return;
}
else
{
- DoorLockCommonInfo.IsDoorLockNormallyMode = false;
+ NormallyOpenModeValue(false);
UpdateNomallyOpenStatus();
string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
this.ShowTipMsg(msg2);
+ Shared.Phone.Device.Logic.SkipView.LockCloseLogic(doorLock);
+ //
}
}
};
@@ -1114,10 +1210,7 @@
var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
alertTimeInValidSetting.Show();
- alertTimeInValidSetting.CancelClickEvent += () =>
- {
- btnNormallyOpen.IsSelected = true;
- };
+
alertTimeInValidSetting.InvalidTimeAction += (obj) =>
{
Regex rg = new Regex("^[0-9]+$");
@@ -1135,7 +1228,8 @@
}
var temp = int.Parse(obj);
DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
- btnNormallyOpen.IsSelected = true;
+ Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime,doorLock);
+ //璋冪敤鑷姩鍖栨帴鍙ｈ缃け鏁堟椂闂�
};
}
/// <summary>
@@ -1145,11 +1239,11 @@
{
if (!canOpenNormallyMode)
{
- btnNormallyOpen.UnSelectedImagePath = "DoorLock/NormallyOpenOffline.png";
- btnNormallyOpen.Enable = false;
+ btnNormallyOpenFrameLayout.Width = Application.GetRealWidth(0);
return;
}
- if (DoorLockCommonInfo.IsDoorLockNormallyMode == true)
+ string key = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ if (doorLock.IsDoorLockNormallyMode[key] == true)
{
btnNormallyOpen.IsSelected = true;
btnDoorLockPic.IsSelected = true;
@@ -1157,19 +1251,12 @@
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.DoorLockOpen);
}
- else if (DoorLockCommonInfo.IsDoorLockNormallyMode == false)
+ else if (doorLock.IsDoorLockNormallyMode[key] == false)
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.Current) + Language.StringByID(R.MyInternationalizationString.CLose);
btnDoorLockPic.IsSelected = false;
btnNormallyOpen.IsSelected = false;
progressButton.Y = Application.GetRealHeight(347);
- }
- else
- {
- btnNormallyOpen.UnSelectedImagePath = "DoorLock/NormallyOpenOffline.png";
- btnNormallyOpen.Enable = false;
- string msg = Language.StringByID(R.MyInternationalizationString.GetNormallyOpenModeFailed);
- this.ShowTipMsg(msg);
}
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 6eb6dbc..c8523c8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -187,24 +187,17 @@
listView.AddChidren(rowLayout);
//澶囦唤鍚嶅瓧
- var txtText = rowLayout.frameTable.AddLeftCaption(fileInfo.BackupName, 700, 60);
- txtText.TextSize = 15;
- txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
- rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
+ var txtText = rowLayout.frameTable.AddTopView(fileInfo.BackupName, 700);
if (isAuto == true)
{
txtText.TextID = R.MyInternationalizationString.uAutoBackup;
}
//鏃堕棿 2019-11-11T11:31:01
- var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);
- btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;
- btnTime.TextSize = 12;
- btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;
- rowLayout.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);
+ var btnTime = rowLayout.frameTable.AddBottomView("", 600);
if (fileInfo.CreatedOnUtc.Length >= 19)
{
- btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
+ btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
}
//搴曠嚎
if (addLine == true)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index 7989f1a..2582d09 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -84,15 +84,26 @@
}
};
- //璁惧绫诲瀷
+ //璁惧绫诲瀷 (鍥哄畾鏅鸿兘缃戝叧)
caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
- var btnType = new FrameCaptionViewControl(caption, nameValue, listview.rowSpace / 2);
+ var btnType = new FrameCaptionViewControl(caption, Language.StringByID(60004), listview.rowSpace / 2);
btnType.UseClickStatu = false;
listview.AddChidren(btnType);
btnType.InitControl();
- HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, this.zbGateway);
//鍒掔嚎
btnType.AddBottomLine();
+
+ //瀹夎浣嶇疆
+ var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
+ listview.AddChidren(rowBeloneArea);
+ rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.zbGateway);
+ //搴曠嚎
+ rowBeloneArea.AddBottomLine();
+ rowBeloneArea.SelectRoomEvent += (roomKeys) =>
+ {
+ //鍙樻洿缃戝叧鎴块棿
+ HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);
+ };
//鏁版嵁涓婁紶涓庝笅杞�
var rowData = new RowLayoutControl(listview.rowSpace / 2);
@@ -174,7 +185,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//妫�娴嬫柊鐗堟湰
- this.CheckNewVersion(btnNewVersion, btnType);
+ this.CheckNewVersion(btnNewVersion);
});
}
@@ -268,8 +279,7 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <param name="btnNewVersion">鎻愮ず鏈夋柊鐗堟湰鐨勬帶浠�</param>
- /// <param name="btnType">缃戝叧绫诲瀷鎺т欢</param>
- private async void CheckNewVersion(PicViewControl btnNewVersion, FrameCaptionViewControl btnType)
+ private async void CheckNewVersion(PicViewControl btnNewVersion)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
@@ -281,7 +291,6 @@
{
if (this.Parent != null)
{
- HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, this.zbGateway);
if (result[0] != null || result[1] != null || result[2] != null)
{
//鎻愮ず鏈夋柊鐗堟湰
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index b885afb..68597f2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -107,8 +107,8 @@
btnType.AddBottomLine();
HdlGatewayLogic.Current.SetGatewayImageText(btnType.txtView, zbGateway);
- //鎵�灞炲尯鍩�
- caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);
+ //鎵�灞炰綇瀹�
+ caption = Language.StringByID(R.MyInternationalizationString.uBelongResidence);
var btnBeloneArea = new FrameCaptionViewControl(caption, Common.Config.Instance.Home.Name, listview.rowSpace / 2);
btnBeloneArea.UseClickStatu = false;
listview.AddChidren(btnBeloneArea);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index 12bdbff..0e14181 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
@@ -74,21 +74,21 @@
//瀹㈠巺
var room1 = new Common.Room();
- room1.BackgroundImage = "RoomIcon/0.JPG";
+ room1.BackgroundImage = "RoomIcon/0.jpg";
room1.Name = Language.StringByID(R.MyInternationalizationString.uLivingRoom);
var roomView1 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView1);
roomView1.Init(room1);
//闃冲彴
var room2 = new Common.Room();
- room2.BackgroundImage = "RoomIcon/1.JPG";
+ room2.BackgroundImage = "RoomIcon/1.jpg";
room2.Name = Language.StringByID(R.MyInternationalizationString.uBalcony);
var roomView2 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView2);
roomView2.Init(room2);
//鍗у
var room3 = new Common.Room();
- room3.BackgroundImage = "RoomIcon/2.JPG";
+ room3.BackgroundImage = "RoomIcon/2.jpg";
room3.Name = Language.StringByID(R.MyInternationalizationString.uBedroom);
var roomView3 = new Phone.Device.CommonForm.RoomView(0, 0);
roomPageView.AddChidren(roomView3);
@@ -129,25 +129,25 @@
sceneView1.X = Application.GetRealWidth(46);
sceneView1.Y = roomPageView.Bottom + Application.GetRealHeight(233);
this.AddChidren(sceneView1);
- sceneView1.Init(new Common.SceneUI() { Name = "Getup", IconPath = "SceneIcon/0.jpg" });
+ sceneView1.Init(new Common.SceneUI() { Name = "Getup", IconPath = "SceneIcon/0.png" });
//鑷畾涔夊満鏅�2
var sceneView2 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView2.X = Application.GetRealWidth(553);
sceneView2.Y = sceneView1.Y;
this.AddChidren(sceneView2);
- sceneView2.Init(new Common.SceneUI() { Name = "Relax", IconPath = "SceneIcon/1.jpg" });
+ sceneView2.Init(new Common.SceneUI() { Name = "Relax", IconPath = "SceneIcon/1.png" });
//鑷畾涔夊満鏅�3
var sceneView3 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView3.X = sceneView1.X;
sceneView3.Y = sceneView1.Bottom + Application.GetRealHeight(14);
this.AddChidren(sceneView3);
- sceneView3.Init(new Common.SceneUI() { Name = "Dinner", IconPath = "SceneIcon/2.jpg" });
+ sceneView3.Init(new Common.SceneUI() { Name = "Dinner", IconPath = "SceneIcon/2.png" });
//鑷畾涔夊満鏅�4
var sceneView4 = new Phone.Device.CommonForm.SceneMainView(0, 0);
sceneView4.X = sceneView2.X;
sceneView4.Y = sceneView3.Y;
this.AddChidren(sceneView4);
- sceneView4.Init(new Common.SceneUI() { Name = "Goodnight", IconPath = "SceneIcon/3.jpg" });
+ sceneView4.Init(new Common.SceneUI() { Name = "Goodnight", IconPath = "SceneIcon/3.png" });
//搴曢儴鑿滃崟
var frameMenu = new FrameLayout();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index 4ed0659..8f53bac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -155,7 +155,7 @@
btnPoint.UnSelectedImagePath = "Item/DownLoad.png";
//澶囦唤鍚嶅瓧
- var txtText = rowLayout.frameTable.AddLeftCaption("", 700, 60);
+ var txtText = rowLayout.frameTable.AddTopView("", 700);
if (autoBack == true)
{
//鑷姩澶囦唤
@@ -165,20 +165,11 @@
{
txtText.Text = fileInfo.BackupName;
}
- txtText.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- txtText.Y = Application.GetRealHeight(12) + rowLayout.chidrenYaxis;
- rowLayout.frameTable.AddChidren(txtText, ChidrenBindMode.BindEventOnly);
//鏃堕棿
- var btnTime = rowLayout.frameTable.AddLeftCaption("", 600, 50, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnTime.Y = Application.GetRealHeight(72) + rowLayout.chidrenYaxis;
- btnTime.TextSize = 12;
- btnTime.TextColor = UserCenterColor.Current.TextGrayColor1;
- rowLayout.frameTable.AddChidren(btnTime, ChidrenBindMode.BindEventOnly);
+ var btnTime = rowLayout.frameTable.AddBottomView("", 600);
if (fileInfo.CreatedOnUtc.Length >= 19)
{
- btnTime.Text = fileInfo.CreatedOnUtc.Replace("-", ".").Replace("T", " ");
+ btnTime.Text = UserCenterLogic.ConvertUtcTimeToLocalTime(fileInfo.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm:ss");
}
if (addLine == true)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 9b85a1e..f135420 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -67,7 +67,7 @@
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 613, 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
- var btnShadow = new PicViewControl(994, 588);
+ var btnShadow = new PicViewControl(853, 593);
btnShadow.Y = Application.GetRealHeight(58);
btnShadow.Gravity = Gravity.CenterHorizontal;
btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
@@ -75,11 +75,11 @@
//鎴块棿鍥剧墖
var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(965);
- btnPic.Height = Application.GetMinRealAverage(544);
+ btnPic.Width = Application.GetMinRealAverage(824);
+ btnPic.Height = Application.GetMinRealAverage(549);
btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
- btnPic.ImagePath = "RoomIcon/0.JPG";
+ btnPic.ImagePath = "RoomIcon/0.jpg";
bodyFrameLayout.AddChidren(btnPic);
//鍥剧墖閬僵
var btnZhezhao = new FrameLayout();
@@ -95,6 +95,9 @@
this.RoomPictrueSelect(btnPic);
};
+ //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
+ frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index a849299..c3226dd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -82,7 +82,7 @@
this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 613, 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
- var btnShadow = new PicViewControl(994, 588);
+ var btnShadow = new PicViewControl(853, 593);
btnShadow.Y = Application.GetRealHeight(58);
btnShadow.Gravity = Gravity.CenterHorizontal;
btnShadow.UnSelectedImagePath = "Room/RoomShadow.png";
@@ -90,8 +90,8 @@
//鎴块棿鍥剧墖
var btnPic = new ImageView();
btnPic.Y = Application.GetRealHeight(60);
- btnPic.Width = Application.GetMinRealAverage(965);
- btnPic.Height = Application.GetMinRealAverage(544);
+ btnPic.Width = Application.GetMinRealAverage(824);
+ btnPic.Height = Application.GetMinRealAverage(549);
btnPic.Radius = (uint)Application.GetRealHeight(17);
btnPic.Gravity = Gravity.CenterHorizontal;
if (this.editorRoom.BackgroundImageType == 0)
@@ -111,15 +111,14 @@
btnZhezhao.Gravity = Gravity.CenterHorizontal;
btnZhezhao.Radius = btnPic.Radius;
bodyFrameLayout.AddChidren(btnZhezhao);
- //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == false)
+ btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
- btnZhezhao.MouseUpEventHandler += (sender, e) =>
- {
- //鎴块棿鍥剧墖閫夋嫨
- this.RoomPictrueSelect(btnPic);
- };
- }
+ //鎴块棿鍥剧墖閫夋嫨
+ this.RoomPictrueSelect(btnPic);
+ };
+
+ //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
+ frameBack1.Y = btnPic.Y + btnPic.Height / 2;
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
@@ -215,12 +214,6 @@
//鍒濆鍖栨甯冨畬鎴�
tableContr.FinishInitControl(bodyFrameLayout, this.listview);
tableContr = null;
-
- //鍒嗕韩鐨勬埧闂翠笉鑳戒慨鏀�
- if (this.editorRoom.IsSharedRoom == true)
- {
- return;
- }
//淇濆瓨
var btnFinish = new BottomClickButton();
@@ -577,7 +570,7 @@
this.cloneRoom.BackgroundImageType = 1;
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
- }, "HdlPic", 16, 9);
+ }, "HdlPic", 2, 1);
});
//鎴戠殑鐩稿唽
menuContr.AddMenu(Language.StringByID(R.MyInternationalizationString.MyAblums), () =>
@@ -594,7 +587,7 @@
imageContr.ImageBytes = Shared.IO.FileUtils.ReadFile(imagePath);
System.IO.File.Delete(imagePath);
- }, "HdlPic", 16, 9);
+ }, "HdlPic", 2, 1);
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index a20b2b5..076ba16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -146,11 +146,9 @@
continue;
}
var info = dicData[listResidenceSort[i]];
- if (info.IsOthreShare == false)
- {
- //鏀堕泦璇ヨ处鍙锋墍鎷ユ湁鐨勮嚜宸辩殑浣忓畢鐨勬暟鎹�
- this.dicResidenceData[info.Id] = info;
- }
+
+ //鏀堕泦璇ヨ处鍙蜂綇瀹呯殑鏁版嵁
+ this.dicResidenceData[info.Id] = info;
this.AddRowLayout(info, i != listResidenceSort.Count - 1);
}
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
@@ -221,8 +219,10 @@
{
this.ShowProgressBar();
+ //妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
+ this.CheckIsExsitResidence(info);
+
Config.Instance.HomeId = info.Id;
- Global.CreateHomeDirectory(info.Id);
//閲嶆柊鍒濆鍖栦綇瀹呭璞�
Config.Instance.Home = House.GetHouseByHouseId(info.Id);
Config.Instance.Save();
@@ -418,25 +418,57 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
+ /// 妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
+ /// </summary>
+ /// <param name="info"></param>
+ private void CheckIsExsitResidence(Common.ResponseEntity.ResidenceObj info)
+ {
+ var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, info.Id);
+ bool isExsit = System.IO.Directory.Exists(path);
+ if (isExsit == true) { return; }
+ //鍒涘缓鏂囦欢澶�
+ Global.CreateHomeDirectory(info.Id);
+ //鍒涘缓鏂扮殑浣忓畢
+ var house = new House();
+ house.Id = info.Id;
+ house.Name = info.Name;
+ house.IsOthreShare = info.IsOthreShare;
+ house.AccountType = info.AccountType;
+ house.MainUserDistributedMark = info.MainUserDistributedMark;
+ house.Longitude = info.Longitude;
+ house.Latitude = info.Latitude;
+ house.Save(false);
+
+ string fileName = house.FileName;
+ if (Config.Instance.HomeFilePathList.Contains(fileName) == false)
+ {
+ //娣诲姞鍒楄〃
+ Config.Instance.HomeFilePathList.Add(fileName);
+ }
+ }
+
+ /// <summary>
/// 妫�娴嬭兘鍚﹀垹闄や綇瀹�
/// </summary>
/// <param name="info"></param>
/// <returns></returns>
private bool CheckIsCanDeleteResidence(Common.ResponseEntity.ResidenceObj info)
{
- if (this.dicResidenceData.Count == 1)
+ if (info.IsOthreShare == false)
{
- //濡傛灉姝よ处鍙蜂笅鍙墿涓嬪敮涓�涓�涓嚜宸辩殑浣忓畢锛屽綋鍒犻櫎杩欎釜浣忓畢鏃讹紝鎻愮ず涓嶈兘鍒犻櫎
- //鍥犱负鏈�灏戣鏈変竴涓綇瀹�
- if (this.dicResidenceData.ContainsKey(info.Id) == true)
+ int myCount = 0;
+ foreach (var data in this.dicResidenceData.Values)
+ {
+ if (data.IsOthreShare == false)
+ {
+ myCount++;
+ }
+ }
+ //濡傛灉姝よ处鍙蜂笅鍙墿涓嬪敮涓�涓�涓嚜宸辩殑浣忓畢锛屽垯涓嶈兘鍐嶅垹闄�
+ if (myCount == 1)
{
return false;
}
- }
- if (info.IsOthreShare == true)
- {
- //鍒嗕韩杩囨潵鐨勪綇瀹呬笉鑳藉垹闄�
- return false;
}
return true;
}
@@ -453,6 +485,11 @@
//浣忓畢鍚嶅瓧閲嶅妫�娴�
foreach (string strId in this.dicResidenceData.Keys)
{
+ if (this.dicResidenceData[strId].IsOthreShare == true)
+ {
+ //鍒嗕韩鐨勪綇瀹呬笉鑰冭檻
+ continue;
+ }
if (residenceId != strId && residenceName == this.dicResidenceData[strId].Name)
{
//浣忓畢鍚嶅瓧宸茬粡瀛樺湪
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 30cd414..15f46ff 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -92,7 +92,7 @@
}
//缁忕含搴�
var btnLocation = rowHome.frameTable.AddMostRightView(string.Empty, 500);
- btnLocation.Text = this.GetLatitudeAndLongitudeText(Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude);
+ btnLocation.Text = Common.Config.Instance.Home.ResidenceAddressName;
//涓讳汉鎴栬�呯鐞嗗憳鎵嶄細鍑虹幇杩欎釜鑿滃崟
if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
@@ -109,9 +109,12 @@
HdlThreadLogic.Current.RunThread(() =>
{
//淇濆瓨浣忓畢鍦板潃
- this.SaveResidenceAdrress(btnLocation, mLatitude, mLongitude);
+ this.SaveResidenceAdrress(btnLocation, mLatitude, mLongitude, name);
});
- }, Language.StringByID(R.MyInternationalizationString.uSelectAdrress), true, latitude, longitude, 100);
+ },
+ Language.StringByID(R.MyInternationalizationString.uSelectAdrress),
+ Language.StringByID(R.MyInternationalizationString.uSave),
+ true, latitude, longitude, 100);
};
}
@@ -363,6 +366,8 @@
Common.Config.Instance.Home.CurrentFloorId = floorId;
break;
}
+ //鍒犻櫎褰撳墠妤煎眰鐨勮瘽,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
+ HdlRoomLogic.Current.RefreshRoomListView();
}
var listDeleteId = new List<string>();
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
@@ -434,6 +439,9 @@
//鎸変笅纭鎸夐挳
dialogForm.ComfirmClickEvent += ((textValue) =>
{
+ //杩樺師宸﹀彸鑿滃崟
+ frameRow?.HideMenu();
+
if (this.CheckFloorName(keys, textValue) == false)
{
//妤煎眰鍚嶇О妫�娴�
@@ -441,8 +449,6 @@
}
//鐢婚潰鍏抽棴
dialogForm.CloseDialog();
- //杩樺師宸﹀彸鑿滃崟
- frameRow?.HideMenu();
if (floorName != textValue)
{
//缂栬緫鎴栬�呭垱寤烘ゼ灞傚悕绉�
@@ -455,6 +461,8 @@
if (Common.Config.Instance.Home.CurrentFloorId == string.Empty)
{
Common.Config.Instance.Home.CurrentFloorId = keys;
+ //鍒涘缓绗竴涓柊鐨勬ゼ灞傜殑璇�,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
+ HdlRoomLogic.Current.RefreshRoomListView();
}
if (btnFloor != null)
{
@@ -620,16 +628,36 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
- var Pra = new DeleteResidencePra();
- Pra.HomeId = Common.Config.Instance.Home.Id;
- Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
- if (result == false)
+ if (Common.Config.Instance.Home.IsOthreShare == false)
{
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
- return;
+ //鍒犻櫎涓讳汉鑷繁鐨勪綇瀹�
+ var Pra = new DeleteResidencePra();
+ Pra.HomeId = Common.Config.Instance.Home.Id;
+ Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+
+ bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
+ if (result == false)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
+ }
+ else
+ {
+ //鍒犻櫎鍒嗕韩鐨勪綇瀹�
+ var Pra2 = new
+ {
+ HomeId = Common.Config.Instance.Home.Id,
+ PrimaryUserId = Common.Config.Instance.Home.MainUserDistributedMark
+ };
+ bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
+ if (result == false)
+ {
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ return;
+ }
}
//鍥犱负鍒犻櫎鐨勬槸褰撳墠鐨勪綇瀹�,鎵�浠ラ渶瑕佸厛鍒囨崲鍒板埆鐨勪綇瀹�
@@ -685,7 +713,8 @@
/// <param name="btnLocation">鏄剧ず鎺т欢</param>
/// <param name="latitude">绾害</param>
/// <param name="longitude">缁忓害</param>
- private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude)
+ /// <param name="addresName">浣嶇疆鍚嶇О</param>
+ private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -729,10 +758,11 @@
//淇濆瓨缂撳瓨
Common.Config.Instance.Home.Longitude = longitude;
Common.Config.Instance.Home.Latitude = latitude;
+ Common.Config.Instance.Home.ResidenceAddressName = addresName;
Common.Config.Instance.Home.Save();
HdlThreadLogic.Current.RunMain(() =>
{
- btnLocation.Text = this.GetLatitudeAndLongitudeText(longitude, latitude);
+ btnLocation.Text = addresName;
});
}
@@ -787,50 +817,6 @@
}
}
return true;
- }
-
- /// <summary>
- /// 鑾峰彇缁忕含搴︾殑缈昏瘧鍚嶅瓧
- /// </summary>
- /// <param name="Longitude">缁忓害</param>
- /// <param name="Latitude">绾害</param>
- /// <returns></returns>
- private string GetLatitudeAndLongitudeText(double Longitude, double Latitude)
- {
- string value1 = string.Empty;
- string value2 = string.Empty;
- if (Longitude == 0)
- {
- //榛樿涓滅粡
- value1 = "0掳00'E";
- }
- else if (Longitude > 0)
- {
- //涓滅粡
- value1 = Math.Round(Longitude, 2).ToString().Replace(".", "掳") + "'E";
- }
- else if (Longitude < 0)
- {
- //瑗跨粡
- value1 = Math.Round(-Longitude, 2).ToString().Replace(".", "掳") + "'W";
- }
-
- if (Latitude == 0)
- {
- //榛樿鍖楃含
- value2 = "0掳00'N";
- }
- else if (Latitude > 0)
- {
- //鍖楃含
- value2 = Math.Round(Latitude, 2).ToString().Replace(".", "掳") + "'N";
- }
- else if (Latitude < 0)
- {
- //鍗楃含
- value2 = Math.Round(-Latitude, 2).ToString().Replace(".", "掳") + "'S";
- }
- return value1 + " " + value2;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
index f600532..945475a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
@@ -143,6 +143,7 @@
btnFloor.Gravity = Gravity.CenterVertical;
btnFloor.X = btnIconContr.X + btnIconContr.btnIcon.X - Application.GetRealWidth(300);
btnFloor.TextAlignment = TextAlignment.CenterRight;
+ btnFloor.IsBold = true;
topFrameLayout.AddChidren(btnFloor);
foreach (var floorId in dicFloor.Keys)
@@ -156,10 +157,10 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
foreach (var floorId in dicFloor.Keys)
{
- contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>
+ contr.AddRowMenu(floorId, () =>
{
//璁板綍璧烽�夋嫨鐨処D
this.nowSelectFloorId = floorId;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
index 9ce5881..fc4a6f3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
@@ -144,10 +144,10 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var contr = new TopRightMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
foreach (var floorId in dicFloor.Keys)
{
- contr.AddRowMenu(dicFloor[floorId], "Floor/Floor.png", "Floor/FloorSelected.png", () =>
+ contr.AddRowMenu(floorId, () =>
{
//璁板綍璧烽�夋嫨鐨処D
this.nowSelectFloorId = floorId;
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 2607704..37c1baf 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -168,7 +168,9 @@
}
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
- var revertData = responseDataObj;
+ var revertData = responseDataObj;
+ //鏍囪涓婁竴娆℃槸涓嶆槸鍚屼竴涓处鍙风櫥闄�
+ UserCenter.UserCenterResourse.ResidenceOption.TheSameLoginAccount = Config.Instance.Guid == revertData.Guid;
Config.Instance.Account = revertData.Account;
Config.Instance.Password = password;
Config.Instance.MD5PWD = revertData.MD5PWD;
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 79c3b95..50e4e45 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -60,8 +60,13 @@
{
config = new Config { };
}
- }
-
+ if (config.PasswordEncrypt != string.Empty)
+ {
+ //瑙ｅ瘑
+ config.Password = Phone.UserCenter.UserCenterLogic.DecryptPassword("hD1(La3o", config.PasswordEncrypt);
+ }
+ }
+
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -69,7 +74,12 @@
/// <summary>
/// 褰撳墠甯愬彿瀵嗙爜
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string Password = string.Empty;
+ /// <summary>
+ /// 鍔犲瘑瀵嗙爜
+ /// </summary>
+ public string PasswordEncrypt = string.Empty;
/// <summary>
/// 鐭俊鐧诲綍杩斿洖鐨刴d5鍚庣殑瀵嗙爜
/// </summary>
@@ -181,6 +191,8 @@
/// </summary>
public void Save()
{
+ //鍔犲瘑,涓嶈兘淇濆瓨鏄庣爜
+ this.PasswordEncrypt = Phone.UserCenter.UserCenterLogic.EncryptPassword("hD1(La3o", this.Password);
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
Shared.IO.FileUtils.WriteFileByBytes(fileName, bytes);
ReFresh();
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 1528024..16bc2c8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -3880,7 +3880,7 @@
/// <summary>
///鍝嶅簲鎿嶄綔鐮侊紙0-ffff锛�
/// </summary>
- public int command = -1;
+ public string command;
/// <summary>
/// 鐘舵�佸��
/// <para>0--鎴愬姛 1--澶辫触 ff--鏃犳晥</para>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index 1fc9f8f..90476ec 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -35,6 +35,10 @@
public string currentUserDisplayMethod = string.Empty;//褰撳墠鐢ㄦ埛鏄剧ず鏂瑰紡
//鏈湴鎵�鏈夎处鎴峰垪琛�
public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
+ /// <summary>
+ /// 鏄惁甯稿紑妯″紡[褰撴暟鎹幏鍙栧け璐ワ紝杩斿洖绌篯
+ /// </summary>
+ public Dictionary<string, bool> IsDoorLockNormallyMode = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
public string LocalTempPassword = string.Empty;//鏈湴鐢熸垚鐨勪复鏃跺瘑鐮�
public Dictionary<string, bool> IsFreezeAccount = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
public Dictionary<string, bool> HasRemoteUnlockAccess = new Dictionary<string, bool> { };//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
@@ -1164,8 +1168,11 @@
var tempD = new DefaultControlResponseData();
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new DefaultControlResponseAllData { defaultControlResponseData = tempD };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0450_{ topic}");
+ if (tempD.command == "0450")
+ {
+ result = new DefaultControlResponseAllData { defaultControlResponseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0450_{ topic}");
+ }
}
}
}
@@ -1663,8 +1670,11 @@
var tempD = new RemoteResponseData();
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new RemoteResponseAllData { responseData = tempD };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0462_{ topic}");
+ if (tempD.command == "0462")
+ {
+ result = new RemoteResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0462_{ topic}");
+ }
}
}
}
@@ -1844,8 +1854,11 @@
var tempD = new TempPasswordResponseData();
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new TempPasswordResponseAllData { responseData = tempD };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0463_{ topic}");
+ if (tempD.command == "0463")
+ {
+ result = new TempPasswordResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0463_{ topic}");
+ }
}
}
}
@@ -2502,7 +2515,7 @@
if (tempD.command == "0455")
{
result = new DefaultControlResponseAllData { defaultControlResponseData = tempD };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0456_{ topic}");
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0455_{ topic}");
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
index a299727..65da172 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
@@ -27,6 +27,7 @@
/// IAS瀹夐槻淇℃伅涓婃姤
/// <para>褰撳畨闃茶澶囧睘鎬х姸鎬佹敼鍙樻椂鍊欙紙渚嬪涓�姘у寲纰充紶鎰熷櫒妫�娴嬪埌涓�姘у寲纰虫皵浣擄級锛岃澶囧皢涓婃姤灞炴�х姸鎬佸彉鍖栨暟鎹��</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public IASInfoData iASInfo;
/// <summary>
/// IAS瀹夐槻淇℃伅涓婃姤
@@ -311,10 +312,13 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0300_{ topic}");
+ if (tempD.command == "0300")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0300_{ topic}");
+ }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 2cb7298..3fb3691 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -746,10 +746,14 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0400_{ topic}");
+ if (tempD.command == "0400")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0400_{ topic}");
+ }
+
}
}
}
@@ -920,10 +924,13 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0401_{ topic}");
+ if (tempD.command == "0401")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0401_{ topic}");
+ }
}
}
}
@@ -1295,10 +1302,13 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0402_{ topic}");
+ if (tempD.command == "0402")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0402_{ topic}");
+ }
}
}
}
@@ -1446,10 +1456,13 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0403_{ topic}");
+ if (tempD.command == "0403")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0403_{ topic}");
+ }
}
}
}
@@ -1605,10 +1618,13 @@
if (command == "0002")
{
var tempD = new ResponseData();
- tempD.command = Convert.ToInt32(data[10].ToString() + data[11].ToString() + data[12].ToString() + data[13].ToString(), 16);
+ tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
- result = new ResponseAllData { responseData = tempD };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0500_{ topic}");
+ if (tempD.command == "0500")
+ {
+ result = new ResponseAllData { responseData = tempD };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0500_{ topic}");
+ }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 990a261..8d8cbea 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -3337,23 +3337,18 @@
if (RemoteMqttClient.ApplicationMessageReceivedHandler == null)
{
RemoteMqttClient.UseApplicationMessageReceivedHandler((e) =>
- {
- if (!RemoteMqttClient.IsConnected || !IsRemote)
- {
- if (e.ApplicationMessage.Topic != "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze")
- {
- return;
- }
- }
- //濡傛灉褰撳墠浣跨敤鐨勬槸鍐呯綉妯″紡
- if (IsRemote == false)
+ {
+ //杩欓噷鏄壒娈婄殑涓婚
+ if (e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze"//韪汉涓嬬嚎
+ || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Deleted"//鍒嗕韩鍒犻櫎
+ || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/DeletedShareData"
+ || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + Config.Instance.Guid + "/PrimaryUserDelYou")//瀛愯处鍙疯鍒犻櫎
{
- if (e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze"//韪汉涓嬬嚎
- || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/Deleted"//鍒嗕韩鍒犻櫎
- || e.ApplicationMessage.Topic == "/ZigbeeGateWayToClient/" + Config.Instance.Guid + "/Push/DeletedShareData")
- {
- mqttRemoteClient_MqttMsgPublishReceived(e);
- }
+ mqttRemoteClient_MqttMsgPublishReceived(e);
+ return;
+ }
+ if (!RemoteMqttClient.IsConnected || !IsRemote)
+ {
return;
}
mqttRemoteClient_MqttMsgPublishReceived(e);
@@ -3382,6 +3377,8 @@
await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/Deleted");
//璁㈤槄涓�涓垎浜暟鎹凡缁忓彉鏇寸殑涓婚
await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + myGuid + "/Push/DeletedShareData");
+ //璁㈤槄涓�涓瓙璐﹀彿琚垹闄ょ殑涓婚
+ await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.Home.Id + "_" + myGuid + "/PrimaryUserDelYou");
}
//璁㈤槄涓�涓尋涓嬬嚎鐨勪富棰�
await RemoteMqttClient.SubscribeAsync("/ZigbeeGateWayToClient/" + Config.Instance.ConnEmqClientId + "/Push/NotifySqueeze");
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index 0f6dec7..d063079 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -6,11 +6,15 @@
{
public class ZbGatewayData : CommonDevice
{
- #region 缃戝叧鍦ㄧ嚎鏍囪瘑
+ #region 鏂拌拷鍔犵殑涓�浜涘彉閲�
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
public bool GatewayOnlineFlage = false;
+ /// <summary>
+ /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
+ /// </summary>
+ public string RoomId = string.Empty;
#endregion
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index a7e6bdc..34c8a35 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -354,10 +354,6 @@
/// </summary>
public const int AddFreshAirModulPanelMsg = 239;
/// <summary>
- /// 闀滃儚ID涓�2802鐨勮澶囩殑榛樿鍚嶅瓧锛歋-one
- /// </summary>
- public const int uDeviceModelId2802 = 240;
- /// <summary>
/// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
/// </summary>
public const int SetDoorLockNomallyOpen = 241;
@@ -459,9 +455,17 @@
/// </summary>
public const int West = 265;
/// <summary>
- /// 褰撳墠璁惧涓嶆敮鎸佽鍔熻兘
+ /// 褰撳墠璁惧涓嶇嚎
/// </summary>
- public const int NoSupport = 266;
+ public const int DoorLockOffLine = 266;
+ /// <summary>
+ /// 鑾峰彇闊抽噺澶辫触
+ /// </summary>
+ public const int GetVolumeFailed = 267;
+ /// <summary>
+ /// 纭畾瑕佸彇娑堣鎴愬憳鎷ユ湁杩滅▼寮�閿佹潈闄愬悧锛�
+ /// </summary>
+ public const int SureCancelAccessToSubaccount = 268;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -717,6 +721,7 @@
public readonly static int tiptextnull = 5378;
public readonly static int tiplocktextnull = 5379;
public readonly static int openmode = 5380;
+ public readonly static int addnull = 5381;
#region 鐧诲綍娉ㄥ唽
/// <summary>
@@ -5460,6 +5465,31 @@
/// 鏃ョ珛绌鸿皟妯″潡
/// </summary>
public const int uHitachiAirConditioningModule = 16074;
+ /// <summary>
+ /// 瀹夎浣嶇疆
+ /// </summary>
+ public const int uInstallationLocation = 16075;
+ /// <summary>
+ /// 鎵�灞炰綇瀹�
+ /// </summary>
+ public const int uBelongResidence = 16076;
+ /// <summary>
+ /// 涓嶅垎閰�
+ /// </summary>
+ public const int uUndistributed = 16077;
+ /// <summary>
+ /// 瀹ゅ唴鏈�
+ /// </summary>
+ public const int uIndoorUnit = 16078;
+ /// <summary>
+ /// 鎸夐敭
+ /// </summary>
+ public const int uPanelButton = 16079;
+ /// <summary>
+ /// 鍒嗕韩浣忓畢宸叉洿鏀癸紝璇疯仈绯荤鐞嗗憳锛�
+ /// </summary>
+ public const int uShardResidenceHadDeletePleaseTakeToAdmin = 16080;
+
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5693,21 +5723,21 @@
public const int uAddCurtaunPanelMsg = 21022;
- //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勭炕璇戝悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+ //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
- /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱揣鎬ユ寜閽�
+ /// 闀滃儚ID涓�1305(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱揣鎬ユ寜閽�
/// </summary>
public const int uDeviceModelId1305 = 30000;
/// <summary>
- /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
+ /// 闀滃儚ID涓�1300(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱噧姘斾紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1300 = 30001;
/// <summary>
- /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱儫闆句紶鎰熷櫒
+ /// 闀滃儚ID涓�1302(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱儫闆句紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1302 = 30002;
/// <summary>
- /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氭按娴镐紶鎰熷櫒
+ /// 闀滃儚ID涓�1304(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭按娴镐紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1304 = 30003;
/// <summary>
@@ -5715,133 +5745,137 @@
/// </summary>
public const int uKeyfob = 30004;
/// <summary>
- /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
+ /// 闀滃儚ID涓�1301(鏆傚畾)鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氶棬绐椾紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1301 = 30005;
/// <summary>
- /// 闀滃儚ID涓�4100鐨勮澶囩殑榛樿鍚嶅瓧锛氭櫤鑳界┖寮�
+ /// 闀滃儚ID涓�4100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭櫤鑳界┖寮�
/// </summary>
public const int uDeviceModelId4100 = 30006;
/// <summary>
- /// 闀滃儚ID涓�100鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
+ /// 闀滃儚ID涓�100鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘寮�鍚堝笜鐢垫満
/// </summary>
public const int uDeviceModelId100 = 30007;
/// <summary>
- /// 闀滃儚ID涓�200鐨勮澶囩殑榛樿鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�4璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId200 = 30008;
/// <summary>
- /// 闀滃儚ID涓�1200鐨勮澶囩殑榛樿鍚嶅瓧锛�220Pir浼犳劅鍣�
+ /// 闀滃儚ID涓�1200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�220Pir浼犳劅鍣�
/// </summary>
public const int uDeviceModelId1200 = 30009;
/// <summary>
- /// 闀滃儚ID涓�1鐨勮澶囩殑榛樿鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
+ /// 闀滃儚ID涓�1鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(146搴曠洅澧欒妯″紡)
/// </summary>
public const int uDeviceModelId1 = 30010;
/// <summary>
- /// 闀滃儚ID涓�201鐨勮澶囩殑榛樿鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�3璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId201 = 30011;
/// <summary>
- /// 闀滃儚ID涓�202鐨勮澶囩殑榛樿鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�202鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�2鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�2璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId202 = 30012;
/// <summary>
- /// 闀滃儚ID涓�2300鐨勮澶囩殑榛樿鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
+ /// 闀滃儚ID涓�2300鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�3璺户鐢靛櫒灏忔ā鍧�
/// </summary>
public const int uDeviceModelId2300 = 30013;
/// <summary>
- /// 闀滃儚ID涓�6鐨勮澶囩殑榛樿鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
+ /// 闀滃儚ID涓�6鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1浠igbee缃戝叧(楂樼骇缃戝叧妗岄潰妯″紡)
/// </summary>
public const int uDeviceModelId6 = 30014;
/// <summary>
- /// 闀滃儚ID涓�0鐨勮澶囩殑榛樿鍚嶅瓧锛氳皟璇曡澶�
+ /// 闀滃儚ID涓�0鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳皟璇曡澶�
/// </summary>
public const int uDeviceModelId0 = 30015;
/// <summary>
- /// 闀滃儚ID涓�101鐨勮澶囩殑榛樿鍚嶅瓧锛歓igbee鏅鸿兘绠＄姸鐢垫満
+ /// 闀滃儚ID涓�101鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歓igbee鏅鸿兘绠＄姸鐢垫満
/// </summary>
public const int uDeviceModelId101 = 30016;
/// <summary>
- /// 闀滃儚ID涓�3900鐨勮澶囩殑榛樿鍚嶅瓧锛氫腑缁у櫒
+ /// 闀滃儚ID涓�3900鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氫腑缁у櫒
/// </summary>
public const int uDeviceModelId3900 = 30017;
/// <summary>
- /// 闀滃儚ID涓�203鐨勮澶囩殑榛樿鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
+ /// 闀滃儚ID涓�203鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�12鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(甯�1璺户鐢靛櫒搴曞骇)
/// </summary>
public const int uDeviceModelId203 = 30018;
/// <summary>
- /// 闀滃儚ID涓�210鐨勮澶囩殑榛樿鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
+ /// 闀滃儚ID涓�210鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�4鎸夐敭澶氬姛鑳借Е鎽搁潰鏉�(鍙甫鐢垫簮搴曞骇)
/// </summary>
public const int uDeviceModelId210 = 30019;
/// <summary>
- /// 闀滃儚ID涓�1303(鏆傚畾)鐨勮澶囩殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
+ /// 闀滃儚ID涓�1303(鏆傚畾)鐨勫畼鏂圭殑榛樿鍚嶅瓧锛氱孩澶栦紶鎰熷櫒
/// </summary>
public const int uDeviceModelId1303 = 30020;
/// <summary>
- /// 闀滃儚ID涓�2500鐨勮澶囩殑榛樿鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
+ /// 闀滃儚ID涓�2500鐨勮澶囩殑瀹樻柟鍚嶅瓧锛�1璺皟鍏夊櫒灏忔ā鍧�
/// </summary>
public const int uDeviceModelId2500 = 30021;
/// <summary>
- /// 闀滃儚ID涓�4200鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
+ /// 闀滃儚ID涓�4200鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞琤uspro鍗忚杞崲鍣�
/// </summary>
public const int uDeviceModelId4200 = 30022;
/// <summary>
- /// 闀滃儚ID涓�4201鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
+ /// 闀滃儚ID涓�4201鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee杞�485鍗忚杞崲鍣�
/// </summary>
public const int uDeviceModelId4201 = 30023;
/// <summary>
- /// 闀滃儚ID涓�3600鐨勮澶囩殑榛樿鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
+ /// 闀滃儚ID涓�3600鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歾igbee绌鸿皟缃戝叧妯″潡
/// </summary>
public const int uDeviceModelId3600 = 30024;
/// <summary>
- /// 闀滃儚ID涓�2800鐨勮澶囩殑榛樿鍚嶅瓧锛欻06C
+ /// 闀滃儚ID涓�2800鐨勮澶囩殑瀹樻柟鍚嶅瓧锛欻06C
/// </summary>
public const int uDeviceModelId2800 = 30025;
/// <summary>
- /// 闀滃儚ID涓�220鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
+ /// 闀滃儚ID涓�220鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId220 = 30026;
/// <summary>
- /// 闀滃儚ID涓�221鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
+ /// 闀滃儚ID涓�221鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�3鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId221 = 30027;
/// <summary>
- /// 闀滃儚ID涓�222鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
+ /// 闀滃儚ID涓�222鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2鎸夐敭闈㈡澘
/// </summary>
public const int uDeviceModelId222 = 30028;
/// <summary>
- /// 闀滃儚ID涓�240鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�2鎸夐敭杞昏Е寮忛潰鏉�
+ /// 闀滃儚ID涓�240鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�2鎸夐敭杞昏Е寮忛潰鏉�
/// </summary>
public const int uDeviceModelId240 = 30029;
/// <summary>
- /// 闀滃儚ID涓�241鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�4鎸夐敭杞昏Е寮忛潰鏉�
+ /// 闀滃儚ID涓�241鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�4鎸夐敭杞昏Е寮忛潰鏉�
/// </summary>
public const int uDeviceModelId241 = 30030;
/// <summary>
- /// 闀滃儚ID涓�242鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�8鎸夐敭杞昏Е寮忛潰鏉�
+ /// 闀滃儚ID涓�242鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�8鎸夐敭杞昏Е寮忛潰鏉�
/// </summary>
public const int uDeviceModelId242 = 30031;
/// <summary>
- /// 闀滃儚ID涓�250鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︽柊椋庨潰鏉�
+ /// 闀滃儚ID涓�250鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︽柊椋庨潰鏉�
/// </summary>
public const int uDeviceModelId250 = 30032;
/// <summary>
- /// 闀滃儚ID涓�253鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮︾幆澧冮潰鏉�
+ /// 闀滃儚ID涓�253鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮︾幆澧冮潰鏉�
/// </summary>
public const int uDeviceModelId253 = 30033;
/// <summary>
- /// 闀滃儚ID涓�224鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�4鎸夐敭鍦烘櫙闈㈡澘
+ /// 闀滃儚ID涓�224鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�4鎸夐敭鍦烘櫙闈㈡澘
/// </summary>
public const int uDeviceModelId224 = 30034;
/// <summary>
- /// 闀滃儚ID涓�226鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾�2璺獥甯橀潰鏉�
+ /// 闀滃儚ID涓�226鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱畝绾�2璺獥甯橀潰鏉�
/// </summary>
public const int uDeviceModelId226 = 30035;
/// <summary>
- /// 闀滃儚ID涓�256鐨勮澶囩殑榛樿鍚嶅瓧锛氭柟鎮�/2璺獥甯橀潰鏉�-Z
+ /// 闀滃儚ID涓�256鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氭柟鎮�/2璺獥甯橀潰鏉�-Z
/// </summary>
public const int uDeviceModelId256 = 30036;
+ /// <summary>
+ /// 闀滃儚ID涓�2802鐨勮澶囩殑瀹樻柟鍚嶅瓧锛歋-one
+ /// </summary>
+ public const int uDeviceModelId2802 = 30037;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
@@ -5904,18 +5938,21 @@
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�13鐨勭炕璇戝悕瀛楋細寮�鍏�
/// </summary>
- public const int uDeviceBelongId13 = 15665;
+ public const int uDeviceBelongId13 = 40014;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�14鐨勭炕璇戝悕瀛楋細鎻掑骇
/// </summary>
- public const int uDeviceBelongId14 = 15666;
+ public const int uDeviceBelongId14 = 40015;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�15鐨勭炕璇戝悕瀛楋細鐏厜
/// </summary>
- public const int uDeviceBelongId15 = 15071;
+ public const int uDeviceBelongId15 = 40016;
/// <summary>
/// 鑷畾涔夎澶囨墍灞濱D涓�16鐨勭炕璇戝悕瀛楋細骞叉帴鐐�
/// </summary>
- public const int uDeviceBelongId16 = 40014;
+ public const int uDeviceBelongId16 = 40017;
+
+ //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囬粯璁ゅ娉ㄥ悕瀛�,浠�50000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
+ //鈽呪槄鈽呪槄妯″潡ID鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�,杩欓噷涓嶉渶瑕佸畾涔�,鍙啓鍦↙anguage.ini鏂囦欢閲岄潰鈽呪槄鈽呪槄
}
}
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index e5a60a2..b5793a5 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -19,6 +19,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\ResultPack.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\UserLoginLocalRegionRes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Pad\MainPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AddOrEditorSceneForm.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" />
@@ -41,7 +42,9 @@
<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\RoomAndDeviceView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SkipView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountForgetPWD.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegister.cs" />
@@ -127,9 +130,14 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\RoomHumiditySetting.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\RoomShareSetting.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\RoomTemperatureSetting.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceDryContactCardControl.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\DeviceRelayDetailCardForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceFunctionUnallocatedControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceSelectUnallocatedControl.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" />
@@ -157,10 +165,12 @@
<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\SceneControls\ScenePictrueControl.cs" />
--
Gitblit v1.8.0