From d87400af518ebc9274f4447f06476959c3aa5102 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 14 七月 2020 16:29:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60_60.png | 0
ZigbeeApp/Home.Ios/AppDelegate.cs | 180
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 26
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs | 15
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json | 56
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs | 52
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 74
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs | 4
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/addLuminosity.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs | 8
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 45
ZigbeeApp/Home.Ios/Resources/Phone/Item/Battery.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87-2.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotion.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 17
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 6
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json | 42
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167_167-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs | 18
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 21
ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs | 29
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BatterySelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs | 12
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/tipIcon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152_152.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 422
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 62
ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json | 152
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressRowBar.cs | 22
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs | 22
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 10
ZigbeeApp/Home.Ios/ESVideo.cs | 84
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 8
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 165
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 9
ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs | 112
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-1.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 56
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-1.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 1262 +++
ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs | 59
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-3.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs | 8
ZigbeeApp/Home.Ios/Info.plist | 6
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76_76.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorSphericalMotionDirectionForm.cs | 87
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 5
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29_29-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs | 22
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs | 16
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor541.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 9
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-2.png | 0
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 66
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs | 208
ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs | 57
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 104
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs | 12
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 160
ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs | 19
ZigbeeApp/Shared/Common/CommonPage.cs | 74
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 136
ZigbeeApp/GateWay.Droid/Application.cs | 16
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/addLuminosity.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs | 6
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-4.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Battery.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152_152-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180-2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs | 9
ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorSphericalMotion.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29_29.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs | 14
ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercom.png | 0
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 18
ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs | 57
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs | 26
ZigbeeApp/Home.Ios/Home.IOS.csproj | 73
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-4.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536.png | 0
ZigbeeApp/Shared/R.cs | 41
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/lesLuminositys.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-1.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Item/BatterySelected.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs | 22
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs | 20
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 5
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs | 18
ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs | 14
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 144
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png | 0
ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 53
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs | 22
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 80
ZigbeeApp/Shared/Common/House.cs | 70
ZigbeeApp/Shared/Phone/Device/Logic/Illumination.cs | 202
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png | 0
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 13356 ++++++++++++++++----------------
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs | 2
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 98
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 15
ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/SensorSphericalMotion.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/lesLuminositys.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 64
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 28
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-1.png | 0
ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs | 10
ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/SensorSphericalMotion.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs | 12
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 159
ZigbeeApp/Shared/Phone/UserView/UserPage.cs | 31
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs | 80
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-2-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor541.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-1.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs | 42
ZigbeeApp/Shared/Phone/Category/AdjustTargetAddSceneForm.cs | 83
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 10
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008.png | 0
ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs | 2
ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs | 14
ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs | 275
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 265
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs | 1264 ---
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167_167.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 171
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 6
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercom.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 126
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs | 33
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 50
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png | 0
ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs | 46
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs | 135
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20_20.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-4.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 29
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.png | 0
ZigbeeApp/Shared/Shared.projitems | 9
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor541.png | 0
ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs | 27
ZigbeeApp/Shared/DLL/IOS/Shared.IOS.ESVideoPhoneSDK.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs | 22
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotion.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20_20-1.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercomNext.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.png | 0
ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs | 3
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76_76-1.png | 0
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 93
ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs | 67
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 49
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs | 8
ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs | 33
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs | 430 +
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 45
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs | 22
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs | 8
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 107
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 15
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideForm2.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 13
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-2.png | 0
ZigbeeApp/Shared/Phone/Login/AccountRegister.cs | 8
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-4.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png | 0
ZigbeeApp/Home.Ios/MainViewController.cs | 6
ZigbeeApp/Home.Ios/Resources/Language.ini | 211
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs | 23
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs | 16
ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs | 96
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png | 0
ZigbeeApp/Shared/Common/Device.cs | 185
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 499
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60_60-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png | 0
ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 49
ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/tipIcon.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs | 7
ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor541.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs | 142
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 63
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png | 0
/dev/null | 281
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs | 32
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs | 180
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 17
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 1
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-3.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercomNext.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorSphericalMotion.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs | 8
301 files changed, 12,937 insertions(+), 11,531 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 32c6c9d..d149de0 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -98,11 +98,10 @@
api.SendReq(req);
}
/// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� {
- string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
- Shared.Application.IsGpsEnable = System.IO.File.Exists(checkFile);
-
- //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
- // System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
+ Shared.Application.IsGpsEnable = false;
+
+ //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
+ // System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
#if Release鈥� JPushInterface.SetDebugMode(false);
//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
//System.Console.WriteLine($"BBB : {System .DateTime .Now .ToString ()}");
@@ -110,6 +109,8 @@
JPushInterface.Init(this);
//System.Console.WriteLine($"CCC : {System.DateTime.Now.ToString()}");
#endif
+
+
BaseActivity.BackKeyAction = () => {
try
{
@@ -158,8 +159,9 @@
Shared.Application.FontSize = 12;
AppCenter.Start("4802834a-e7e9-4dd8-93f1-c2f88f0bd464", typeof(Analytics), typeof(Crashes));鈥�#if Release鈥� //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠垛�� var registrationId = JPushInterface.GetRegistrationID(activity);
System.Console.WriteLine("registrationId-鏋佸厜id=" + registrationId);
- if (!string.IsNullOrEmpty(registrationId))鈥� {鈥� Shared.Common.Config.Instance.RegistrationID = registrationId;鈥� Shared.Common.Config.Instance.Save();鈥� }鈥�#endif鈥� };鈥� BaseActivity.RefreshUIAction += (activity) => {鈥� Shared.Language.CurrentLanguage = "Chinese";鈥� Shared.Common.CommonPage.Instance.Show();鈥� };鈥� BaseActivity.OnResumeAction += (activity) => {鈥� };鈥� BaseActivity.NetworkStateChanged += (v) =>鈥� {鈥� //缃戠粶鐘舵�佸彉鍖栧鐞嗕簨浠�
- Shared.Common.CommonPage.nowNetworkMode = v;鈥� };鈥� BaseActivity.OnDestroyAction += (activity) => {鈥� //socket鍋滄杩炴帴鈥� //ZigBee.Device.ZbGateway.FindGateWaySocket.Stop();鈥� };鈥ㄢ�� HDLUtils.SetAuthoritiesName("com.hdl.home.fileProvider");鈥� }鈥ㄢ�� public static bool IsShowTip = true;鈥� JpushNotificationReceiver myReceiver = new JpushNotificationReceiver { };鈥ㄢ�� /// <summary>鈥� /// 椤圭洰鍚姩鏃剁綉缁滄煡璇⑩�� /// </summary>鈥� void checkSomeInfo()鈥� {鈥� var status = isNetworkAvailable(this);鈥� string internetStatus = "Available";鈥� if (!status)鈥� {鈥� internetStatus = "UnaVailable";鈥� }鈥� else鈥� {鈥� var isWifi = isWifiConnected(this);鈥� if (isWifi)鈥� {鈥� internetStatus = "WiFiConnect";鈥� }鈥� else鈥� {鈥� internetStatus = "MobileConnect";鈥� }鈥� }鈥ㄢ�� int connectState = 0;鈥� if (internetStatus == "UnaVailable")鈥� {鈥� connectState = 0;鈥� }鈥� else if (internetStatus == "WiFiConnect")鈥� {鈥� connectState = 2;鈥� }鈥� else鈥� {鈥� connectState = 1;鈥� }鈥� //ZigBee.Device.ZbGateway.CheckConnection(connectState);鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁鍙敤鈥� /// </summary>鈥� /// <returns><c>true</c>, if network available was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isNetworkAvailable(Context context)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� if (cm == null || cm.ActiveNetworkInfo == null)鈥� {鈥� //褰撳墠缃戠粶涓嶅彲鐢ㄢ�� return false;鈥� }鈥� else鈥� {鈥� return cm.ActiveNetworkInfo.IsAvailable;鈥� }鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁杩炴帴鈥� /// </summary>鈥� /// <returns><c>true</c>, if wifi connected was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isWifiConnected(Context context)鈥� {鈥� if (context != null)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� var mWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Wifi);鈥� if (Android.Net.NetworkInfo.State.Connected == mWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疻i-Fi杩炴帴鈥� return true;鈥� }鈥ㄢ�� var moWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Mobile);鈥� if (Android.Net.NetworkInfo.State.Connected == moWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疢obile杩炴帴鈥� return false;鈥� }鈥� }鈥� return false;鈥� }
+ if (!string.IsNullOrEmpty(registrationId))鈥� {鈥� Shared.Common.Config.Instance.RegistrationID = registrationId;鈥� Shared.Common.Config.Instance.Save();鈥� }鈥�#endif鈥� };鈥ㄢ�� 鈥� BaseActivity.RefreshUIAction += (activity) => {鈥� Shared.Language.CurrentLanguage = "Chinese";鈥� Shared.Common.CommonPage.Instance.Show();鈥� };鈥ㄢ�� BaseActivity.NetworkStateChanged += (v) =>鈥� {鈥� };鈥� BaseActivity.OnDestroyAction += (activity) => {鈥� //socket鍋滄杩炴帴鈥� //ZigBee.Device.ZbGateway.FindGateWaySocket.Stop();鈥� };鈥ㄢ�� HDLUtils.SetAuthoritiesName("com.hdl.home.fileProvider");鈥� }鈥ㄢ�� public static bool IsShowTip = true;鈥� JpushNotificationReceiver myReceiver = new JpushNotificationReceiver { };鈥ㄢ�� /// <summary>鈥� /// 椤圭洰鍚姩鏃剁綉缁滄煡璇⑩�� /// </summary>鈥� void checkSomeInfo()鈥� {鈥� var status = isNetworkAvailable(this);鈥� string internetStatus = "Available";鈥� if (!status)鈥� {鈥� internetStatus = "UnaVailable";鈥� }鈥� else鈥� {鈥� var isWifi = isWifiConnected(this);鈥� if (isWifi)鈥� {鈥� internetStatus = "WiFiConnect";鈥� }鈥� else鈥� {鈥� internetStatus = "MobileConnect";鈥� }鈥� }鈥ㄢ�� int connectState = 0;鈥� if (internetStatus == "UnaVailable")鈥� {鈥� connectState = 0;鈥� }鈥� else if (internetStatus == "WiFiConnect")鈥� {鈥� connectState = 2;鈥� }鈥� else鈥� {鈥� connectState = 1;鈥� }鈥� //ZigBee.Device.ZbGateway.CheckConnection(connectState);鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁鍙敤鈥� /// </summary>鈥� /// <returns><c>true</c>, if network available was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isNetworkAvailable(Context context)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� if (cm == null || cm.ActiveNetworkInfo == null)鈥� {鈥� //褰撳墠缃戠粶涓嶅彲鐢ㄢ�� return false;鈥� }鈥� else鈥� {鈥� return cm.ActiveNetworkInfo.IsAvailable;鈥� }鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁杩炴帴鈥� /// </summary>鈥� /// <returns><c>true</c>, if wifi connected was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isWifiConnected(Context context)鈥� {鈥� if (context != null)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� var mWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Wifi);鈥� if (Android.Net.NetworkInfo.State.Connected == mWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疻i-Fi杩炴帴鈥� return true;鈥� }鈥ㄢ�� var moWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Mobile);鈥� if (Android.Net.NetworkInfo.State.Connected == moWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疢obile杩炴帴鈥� return false;鈥� }鈥� }鈥� return false;鈥� }
+
+
}
public class JpushNotificationReceiver : BroadcastReceiver
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotion.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotion.png
new file mode 100755
index 0000000..b62423c
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected.png
new file mode 100755
index 0000000..65d2ef8
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected2.png
new file mode 100755
index 0000000..57765bb
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/SensorSphericalMotionSelected2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/SensorSphericalMotion.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/SensorSphericalMotion.png
new file mode 100755
index 0000000..3fb3998
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Battery.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Battery.png
new file mode 100755
index 0000000..33d07e8
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/Battery.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BatterySelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BatterySelected.png
new file mode 100755
index 0000000..d03b0af
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/BatterySelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercom.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercom.png
new file mode 100755
index 0000000..5adf153
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercom.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercomNext.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercomNext.png
new file mode 100755
index 0000000..df52c60
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/videoIntercomNext.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorSphericalMotion.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorSphericalMotion.png
new file mode 100755
index 0000000..e2a9827
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/addLuminosity.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/addLuminosity.png
new file mode 100755
index 0000000..2c013d1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/addLuminosity.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/lesLuminositys.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/lesLuminositys.png
new file mode 100755
index 0000000..ee4c220
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/lesLuminositys.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor541.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor541.png
new file mode 100755
index 0000000..d979f13
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/selectedsensor541.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor541.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor541.png
new file mode 100755
index 0000000..1ee843a
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/sensor541.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/tipIcon.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/tipIcon.png
new file mode 100755
index 0000000..57307cd
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/tipIcon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index b4ecace..9e879b0 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -2316,4 +2316,4 @@
<Import Project="..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.Fragment.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.25.4.0.1\build\MonoAndroid70\Xamarin.Android.Support.v4.targets')" />
<Import Project="..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index bc49746..51ed695 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -13,5776 +13,5775 @@
namespace GateWay.Droid
{
-
-
+
+
[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
-
+
static Resource()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
public static void UpdateIdValues()
{
- global::ZXing.Mobile.Resource.Id.contentFrame = global::GateWay.Droid.Resource.Id.contentFrame;
- global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::GateWay.Droid.Resource.Layout.zxingscanneractivitylayout;
- global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::GateWay.Droid.Resource.Layout.zxingscannerfragmentlayout;
}
-
+
public partial class Animation
{
-
- // aapt resource value: 0x7F010000
- public const int abc_fade_in = 2130771968;
-
- // aapt resource value: 0x7F010001
- public const int abc_fade_out = 2130771969;
-
- // aapt resource value: 0x7F010002
- public const int abc_grow_fade_in_from_bottom = 2130771970;
-
- // aapt resource value: 0x7F010003
- public const int abc_popup_enter = 2130771971;
-
- // aapt resource value: 0x7F010004
- public const int abc_popup_exit = 2130771972;
-
- // aapt resource value: 0x7F010005
- public const int abc_shrink_fade_out_from_bottom = 2130771973;
-
- // aapt resource value: 0x7F010006
- public const int abc_slide_in_bottom = 2130771974;
-
- // aapt resource value: 0x7F010007
- public const int abc_slide_in_top = 2130771975;
-
- // aapt resource value: 0x7F010008
- public const int abc_slide_out_bottom = 2130771976;
-
- // aapt resource value: 0x7F010009
- public const int abc_slide_out_top = 2130771977;
-
- // aapt resource value: 0x7F01000A
- public const int design_bottom_sheet_slide_in = 2130771978;
-
- // aapt resource value: 0x7F01000B
- public const int design_bottom_sheet_slide_out = 2130771979;
-
- // aapt resource value: 0x7F01000C
- public const int design_snackbar_in = 2130771980;
-
- // aapt resource value: 0x7F01000D
- public const int design_snackbar_out = 2130771981;
-
- // aapt resource value: 0x7F01000E
- public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
-
- // aapt resource value: 0x7F01000F
- public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
-
- // aapt resource value: 0x7F010010
- public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
-
- // aapt resource value: 0x7F010011
- public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
-
- // aapt resource value: 0x7F010012
- public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
-
- // aapt resource value: 0x7F010013
- public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
-
- // aapt resource value: 0x7F010014
- public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
-
- // aapt resource value: 0x7F010015
- public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
-
- // aapt resource value: 0x7F010016
- public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
-
- // aapt resource value: 0x7F010017
- public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
-
- // aapt resource value: 0x7F010018
- public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
-
- // aapt resource value: 0x7F010019
- public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
-
- // aapt resource value: 0x7F01001A
- public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
-
- // aapt resource value: 0x7F01001B
- public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
-
- // aapt resource value: 0x7F01001C
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
-
- // aapt resource value: 0x7F01001D
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
-
- // aapt resource value: 0x7F01001E
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
-
- // aapt resource value: 0x7F01001F
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
-
- // aapt resource value: 0x7F010020
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
-
- // aapt resource value: 0x7F010021
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
-
- // aapt resource value: 0x7F010022
- public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
-
- // aapt resource value: 0x7F010023
- public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
-
- // aapt resource value: 0x7F010024
- public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
-
- // aapt resource value: 0x7F010025
- public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
-
- // aapt resource value: 0x7F010026
- public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
-
- // aapt resource value: 0x7F010027
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
-
- // aapt resource value: 0x7F010028
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
-
- // aapt resource value: 0x7F010029
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
-
- // aapt resource value: 0x7F01002A
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
-
- // aapt resource value: 0x7F01002B
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
-
- // aapt resource value: 0x7F01002C
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
-
- // aapt resource value: 0x7F01002D
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
-
- // aapt resource value: 0x7F01002E
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
-
- // aapt resource value: 0x7F01002F
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
-
- // aapt resource value: 0x7F010030
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
-
- // aapt resource value: 0x7F010031
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
-
- // aapt resource value: 0x7F010032
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
-
- // aapt resource value: 0x7F010033
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
-
- // aapt resource value: 0x7F010034
- public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
-
- // aapt resource value: 0x7F010035
- public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
-
- // aapt resource value: 0x7F010036
- public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
-
- // aapt resource value: 0x7F010037
- public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
-
- // aapt resource value: 0x7F010038
- public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
-
- // aapt resource value: 0x7F010039
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
-
- // aapt resource value: 0x7F01003A
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
-
- // aapt resource value: 0x7F01003B
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
-
- // aapt resource value: 0x7F01003C
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
-
- // aapt resource value: 0x7F01003D
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
-
- // aapt resource value: 0x7F01003E
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
-
- // aapt resource value: 0x7F01003F
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
-
- // aapt resource value: 0x7F010040
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
-
- // aapt resource value: 0x7F010041
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
-
- // aapt resource value: 0x7F010042
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
-
- // aapt resource value: 0x7F010043
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
-
- // aapt resource value: 0x7F010044
- public const int move_in = 2130772036;
-
- // aapt resource value: 0x7F010045
- public const int move_out = 2130772037;
-
- // aapt resource value: 0x7F010046
- public const int pickerview_dialog_scale_in = 2130772038;
-
- // aapt resource value: 0x7F010047
- public const int pickerview_dialog_scale_out = 2130772039;
-
- // aapt resource value: 0x7F010048
- public const int pickerview_slide_in_bottom = 2130772040;
-
- // aapt resource value: 0x7F010049
- public const int pickerview_slide_out_bottom = 2130772041;
-
- // aapt resource value: 0x7F01004A
- public const int tooltip_enter = 2130772042;
-
- // aapt resource value: 0x7F01004B
- public const int tooltip_exit = 2130772043;
-
+
+ // aapt resource value: 0x7f050000
+ public const int abc_fade_in = 2131034112;
+
+ // aapt resource value: 0x7f050001
+ public const int abc_fade_out = 2131034113;
+
+ // aapt resource value: 0x7f050002
+ public const int abc_grow_fade_in_from_bottom = 2131034114;
+
+ // aapt resource value: 0x7f050003
+ public const int abc_popup_enter = 2131034115;
+
+ // aapt resource value: 0x7f050004
+ public const int abc_popup_exit = 2131034116;
+
+ // aapt resource value: 0x7f050005
+ public const int abc_shrink_fade_out_from_bottom = 2131034117;
+
+ // aapt resource value: 0x7f050006
+ public const int abc_slide_in_bottom = 2131034118;
+
+ // aapt resource value: 0x7f050007
+ public const int abc_slide_in_top = 2131034119;
+
+ // aapt resource value: 0x7f050008
+ public const int abc_slide_out_bottom = 2131034120;
+
+ // aapt resource value: 0x7f050009
+ public const int abc_slide_out_top = 2131034121;
+
+ // aapt resource value: 0x7f05000a
+ public const int design_bottom_sheet_slide_in = 2131034122;
+
+ // aapt resource value: 0x7f05000b
+ public const int design_bottom_sheet_slide_out = 2131034123;
+
+ // aapt resource value: 0x7f05000c
+ public const int design_snackbar_in = 2131034124;
+
+ // aapt resource value: 0x7f05000d
+ public const int design_snackbar_out = 2131034125;
+
+ // aapt resource value: 0x7f05000e
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
+
+ // aapt resource value: 0x7f05000f
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
+
+ // aapt resource value: 0x7f050010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
+
+ // aapt resource value: 0x7f050011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
+
+ // aapt resource value: 0x7f050012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
+
+ // aapt resource value: 0x7f050013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
+
+ // aapt resource value: 0x7f050014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
+
+ // aapt resource value: 0x7f050015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
+
+ // aapt resource value: 0x7f050016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
+
+ // aapt resource value: 0x7f050017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
+
+ // aapt resource value: 0x7f050018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
+
+ // aapt resource value: 0x7f050019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
+
+ // aapt resource value: 0x7f05001a
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
+
+ // aapt resource value: 0x7f05001b
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
+
+ // aapt resource value: 0x7f05001c
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
+
+ // aapt resource value: 0x7f05001d
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
+
+ // aapt resource value: 0x7f05001e
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
+
+ // aapt resource value: 0x7f05001f
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
+
+ // aapt resource value: 0x7f050020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
+
+ // aapt resource value: 0x7f050021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
+
+ // aapt resource value: 0x7f050022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+
+ // aapt resource value: 0x7f050023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+
+ // aapt resource value: 0x7f050024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+
+ // aapt resource value: 0x7f050025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+
+ // aapt resource value: 0x7f050026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
+
+ // aapt resource value: 0x7f050027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
+
+ // aapt resource value: 0x7f050028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
+
+ // aapt resource value: 0x7f050029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
+
+ // aapt resource value: 0x7f05002a
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
+
+ // aapt resource value: 0x7f05002b
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
+
+ // aapt resource value: 0x7f05002c
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
+
+ // aapt resource value: 0x7f05002d
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
+
+ // aapt resource value: 0x7f05002e
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
+
+ // aapt resource value: 0x7f05002f
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
+
+ // aapt resource value: 0x7f050030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
+
+ // aapt resource value: 0x7f050031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
+
+ // aapt resource value: 0x7f050032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
+
+ // aapt resource value: 0x7f050033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
+
+ // aapt resource value: 0x7f050034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
+
+ // aapt resource value: 0x7f050035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
+
+ // aapt resource value: 0x7f050036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
+
+ // aapt resource value: 0x7f050037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
+
+ // aapt resource value: 0x7f050038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
+
+ // aapt resource value: 0x7f050039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
+
+ // aapt resource value: 0x7f05003a
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
+
+ // aapt resource value: 0x7f05003b
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
+
+ // aapt resource value: 0x7f05003c
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
+
+ // aapt resource value: 0x7f05003d
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
+
+ // aapt resource value: 0x7f05003e
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
+
+ // aapt resource value: 0x7f05003f
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
+
+ // aapt resource value: 0x7f050040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
+
+ // aapt resource value: 0x7f050041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
+
+ // aapt resource value: 0x7f050042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
+
+ // aapt resource value: 0x7f050043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
+
+ // aapt resource value: 0x7f050044
+ public const int move_in = 2131034180;
+
+ // aapt resource value: 0x7f050045
+ public const int move_out = 2131034181;
+
+ // aapt resource value: 0x7f050046
+ public const int pickerview_dialog_scale_in = 2131034182;
+
+ // aapt resource value: 0x7f050047
+ public const int pickerview_dialog_scale_out = 2131034183;
+
+ // aapt resource value: 0x7f050048
+ public const int pickerview_slide_in_bottom = 2131034184;
+
+ // aapt resource value: 0x7f050049
+ public const int pickerview_slide_out_bottom = 2131034185;
+
+ // aapt resource value: 0x7f05004a
+ public const int tooltip_enter = 2131034186;
+
+ // aapt resource value: 0x7f05004b
+ public const int tooltip_exit = 2131034187;
+
static Animation()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Animation()
{
}
}
-
+
public partial class Animator
{
-
- // aapt resource value: 0x7F020000
- public const int design_appbar_state_list_animator = 2130837504;
-
+
+ // aapt resource value: 0x7f060000
+ public const int design_appbar_state_list_animator = 2131099648;
+
static Animator()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Animator()
{
}
}
-
+
public partial class Array
{
-
- // aapt resource value: 0x7F030000
- public const int arc_colors_default = 2130903040;
-
+
+ // aapt resource value: 0x7f0f0000
+ public const int arc_colors_default = 2131689472;
+
static Array()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Array()
{
}
}
-
+
public partial class Attribute
{
-
- // aapt resource value: 0x7F040000
- public const int actionBarDivider = 2130968576;
-
- // aapt resource value: 0x7F040001
- public const int actionBarItemBackground = 2130968577;
-
- // aapt resource value: 0x7F040002
- public const int actionBarPopupTheme = 2130968578;
-
- // aapt resource value: 0x7F040003
- public const int actionBarSize = 2130968579;
-
- // aapt resource value: 0x7F040004
- public const int actionBarSplitStyle = 2130968580;
-
- // aapt resource value: 0x7F040005
- public const int actionBarStyle = 2130968581;
-
- // aapt resource value: 0x7F040006
- public const int actionBarTabBarStyle = 2130968582;
-
- // aapt resource value: 0x7F040007
- public const int actionBarTabStyle = 2130968583;
-
- // aapt resource value: 0x7F040008
- public const int actionBarTabTextStyle = 2130968584;
-
- // aapt resource value: 0x7F040009
- public const int actionBarTheme = 2130968585;
-
- // aapt resource value: 0x7F04000A
- public const int actionBarWidgetTheme = 2130968586;
-
- // aapt resource value: 0x7F04000B
- public const int actionButtonStyle = 2130968587;
-
- // aapt resource value: 0x7F04000C
- public const int actionDropDownStyle = 2130968588;
-
- // aapt resource value: 0x7F04000D
- public const int actionLayout = 2130968589;
-
- // aapt resource value: 0x7F04000E
- public const int actionMenuTextAppearance = 2130968590;
-
- // aapt resource value: 0x7F04000F
- public const int actionMenuTextColor = 2130968591;
-
- // aapt resource value: 0x7F040010
- public const int actionModeBackground = 2130968592;
-
- // aapt resource value: 0x7F040011
- public const int actionModeCloseButtonStyle = 2130968593;
-
- // aapt resource value: 0x7F040012
- public const int actionModeCloseDrawable = 2130968594;
-
- // aapt resource value: 0x7F040013
- public const int actionModeCopyDrawable = 2130968595;
-
- // aapt resource value: 0x7F040014
- public const int actionModeCutDrawable = 2130968596;
-
- // aapt resource value: 0x7F040015
- public const int actionModeFindDrawable = 2130968597;
-
- // aapt resource value: 0x7F040016
- public const int actionModePasteDrawable = 2130968598;
-
- // aapt resource value: 0x7F040017
- public const int actionModePopupWindowStyle = 2130968599;
-
- // aapt resource value: 0x7F040018
- public const int actionModeSelectAllDrawable = 2130968600;
-
- // aapt resource value: 0x7F040019
- public const int actionModeShareDrawable = 2130968601;
-
- // aapt resource value: 0x7F04001A
- public const int actionModeSplitBackground = 2130968602;
-
- // aapt resource value: 0x7F04001B
- public const int actionModeStyle = 2130968603;
-
- // aapt resource value: 0x7F04001C
- public const int actionModeWebSearchDrawable = 2130968604;
-
- // aapt resource value: 0x7F04001D
- public const int actionOverflowButtonStyle = 2130968605;
-
- // aapt resource value: 0x7F04001E
- public const int actionOverflowMenuStyle = 2130968606;
-
- // aapt resource value: 0x7F04001F
- public const int actionProviderClass = 2130968607;
-
- // aapt resource value: 0x7F040020
- public const int actionViewClass = 2130968608;
-
- // aapt resource value: 0x7F040021
- public const int activityChooserViewStyle = 2130968609;
-
- // aapt resource value: 0x7F040022
- public const int alertDialogButtonGroupStyle = 2130968610;
-
- // aapt resource value: 0x7F040023
- public const int alertDialogCenterButtons = 2130968611;
-
- // aapt resource value: 0x7F040024
- public const int alertDialogStyle = 2130968612;
-
- // aapt resource value: 0x7F040025
- public const int alertDialogTheme = 2130968613;
-
- // aapt resource value: 0x7F040026
- public const int allowStacking = 2130968614;
-
- // aapt resource value: 0x7F040027
- public const int alpha = 2130968615;
-
- // aapt resource value: 0x7F040028
- public const int alphabeticModifiers = 2130968616;
-
- // aapt resource value: 0x7F040029
- public const int arc_border_color = 2130968617;
-
- // aapt resource value: 0x7F04002A
- public const int arc_border_width = 2130968618;
-
- // aapt resource value: 0x7F04002B
- public const int arc_colors = 2130968619;
-
- // aapt resource value: 0x7F04002C
- public const int arc_max = 2130968620;
-
- // aapt resource value: 0x7F04002D
- public const int arc_min = 2130968621;
-
- // aapt resource value: 0x7F04002E
- public const int arc_open_angle = 2130968622;
-
- // aapt resource value: 0x7F04002F
- public const int arc_progress = 2130968623;
-
- // aapt resource value: 0x7F040030
- public const int arc_progress_bar_color = 2130968624;
-
- // aapt resource value: 0x7F040031
- public const int arc_progress_bar_text_unit = 2130968625;
-
- // aapt resource value: 0x7F040032
- public const int arc_rotate_angle = 2130968626;
-
- // aapt resource value: 0x7F040033
- public const int arc_shadow_radius = 2130968627;
-
- // aapt resource value: 0x7F040034
- public const int arc_thumb_color = 2130968628;
-
- // aapt resource value: 0x7F040035
- public const int arc_thumb_radius = 2130968629;
-
- // aapt resource value: 0x7F040036
- public const int arc_thumb_shadow_color = 2130968630;
-
- // aapt resource value: 0x7F040037
- public const int arc_thumb_shadow_radius = 2130968631;
-
- // aapt resource value: 0x7F040038
- public const int arc_thumb_width = 2130968632;
-
- // aapt resource value: 0x7F040039
- public const int arc_width = 2130968633;
-
- // aapt resource value: 0x7F04003A
- public const int arrowHeadLength = 2130968634;
-
- // aapt resource value: 0x7F04003B
- public const int arrowShaftLength = 2130968635;
-
- // aapt resource value: 0x7F04003C
- public const int autoCompleteTextViewStyle = 2130968636;
-
- // aapt resource value: 0x7F04003D
- public const int autoSizeMaxTextSize = 2130968637;
-
- // aapt resource value: 0x7F04003E
- public const int autoSizeMinTextSize = 2130968638;
-
- // aapt resource value: 0x7F04003F
- public const int autoSizePresetSizes = 2130968639;
-
- // aapt resource value: 0x7F040040
- public const int autoSizeStepGranularity = 2130968640;
-
- // aapt resource value: 0x7F040041
- public const int autoSizeTextType = 2130968641;
-
- // aapt resource value: 0x7F040042
- public const int background = 2130968642;
-
- // aapt resource value: 0x7F040043
- public const int backgroundSplit = 2130968643;
-
- // aapt resource value: 0x7F040044
- public const int backgroundStacked = 2130968644;
-
- // aapt resource value: 0x7F040045
- public const int backgroundTint = 2130968645;
-
- // aapt resource value: 0x7F040046
- public const int backgroundTintMode = 2130968646;
-
- // aapt resource value: 0x7F040047
- public const int barLength = 2130968647;
-
- // aapt resource value: 0x7F040048
- public const int behavior_autoHide = 2130968648;
-
- // aapt resource value: 0x7F040049
- public const int behavior_hideable = 2130968649;
-
- // aapt resource value: 0x7F04004A
- public const int behavior_overlapTop = 2130968650;
-
- // aapt resource value: 0x7F04004B
- public const int behavior_peekHeight = 2130968651;
-
- // aapt resource value: 0x7F04004C
- public const int behavior_skipCollapsed = 2130968652;
-
- // aapt resource value: 0x7F04004D
- public const int biometricPromptDialogTheme = 2130968653;
-
- // aapt resource value: 0x7F04004F
- public const int borderlessButtonStyle = 2130968655;
-
- // aapt resource value: 0x7F04004E
- public const int borderWidth = 2130968654;
-
- // aapt resource value: 0x7F040050
- public const int bottomSheetDialogTheme = 2130968656;
-
- // aapt resource value: 0x7F040051
- public const int bottomSheetStyle = 2130968657;
-
- // aapt resource value: 0x7F040052
- public const int buttonBarButtonStyle = 2130968658;
-
- // aapt resource value: 0x7F040053
- public const int buttonBarNegativeButtonStyle = 2130968659;
-
- // aapt resource value: 0x7F040054
- public const int buttonBarNeutralButtonStyle = 2130968660;
-
- // aapt resource value: 0x7F040055
- public const int buttonBarPositiveButtonStyle = 2130968661;
-
- // aapt resource value: 0x7F040056
- public const int buttonBarStyle = 2130968662;
-
- // aapt resource value: 0x7F040057
- public const int buttonGravity = 2130968663;
-
- // aapt resource value: 0x7F040058
- public const int buttonPanelSideLayout = 2130968664;
-
- // aapt resource value: 0x7F040059
- public const int buttonStyle = 2130968665;
-
- // aapt resource value: 0x7F04005A
- public const int buttonStyleSmall = 2130968666;
-
- // aapt resource value: 0x7F04005B
- public const int buttonTint = 2130968667;
-
- // aapt resource value: 0x7F04005C
- public const int buttonTintMode = 2130968668;
-
- // aapt resource value: 0x7F04005D
- public const int checkboxStyle = 2130968669;
-
- // aapt resource value: 0x7F04005E
- public const int checkedTextViewStyle = 2130968670;
-
- // aapt resource value: 0x7F04005F
- public const int closeIcon = 2130968671;
-
- // aapt resource value: 0x7F040060
- public const int closeItemLayout = 2130968672;
-
- // aapt resource value: 0x7F040061
- public const int collapseContentDescription = 2130968673;
-
- // aapt resource value: 0x7F040063
- public const int collapsedTitleGravity = 2130968675;
-
- // aapt resource value: 0x7F040064
- public const int collapsedTitleTextAppearance = 2130968676;
-
- // aapt resource value: 0x7F040062
- public const int collapseIcon = 2130968674;
-
- // aapt resource value: 0x7F040065
- public const int color = 2130968677;
-
- // aapt resource value: 0x7F040066
- public const int colorAccent = 2130968678;
-
- // aapt resource value: 0x7F040067
- public const int colorBackgroundFloating = 2130968679;
-
- // aapt resource value: 0x7F040068
- public const int colorButtonNormal = 2130968680;
-
- // aapt resource value: 0x7F040069
- public const int colorControlActivated = 2130968681;
-
- // aapt resource value: 0x7F04006A
- public const int colorControlHighlight = 2130968682;
-
- // aapt resource value: 0x7F04006B
- public const int colorControlNormal = 2130968683;
-
- // aapt resource value: 0x7F04006C
- public const int colorError = 2130968684;
-
- // aapt resource value: 0x7F04006D
- public const int colorPrimary = 2130968685;
-
- // aapt resource value: 0x7F04006E
- public const int colorPrimaryDark = 2130968686;
-
- // aapt resource value: 0x7F04006F
- public const int colorSwitchThumbNormal = 2130968687;
-
- // aapt resource value: 0x7F040070
- public const int commitIcon = 2130968688;
-
- // aapt resource value: 0x7F040071
- public const int contentDescription = 2130968689;
-
- // aapt resource value: 0x7F040072
- public const int contentInsetEnd = 2130968690;
-
- // aapt resource value: 0x7F040073
- public const int contentInsetEndWithActions = 2130968691;
-
- // aapt resource value: 0x7F040074
- public const int contentInsetLeft = 2130968692;
-
- // aapt resource value: 0x7F040075
- public const int contentInsetRight = 2130968693;
-
- // aapt resource value: 0x7F040076
- public const int contentInsetStart = 2130968694;
-
- // aapt resource value: 0x7F040077
- public const int contentInsetStartWithNavigation = 2130968695;
-
- // aapt resource value: 0x7F040078
- public const int contentScrim = 2130968696;
-
- // aapt resource value: 0x7F040079
- public const int controlBackground = 2130968697;
-
- // aapt resource value: 0x7F04007A
- public const int counterEnabled = 2130968698;
-
- // aapt resource value: 0x7F04007B
- public const int counterMaxLength = 2130968699;
-
- // aapt resource value: 0x7F04007C
- public const int counterOverflowTextAppearance = 2130968700;
-
- // aapt resource value: 0x7F04007D
- public const int counterTextAppearance = 2130968701;
-
- // aapt resource value: 0x7F04007E
- public const int curtain_bar_bg_color = 2130968702;
-
- // aapt resource value: 0x7F04007F
- public const int curtain_bar_border_color = 2130968703;
-
- // aapt resource value: 0x7F040080
- public const int curtain_bar_color = 2130968704;
-
- // aapt resource value: 0x7F040081
- public const int curtain_bar_height = 2130968705;
-
- // aapt resource value: 0x7F040082
- public const int curtain_bar_width = 2130968706;
-
- // aapt resource value: 0x7F040083
- public const int customNavigationLayout = 2130968707;
-
- // aapt resource value: 0x7F040084
- public const int defaultQueryHint = 2130968708;
-
- // aapt resource value: 0x7F040085
- public const int dialogPreferredPadding = 2130968709;
-
- // aapt resource value: 0x7F040086
- public const int dialogTheme = 2130968710;
-
- // aapt resource value: 0x7F040087
- public const int displayOptions = 2130968711;
-
- // aapt resource value: 0x7F040088
- public const int divider = 2130968712;
-
- // aapt resource value: 0x7F040089
- public const int dividerHorizontal = 2130968713;
-
- // aapt resource value: 0x7F04008A
- public const int dividerPadding = 2130968714;
-
- // aapt resource value: 0x7F04008B
- public const int dividerVertical = 2130968715;
-
- // aapt resource value: 0x7F04008C
- public const int drawableSize = 2130968716;
-
- // aapt resource value: 0x7F04008D
- public const int drawerArrowStyle = 2130968717;
-
- // aapt resource value: 0x7F04008F
- public const int dropdownListPreferredItemHeight = 2130968719;
-
- // aapt resource value: 0x7F04008E
- public const int dropDownListViewStyle = 2130968718;
-
- // aapt resource value: 0x7F040090
- public const int editTextBackground = 2130968720;
-
- // aapt resource value: 0x7F040091
- public const int editTextColor = 2130968721;
-
- // aapt resource value: 0x7F040092
- public const int editTextStyle = 2130968722;
-
- // aapt resource value: 0x7F040093
- public const int elevation = 2130968723;
-
- // aapt resource value: 0x7F040094
- public const int errorEnabled = 2130968724;
-
- // aapt resource value: 0x7F040095
- public const int errorTextAppearance = 2130968725;
-
- // aapt resource value: 0x7F040096
- public const int expandActivityOverflowButtonDrawable = 2130968726;
-
- // aapt resource value: 0x7F040097
- public const int expanded = 2130968727;
-
- // aapt resource value: 0x7F040098
- public const int expandedTitleGravity = 2130968728;
-
- // aapt resource value: 0x7F040099
- public const int expandedTitleMargin = 2130968729;
-
- // aapt resource value: 0x7F04009A
- public const int expandedTitleMarginBottom = 2130968730;
-
- // aapt resource value: 0x7F04009B
- public const int expandedTitleMarginEnd = 2130968731;
-
- // aapt resource value: 0x7F04009C
- public const int expandedTitleMarginStart = 2130968732;
-
- // aapt resource value: 0x7F04009D
- public const int expandedTitleMarginTop = 2130968733;
-
- // aapt resource value: 0x7F04009E
- public const int expandedTitleTextAppearance = 2130968734;
-
- // aapt resource value: 0x7F04009F
- public const int fabSize = 2130968735;
-
- // aapt resource value: 0x7F0400A0
- public const int fastScrollEnabled = 2130968736;
-
- // aapt resource value: 0x7F0400A1
- public const int fastScrollHorizontalThumbDrawable = 2130968737;
-
- // aapt resource value: 0x7F0400A2
- public const int fastScrollHorizontalTrackDrawable = 2130968738;
-
- // aapt resource value: 0x7F0400A3
- public const int fastScrollVerticalThumbDrawable = 2130968739;
-
- // aapt resource value: 0x7F0400A4
- public const int fastScrollVerticalTrackDrawable = 2130968740;
-
- // aapt resource value: 0x7F0400A5
- public const int font = 2130968741;
-
- // aapt resource value: 0x7F0400A6
- public const int fontFamily = 2130968742;
-
- // aapt resource value: 0x7F0400A7
- public const int fontProviderAuthority = 2130968743;
-
- // aapt resource value: 0x7F0400A8
- public const int fontProviderCerts = 2130968744;
-
- // aapt resource value: 0x7F0400A9
- public const int fontProviderFetchStrategy = 2130968745;
-
- // aapt resource value: 0x7F0400AA
- public const int fontProviderFetchTimeout = 2130968746;
-
- // aapt resource value: 0x7F0400AB
- public const int fontProviderPackage = 2130968747;
-
- // aapt resource value: 0x7F0400AC
- public const int fontProviderQuery = 2130968748;
-
- // aapt resource value: 0x7F0400AD
- public const int fontStyle = 2130968749;
-
- // aapt resource value: 0x7F0400AE
- public const int fontWeight = 2130968750;
-
- // aapt resource value: 0x7F0400AF
- public const int foregroundInsidePadding = 2130968751;
-
- // aapt resource value: 0x7F0400B0
- public const int gapBetweenBars = 2130968752;
-
- // aapt resource value: 0x7F0400B1
- public const int goIcon = 2130968753;
-
- // aapt resource value: 0x7F0400B2
- public const int hdl_arc_thumb_mode = 2130968754;
-
- // aapt resource value: 0x7F0400B3
- public const int headerLayout = 2130968755;
-
- // aapt resource value: 0x7F0400B4
- public const int height = 2130968756;
-
- // aapt resource value: 0x7F0400B5
- public const int hideOnContentScroll = 2130968757;
-
- // aapt resource value: 0x7F0400B6
- public const int hintAnimationEnabled = 2130968758;
-
- // aapt resource value: 0x7F0400B7
- public const int hintEnabled = 2130968759;
-
- // aapt resource value: 0x7F0400B8
- public const int hintTextAppearance = 2130968760;
-
- // aapt resource value: 0x7F0400B9
- public const int homeAsUpIndicator = 2130968761;
-
- // aapt resource value: 0x7F0400BA
- public const int homeLayout = 2130968762;
-
- // aapt resource value: 0x7F0400BB
- public const int icon = 2130968763;
-
- // aapt resource value: 0x7F0400BE
- public const int iconifiedByDefault = 2130968766;
-
- // aapt resource value: 0x7F0400BC
- public const int iconTint = 2130968764;
-
- // aapt resource value: 0x7F0400BD
- public const int iconTintMode = 2130968765;
-
- // aapt resource value: 0x7F0400BF
- public const int imageButtonStyle = 2130968767;
-
- // aapt resource value: 0x7F0400C0
- public const int indeterminateProgressStyle = 2130968768;
-
- // aapt resource value: 0x7F0400C1
- public const int initialActivityCount = 2130968769;
-
- // aapt resource value: 0x7F0400C2
- public const int insetForeground = 2130968770;
-
- // aapt resource value: 0x7F0400C3
- public const int isLightTheme = 2130968771;
-
- // aapt resource value: 0x7F0400C4
- public const int itemBackground = 2130968772;
-
- // aapt resource value: 0x7F0400C5
- public const int itemIconTint = 2130968773;
-
- // aapt resource value: 0x7F0400C6
- public const int itemPadding = 2130968774;
-
- // aapt resource value: 0x7F0400C7
- public const int itemTextAppearance = 2130968775;
-
- // aapt resource value: 0x7F0400C8
- public const int itemTextColor = 2130968776;
-
- // aapt resource value: 0x7F0400C9
- public const int keylines = 2130968777;
-
- // aapt resource value: 0x7F0400CA
- public const int layout = 2130968778;
-
- // aapt resource value: 0x7F0400CB
- public const int layoutManager = 2130968779;
-
- // aapt resource value: 0x7F0400CC
- public const int layout_anchor = 2130968780;
-
- // aapt resource value: 0x7F0400CD
- public const int layout_anchorGravity = 2130968781;
-
- // aapt resource value: 0x7F0400CE
- public const int layout_behavior = 2130968782;
-
- // aapt resource value: 0x7F0400CF
- public const int layout_collapseMode = 2130968783;
-
- // aapt resource value: 0x7F0400D0
- public const int layout_collapseParallaxMultiplier = 2130968784;
-
- // aapt resource value: 0x7F0400D1
- public const int layout_dodgeInsetEdges = 2130968785;
-
- // aapt resource value: 0x7F0400D2
- public const int layout_insetEdge = 2130968786;
-
- // aapt resource value: 0x7F0400D3
- public const int layout_keyline = 2130968787;
-
- // aapt resource value: 0x7F0400D4
- public const int layout_scrollFlags = 2130968788;
-
- // aapt resource value: 0x7F0400D5
- public const int layout_scrollInterpolator = 2130968789;
-
- // aapt resource value: 0x7F0400D6
- public const int layout_srlBackgroundColor = 2130968790;
-
- // aapt resource value: 0x7F0400D7
- public const int layout_srlSpinnerStyle = 2130968791;
-
- // aapt resource value: 0x7F0400D8
- public const int listChoiceBackgroundIndicator = 2130968792;
-
- // aapt resource value: 0x7F0400D9
- public const int listDividerAlertDialog = 2130968793;
-
- // aapt resource value: 0x7F0400DA
- public const int listItemLayout = 2130968794;
-
- // aapt resource value: 0x7F0400DB
- public const int listLayout = 2130968795;
-
- // aapt resource value: 0x7F0400DC
- public const int listMenuViewStyle = 2130968796;
-
- // aapt resource value: 0x7F0400DD
- public const int listPopupWindowStyle = 2130968797;
-
- // aapt resource value: 0x7F0400DE
- public const int listPreferredItemHeight = 2130968798;
-
- // aapt resource value: 0x7F0400DF
- public const int listPreferredItemHeightLarge = 2130968799;
-
- // aapt resource value: 0x7F0400E0
- public const int listPreferredItemHeightSmall = 2130968800;
-
- // aapt resource value: 0x7F0400E1
- public const int listPreferredItemPaddingLeft = 2130968801;
-
- // aapt resource value: 0x7F0400E2
- public const int listPreferredItemPaddingRight = 2130968802;
-
- // aapt resource value: 0x7F0400E3
- public const int logo = 2130968803;
-
- // aapt resource value: 0x7F0400E4
- public const int logoDescription = 2130968804;
-
- // aapt resource value: 0x7F0400E5
- public const int maxActionInlineWidth = 2130968805;
-
- // aapt resource value: 0x7F0400E6
- public const int maxButtonHeight = 2130968806;
-
- // aapt resource value: 0x7F0400E7
- public const int measureWithLargestChild = 2130968807;
-
- // aapt resource value: 0x7F0400E8
- public const int menu = 2130968808;
-
- // aapt resource value: 0x7F0400E9
- public const int multiChoiceItemLayout = 2130968809;
-
- // aapt resource value: 0x7F0400EA
- public const int navigationContentDescription = 2130968810;
-
- // aapt resource value: 0x7F0400EB
- public const int navigationIcon = 2130968811;
-
- // aapt resource value: 0x7F0400EC
- public const int navigationMode = 2130968812;
-
- // aapt resource value: 0x7F0400ED
- public const int numericModifiers = 2130968813;
-
- // aapt resource value: 0x7F0400EE
- public const int overlapAnchor = 2130968814;
-
- // aapt resource value: 0x7F0400EF
- public const int paddingBottomNoButtons = 2130968815;
-
- // aapt resource value: 0x7F0400F0
- public const int paddingEnd = 2130968816;
-
- // aapt resource value: 0x7F0400F1
- public const int paddingStart = 2130968817;
-
- // aapt resource value: 0x7F0400F2
- public const int paddingTopNoTitle = 2130968818;
-
- // aapt resource value: 0x7F0400F3
- public const int panelBackground = 2130968819;
-
- // aapt resource value: 0x7F0400F4
- public const int panelMenuListTheme = 2130968820;
-
- // aapt resource value: 0x7F0400F5
- public const int panelMenuListWidth = 2130968821;
-
- // aapt resource value: 0x7F0400F6
- public const int passwordToggleContentDescription = 2130968822;
-
- // aapt resource value: 0x7F0400F7
- public const int passwordToggleDrawable = 2130968823;
-
- // aapt resource value: 0x7F0400F8
- public const int passwordToggleEnabled = 2130968824;
-
- // aapt resource value: 0x7F0400F9
- public const int passwordToggleTint = 2130968825;
-
- // aapt resource value: 0x7F0400FA
- public const int passwordToggleTintMode = 2130968826;
-
- // aapt resource value: 0x7F0400FB
- public const int popupMenuStyle = 2130968827;
-
- // aapt resource value: 0x7F0400FC
- public const int popupTheme = 2130968828;
-
- // aapt resource value: 0x7F0400FD
- public const int popupWindowStyle = 2130968829;
-
- // aapt resource value: 0x7F0400FE
- public const int preserveIconSpacing = 2130968830;
-
- // aapt resource value: 0x7F0400FF
- public const int pressedTranslationZ = 2130968831;
-
- // aapt resource value: 0x7F040100
- public const int progressBarPadding = 2130968832;
-
- // aapt resource value: 0x7F040101
- public const int progressBarStyle = 2130968833;
-
- // aapt resource value: 0x7F040102
- public const int queryBackground = 2130968834;
-
- // aapt resource value: 0x7F040103
- public const int queryHint = 2130968835;
-
- // aapt resource value: 0x7F040104
- public const int radioButtonStyle = 2130968836;
-
- // aapt resource value: 0x7F040105
- public const int ratingBarStyle = 2130968837;
-
- // aapt resource value: 0x7F040106
- public const int ratingBarStyleIndicator = 2130968838;
-
- // aapt resource value: 0x7F040107
- public const int ratingBarStyleSmall = 2130968839;
-
- // aapt resource value: 0x7F040108
- public const int reverseLayout = 2130968840;
-
- // aapt resource value: 0x7F040109
- public const int rippleColor = 2130968841;
-
- // aapt resource value: 0x7F04010A
- public const int scrimAnimationDuration = 2130968842;
-
- // aapt resource value: 0x7F04010B
- public const int scrimVisibleHeightTrigger = 2130968843;
-
- // aapt resource value: 0x7F04010C
- public const int searchHintIcon = 2130968844;
-
- // aapt resource value: 0x7F04010D
- public const int searchIcon = 2130968845;
-
- // aapt resource value: 0x7F04010E
- public const int searchViewStyle = 2130968846;
-
- // aapt resource value: 0x7F04010F
- public const int second_curtain_bar_color = 2130968847;
-
- // aapt resource value: 0x7F040110
- public const int second_wave_color = 2130968848;
-
- // aapt resource value: 0x7F040111
- public const int seekBarStyle = 2130968849;
-
- // aapt resource value: 0x7F040112
- public const int selectableItemBackground = 2130968850;
-
- // aapt resource value: 0x7F040113
- public const int selectableItemBackgroundBorderless = 2130968851;
-
- // aapt resource value: 0x7F040114
- public const int showAsAction = 2130968852;
-
- // aapt resource value: 0x7F040115
- public const int showDividers = 2130968853;
-
- // aapt resource value: 0x7F040116
- public const int showText = 2130968854;
-
- // aapt resource value: 0x7F040117
- public const int showTitle = 2130968855;
-
- // aapt resource value: 0x7F040118
- public const int singleChoiceItemLayout = 2130968856;
-
- // aapt resource value: 0x7F040119
- public const int spanCount = 2130968857;
-
- // aapt resource value: 0x7F04011A
- public const int spinBars = 2130968858;
-
- // aapt resource value: 0x7F04011B
- public const int spinnerDropDownItemStyle = 2130968859;
-
- // aapt resource value: 0x7F04011C
- public const int spinnerStyle = 2130968860;
-
- // aapt resource value: 0x7F04011D
- public const int splitTrack = 2130968861;
-
- // aapt resource value: 0x7F04011E
- public const int srcCompat = 2130968862;
-
- // aapt resource value: 0x7F04011F
- public const int srlAccentColor = 2130968863;
-
- // aapt resource value: 0x7F040120
- public const int srlAnimatingColor = 2130968864;
-
- // aapt resource value: 0x7F040121
- public const int srlClassicsSpinnerStyle = 2130968865;
-
- // aapt resource value: 0x7F040122
- public const int srlDisableContentWhenLoading = 2130968866;
-
- // aapt resource value: 0x7F040123
- public const int srlDisableContentWhenRefresh = 2130968867;
-
- // aapt resource value: 0x7F040124
- public const int srlDragRate = 2130968868;
-
- // aapt resource value: 0x7F040125
- public const int srlDrawableArrow = 2130968869;
-
- // aapt resource value: 0x7F040126
- public const int srlDrawableArrowSize = 2130968870;
-
- // aapt resource value: 0x7F040127
- public const int srlDrawableMarginRight = 2130968871;
-
- // aapt resource value: 0x7F040128
- public const int srlDrawableProgress = 2130968872;
-
- // aapt resource value: 0x7F040129
- public const int srlDrawableProgressSize = 2130968873;
-
- // aapt resource value: 0x7F04012A
- public const int srlDrawableSize = 2130968874;
-
- // aapt resource value: 0x7F04012B
- public const int srlEnableAutoLoadMore = 2130968875;
-
- // aapt resource value: 0x7F04012C
- public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
-
- // aapt resource value: 0x7F04012D
- public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
-
- // aapt resource value: 0x7F04012E
- public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
-
- // aapt resource value: 0x7F04012F
- public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
-
- // aapt resource value: 0x7F040130
- public const int srlEnableFooterTranslationContent = 2130968880;
-
- // aapt resource value: 0x7F040131
- public const int srlEnableHeaderTranslationContent = 2130968881;
-
- // aapt resource value: 0x7F040132
- public const int srlEnableHorizontalDrag = 2130968882;
-
- // aapt resource value: 0x7F040133
- public const int srlEnableLastTime = 2130968883;
-
- // aapt resource value: 0x7F040134
- public const int srlEnableLoadMore = 2130968884;
-
- // aapt resource value: 0x7F040135
- public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
-
- // aapt resource value: 0x7F040136
- public const int srlEnableNestedScrolling = 2130968886;
-
- // aapt resource value: 0x7F040137
- public const int srlEnableOverScrollBounce = 2130968887;
-
- // aapt resource value: 0x7F040138
- public const int srlEnableOverScrollDrag = 2130968888;
-
- // aapt resource value: 0x7F040139
- public const int srlEnablePreviewInEditMode = 2130968889;
-
- // aapt resource value: 0x7F04013A
- public const int srlEnablePullToCloseTwoLevel = 2130968890;
-
- // aapt resource value: 0x7F04013B
- public const int srlEnablePureScrollMode = 2130968891;
-
- // aapt resource value: 0x7F04013C
- public const int srlEnableRefresh = 2130968892;
-
- // aapt resource value: 0x7F04013D
- public const int srlEnableScrollContentWhenLoaded = 2130968893;
-
- // aapt resource value: 0x7F04013E
- public const int srlEnableScrollContentWhenRefreshed = 2130968894;
-
- // aapt resource value: 0x7F04013F
- public const int srlEnableTwoLevel = 2130968895;
-
- // aapt resource value: 0x7F040140
- public const int srlFinishDuration = 2130968896;
-
- // aapt resource value: 0x7F040141
- public const int srlFixedFooterViewId = 2130968897;
-
- // aapt resource value: 0x7F040142
- public const int srlFixedHeaderViewId = 2130968898;
-
- // aapt resource value: 0x7F040143
- public const int srlFloorDuration = 2130968899;
-
- // aapt resource value: 0x7F040144
- public const int srlFloorRage = 2130968900;
-
- // aapt resource value: 0x7F040145
- public const int srlFooterHeight = 2130968901;
-
- // aapt resource value: 0x7F040146
- public const int srlFooterInsetStart = 2130968902;
-
- // aapt resource value: 0x7F040147
- public const int srlFooterMaxDragRate = 2130968903;
-
- // aapt resource value: 0x7F040148
- public const int srlFooterTranslationViewId = 2130968904;
-
- // aapt resource value: 0x7F040149
- public const int srlFooterTriggerRate = 2130968905;
-
- // aapt resource value: 0x7F04014A
- public const int srlHeaderHeight = 2130968906;
-
- // aapt resource value: 0x7F04014B
- public const int srlHeaderInsetStart = 2130968907;
-
- // aapt resource value: 0x7F04014C
- public const int srlHeaderMaxDragRate = 2130968908;
-
- // aapt resource value: 0x7F04014D
- public const int srlHeaderTranslationViewId = 2130968909;
-
- // aapt resource value: 0x7F04014E
- public const int srlHeaderTriggerRate = 2130968910;
-
- // aapt resource value: 0x7F04014F
- public const int srlMaxRage = 2130968911;
-
- // aapt resource value: 0x7F040150
- public const int srlNormalColor = 2130968912;
-
- // aapt resource value: 0x7F040151
- public const int srlPrimaryColor = 2130968913;
-
- // aapt resource value: 0x7F040152
- public const int srlReboundDuration = 2130968914;
-
- // aapt resource value: 0x7F040153
- public const int srlRefreshRage = 2130968915;
-
- // aapt resource value: 0x7F040154
- public const int srlTextFailed = 2130968916;
-
- // aapt resource value: 0x7F040155
- public const int srlTextFinish = 2130968917;
-
- // aapt resource value: 0x7F040156
- public const int srlTextLoading = 2130968918;
-
- // aapt resource value: 0x7F040157
- public const int srlTextNothing = 2130968919;
-
- // aapt resource value: 0x7F040158
- public const int srlTextPulling = 2130968920;
-
- // aapt resource value: 0x7F040159
- public const int srlTextRefreshing = 2130968921;
-
- // aapt resource value: 0x7F04015A
- public const int srlTextRelease = 2130968922;
-
- // aapt resource value: 0x7F04015B
- public const int srlTextSecondary = 2130968923;
-
- // aapt resource value: 0x7F04015C
- public const int srlTextSizeTime = 2130968924;
-
- // aapt resource value: 0x7F04015D
- public const int srlTextSizeTitle = 2130968925;
-
- // aapt resource value: 0x7F04015E
- public const int srlTextTimeMarginTop = 2130968926;
-
- // aapt resource value: 0x7F04015F
- public const int srlTextUpdate = 2130968927;
-
- // aapt resource value: 0x7F040160
- public const int stackFromEnd = 2130968928;
-
- // aapt resource value: 0x7F040161
- public const int state_above_anchor = 2130968929;
-
- // aapt resource value: 0x7F040162
- public const int state_collapsed = 2130968930;
-
- // aapt resource value: 0x7F040163
- public const int state_collapsible = 2130968931;
-
- // aapt resource value: 0x7F040164
- public const int statusBarBackground = 2130968932;
-
- // aapt resource value: 0x7F040165
- public const int statusBarScrim = 2130968933;
-
- // aapt resource value: 0x7F040166
- public const int subMenuArrow = 2130968934;
-
- // aapt resource value: 0x7F040167
- public const int submitBackground = 2130968935;
-
- // aapt resource value: 0x7F040168
- public const int subtitle = 2130968936;
-
- // aapt resource value: 0x7F040169
- public const int subtitleTextAppearance = 2130968937;
-
- // aapt resource value: 0x7F04016A
- public const int subtitleTextColor = 2130968938;
-
- // aapt resource value: 0x7F04016B
- public const int subtitleTextStyle = 2130968939;
-
- // aapt resource value: 0x7F04016C
- public const int suggestionRowLayout = 2130968940;
-
- // aapt resource value: 0x7F04016D
- public const int switchMinWidth = 2130968941;
-
- // aapt resource value: 0x7F04016E
- public const int switchPadding = 2130968942;
-
- // aapt resource value: 0x7F04016F
- public const int switchStyle = 2130968943;
-
- // aapt resource value: 0x7F040170
- public const int switchTextAppearance = 2130968944;
-
- // aapt resource value: 0x7F040171
- public const int tabBackground = 2130968945;
-
- // aapt resource value: 0x7F040172
- public const int tabContentStart = 2130968946;
-
- // aapt resource value: 0x7F040173
- public const int tabGravity = 2130968947;
-
- // aapt resource value: 0x7F040174
- public const int tabIndicatorColor = 2130968948;
-
- // aapt resource value: 0x7F040175
- public const int tabIndicatorHeight = 2130968949;
-
- // aapt resource value: 0x7F040176
- public const int tabMaxWidth = 2130968950;
-
- // aapt resource value: 0x7F040177
- public const int tabMinWidth = 2130968951;
-
- // aapt resource value: 0x7F040178
- public const int tabMode = 2130968952;
-
- // aapt resource value: 0x7F040179
- public const int tabPadding = 2130968953;
-
- // aapt resource value: 0x7F04017A
- public const int tabPaddingBottom = 2130968954;
-
- // aapt resource value: 0x7F04017B
- public const int tabPaddingEnd = 2130968955;
-
- // aapt resource value: 0x7F04017C
- public const int tabPaddingStart = 2130968956;
-
- // aapt resource value: 0x7F04017D
- public const int tabPaddingTop = 2130968957;
-
- // aapt resource value: 0x7F04017E
- public const int tabSelectedTextColor = 2130968958;
-
- // aapt resource value: 0x7F04017F
- public const int tabTextAppearance = 2130968959;
-
- // aapt resource value: 0x7F040180
- public const int tabTextColor = 2130968960;
-
- // aapt resource value: 0x7F040181
- public const int textAllCaps = 2130968961;
-
- // aapt resource value: 0x7F040182
- public const int textAppearanceLargePopupMenu = 2130968962;
-
- // aapt resource value: 0x7F040183
- public const int textAppearanceListItem = 2130968963;
-
- // aapt resource value: 0x7F040184
- public const int textAppearanceListItemSecondary = 2130968964;
-
- // aapt resource value: 0x7F040185
- public const int textAppearanceListItemSmall = 2130968965;
-
- // aapt resource value: 0x7F040186
- public const int textAppearancePopupMenuHeader = 2130968966;
-
- // aapt resource value: 0x7F040187
- public const int textAppearanceSearchResultSubtitle = 2130968967;
-
- // aapt resource value: 0x7F040188
- public const int textAppearanceSearchResultTitle = 2130968968;
-
- // aapt resource value: 0x7F040189
- public const int textAppearanceSmallPopupMenu = 2130968969;
-
- // aapt resource value: 0x7F04018A
- public const int textColorAlertDialogListItem = 2130968970;
-
- // aapt resource value: 0x7F04018B
- public const int textColorError = 2130968971;
-
- // aapt resource value: 0x7F04018C
- public const int textColorSearchUrl = 2130968972;
-
- // aapt resource value: 0x7F04018D
- public const int theme = 2130968973;
-
- // aapt resource value: 0x7F04018E
- public const int thickness = 2130968974;
-
- // aapt resource value: 0x7F04018F
- public const int thumbTextPadding = 2130968975;
-
- // aapt resource value: 0x7F040190
- public const int thumbTint = 2130968976;
-
- // aapt resource value: 0x7F040191
- public const int thumbTintMode = 2130968977;
-
- // aapt resource value: 0x7F040192
- public const int tickMark = 2130968978;
-
- // aapt resource value: 0x7F040193
- public const int tickMarkTint = 2130968979;
-
- // aapt resource value: 0x7F040194
- public const int tickMarkTintMode = 2130968980;
-
- // aapt resource value: 0x7F040195
- public const int tint = 2130968981;
-
- // aapt resource value: 0x7F040196
- public const int tintMode = 2130968982;
-
- // aapt resource value: 0x7F040197
- public const int title = 2130968983;
-
- // aapt resource value: 0x7F040198
- public const int titleEnabled = 2130968984;
-
- // aapt resource value: 0x7F040199
- public const int titleMargin = 2130968985;
-
- // aapt resource value: 0x7F04019A
- public const int titleMarginBottom = 2130968986;
-
- // aapt resource value: 0x7F04019B
- public const int titleMarginEnd = 2130968987;
-
- // aapt resource value: 0x7F04019E
- public const int titleMargins = 2130968990;
-
- // aapt resource value: 0x7F04019C
- public const int titleMarginStart = 2130968988;
-
- // aapt resource value: 0x7F04019D
- public const int titleMarginTop = 2130968989;
-
- // aapt resource value: 0x7F04019F
- public const int titleTextAppearance = 2130968991;
-
- // aapt resource value: 0x7F0401A0
- public const int titleTextColor = 2130968992;
-
- // aapt resource value: 0x7F0401A1
- public const int titleTextStyle = 2130968993;
-
- // aapt resource value: 0x7F0401A2
- public const int toolbarId = 2130968994;
-
- // aapt resource value: 0x7F0401A3
- public const int toolbarNavigationButtonStyle = 2130968995;
-
- // aapt resource value: 0x7F0401A4
- public const int toolbarStyle = 2130968996;
-
- // aapt resource value: 0x7F0401A5
- public const int tooltipForegroundColor = 2130968997;
-
- // aapt resource value: 0x7F0401A6
- public const int tooltipFrameBackground = 2130968998;
-
- // aapt resource value: 0x7F0401A7
- public const int tooltipText = 2130968999;
-
- // aapt resource value: 0x7F0401A8
- public const int track = 2130969000;
-
- // aapt resource value: 0x7F0401A9
- public const int trackTint = 2130969001;
-
- // aapt resource value: 0x7F0401AA
- public const int trackTintMode = 2130969002;
-
- // aapt resource value: 0x7F0401AB
- public const int useCompatPadding = 2130969003;
-
- // aapt resource value: 0x7F0401AC
- public const int voiceIcon = 2130969004;
-
- // aapt resource value: 0x7F0401AD
- public const int wave_bg_color = 2130969005;
-
- // aapt resource value: 0x7F0401AE
- public const int wave_border_color = 2130969006;
-
- // aapt resource value: 0x7F0401AF
- public const int wave_color = 2130969007;
-
- // aapt resource value: 0x7F0401B0
- public const int wave_height = 2130969008;
-
- // aapt resource value: 0x7F0401B1
- public const int wave_width = 2130969009;
-
- // aapt resource value: 0x7F0401B2
- public const int wheelview_dividerColor = 2130969010;
-
- // aapt resource value: 0x7F0401B3
- public const int wheelview_gravity = 2130969011;
-
- // aapt resource value: 0x7F0401B4
- public const int wheelview_lineSpacingMultiplier = 2130969012;
-
- // aapt resource value: 0x7F0401B5
- public const int wheelview_textColorCenter = 2130969013;
-
- // aapt resource value: 0x7F0401B6
- public const int wheelview_textColorOut = 2130969014;
-
- // aapt resource value: 0x7F0401B7
- public const int wheelview_textSize = 2130969015;
-
- // aapt resource value: 0x7F0401B8
- public const int windowActionBar = 2130969016;
-
- // aapt resource value: 0x7F0401B9
- public const int windowActionBarOverlay = 2130969017;
-
- // aapt resource value: 0x7F0401BA
- public const int windowActionModeOverlay = 2130969018;
-
- // aapt resource value: 0x7F0401BB
- public const int windowFixedHeightMajor = 2130969019;
-
- // aapt resource value: 0x7F0401BC
- public const int windowFixedHeightMinor = 2130969020;
-
- // aapt resource value: 0x7F0401BD
- public const int windowFixedWidthMajor = 2130969021;
-
- // aapt resource value: 0x7F0401BE
- public const int windowFixedWidthMinor = 2130969022;
-
- // aapt resource value: 0x7F0401BF
- public const int windowMinWidthMajor = 2130969023;
-
- // aapt resource value: 0x7F0401C0
- public const int windowMinWidthMinor = 2130969024;
-
- // aapt resource value: 0x7F0401C1
- public const int windowNoTitle = 2130969025;
-
+
+ // aapt resource value: 0x7f010052
+ public const int actionBarDivider = 2130772050;
+
+ // aapt resource value: 0x7f010053
+ public const int actionBarItemBackground = 2130772051;
+
+ // aapt resource value: 0x7f01004c
+ public const int actionBarPopupTheme = 2130772044;
+
+ // aapt resource value: 0x7f010051
+ public const int actionBarSize = 2130772049;
+
+ // aapt resource value: 0x7f01004e
+ public const int actionBarSplitStyle = 2130772046;
+
+ // aapt resource value: 0x7f01004d
+ public const int actionBarStyle = 2130772045;
+
+ // aapt resource value: 0x7f010048
+ public const int actionBarTabBarStyle = 2130772040;
+
+ // aapt resource value: 0x7f010047
+ public const int actionBarTabStyle = 2130772039;
+
+ // aapt resource value: 0x7f010049
+ public const int actionBarTabTextStyle = 2130772041;
+
+ // aapt resource value: 0x7f01004f
+ public const int actionBarTheme = 2130772047;
+
+ // aapt resource value: 0x7f010050
+ public const int actionBarWidgetTheme = 2130772048;
+
+ // aapt resource value: 0x7f01006d
+ public const int actionButtonStyle = 2130772077;
+
+ // aapt resource value: 0x7f010069
+ public const int actionDropDownStyle = 2130772073;
+
+ // aapt resource value: 0x7f0100c4
+ public const int actionLayout = 2130772164;
+
+ // aapt resource value: 0x7f010054
+ public const int actionMenuTextAppearance = 2130772052;
+
+ // aapt resource value: 0x7f010055
+ public const int actionMenuTextColor = 2130772053;
+
+ // aapt resource value: 0x7f010058
+ public const int actionModeBackground = 2130772056;
+
+ // aapt resource value: 0x7f010057
+ public const int actionModeCloseButtonStyle = 2130772055;
+
+ // aapt resource value: 0x7f01005a
+ public const int actionModeCloseDrawable = 2130772058;
+
+ // aapt resource value: 0x7f01005c
+ public const int actionModeCopyDrawable = 2130772060;
+
+ // aapt resource value: 0x7f01005b
+ public const int actionModeCutDrawable = 2130772059;
+
+ // aapt resource value: 0x7f010060
+ public const int actionModeFindDrawable = 2130772064;
+
+ // aapt resource value: 0x7f01005d
+ public const int actionModePasteDrawable = 2130772061;
+
+ // aapt resource value: 0x7f010062
+ public const int actionModePopupWindowStyle = 2130772066;
+
+ // aapt resource value: 0x7f01005e
+ public const int actionModeSelectAllDrawable = 2130772062;
+
+ // aapt resource value: 0x7f01005f
+ public const int actionModeShareDrawable = 2130772063;
+
+ // aapt resource value: 0x7f010059
+ public const int actionModeSplitBackground = 2130772057;
+
+ // aapt resource value: 0x7f010056
+ public const int actionModeStyle = 2130772054;
+
+ // aapt resource value: 0x7f010061
+ public const int actionModeWebSearchDrawable = 2130772065;
+
+ // aapt resource value: 0x7f01004a
+ public const int actionOverflowButtonStyle = 2130772042;
+
+ // aapt resource value: 0x7f01004b
+ public const int actionOverflowMenuStyle = 2130772043;
+
+ // aapt resource value: 0x7f0100c6
+ public const int actionProviderClass = 2130772166;
+
+ // aapt resource value: 0x7f0100c5
+ public const int actionViewClass = 2130772165;
+
+ // aapt resource value: 0x7f010075
+ public const int activityChooserViewStyle = 2130772085;
+
+ // aapt resource value: 0x7f01009a
+ public const int alertDialogButtonGroupStyle = 2130772122;
+
+ // aapt resource value: 0x7f01009b
+ public const int alertDialogCenterButtons = 2130772123;
+
+ // aapt resource value: 0x7f010099
+ public const int alertDialogStyle = 2130772121;
+
+ // aapt resource value: 0x7f01009c
+ public const int alertDialogTheme = 2130772124;
+
+ // aapt resource value: 0x7f0100b2
+ public const int allowStacking = 2130772146;
+
+ // aapt resource value: 0x7f0100b3
+ public const int alpha = 2130772147;
+
+ // aapt resource value: 0x7f0100c1
+ public const int alphabeticModifiers = 2130772161;
+
+ // aapt resource value: 0x7f0101a3
+ public const int arc_border_color = 2130772387;
+
+ // aapt resource value: 0x7f0101a2
+ public const int arc_border_width = 2130772386;
+
+ // aapt resource value: 0x7f0101a1
+ public const int arc_colors = 2130772385;
+
+ // aapt resource value: 0x7f0101a4
+ public const int arc_max = 2130772388;
+
+ // aapt resource value: 0x7f0101a5
+ public const int arc_min = 2130772389;
+
+ // aapt resource value: 0x7f01019f
+ public const int arc_open_angle = 2130772383;
+
+ // aapt resource value: 0x7f0101a6
+ public const int arc_progress = 2130772390;
+
+ // aapt resource value: 0x7f0101ae
+ public const int arc_progress_bar_color = 2130772398;
+
+ // aapt resource value: 0x7f0101af
+ public const int arc_progress_bar_text_unit = 2130772399;
+
+ // aapt resource value: 0x7f0101a0
+ public const int arc_rotate_angle = 2130772384;
+
+ // aapt resource value: 0x7f0101ad
+ public const int arc_shadow_radius = 2130772397;
+
+ // aapt resource value: 0x7f0101a8
+ public const int arc_thumb_color = 2130772392;
+
+ // aapt resource value: 0x7f0101a9
+ public const int arc_thumb_radius = 2130772393;
+
+ // aapt resource value: 0x7f0101ab
+ public const int arc_thumb_shadow_color = 2130772395;
+
+ // aapt resource value: 0x7f0101aa
+ public const int arc_thumb_shadow_radius = 2130772394;
+
+ // aapt resource value: 0x7f0101a7
+ public const int arc_thumb_width = 2130772391;
+
+ // aapt resource value: 0x7f01019e
+ public const int arc_width = 2130772382;
+
+ // aapt resource value: 0x7f0100ba
+ public const int arrowHeadLength = 2130772154;
+
+ // aapt resource value: 0x7f0100bb
+ public const int arrowShaftLength = 2130772155;
+
+ // aapt resource value: 0x7f0100a1
+ public const int autoCompleteTextViewStyle = 2130772129;
+
+ // aapt resource value: 0x7f01003b
+ public const int autoSizeMaxTextSize = 2130772027;
+
+ // aapt resource value: 0x7f01003a
+ public const int autoSizeMinTextSize = 2130772026;
+
+ // aapt resource value: 0x7f010039
+ public const int autoSizePresetSizes = 2130772025;
+
+ // aapt resource value: 0x7f010038
+ public const int autoSizeStepGranularity = 2130772024;
+
+ // aapt resource value: 0x7f010037
+ public const int autoSizeTextType = 2130772023;
+
+ // aapt resource value: 0x7f010015
+ public const int background = 2130771989;
+
+ // aapt resource value: 0x7f010017
+ public const int backgroundSplit = 2130771991;
+
+ // aapt resource value: 0x7f010016
+ public const int backgroundStacked = 2130771990;
+
+ // aapt resource value: 0x7f0100fd
+ public const int backgroundTint = 2130772221;
+
+ // aapt resource value: 0x7f0100fe
+ public const int backgroundTintMode = 2130772222;
+
+ // aapt resource value: 0x7f0100bc
+ public const int barLength = 2130772156;
+
+ // aapt resource value: 0x7f010128
+ public const int behavior_autoHide = 2130772264;
+
+ // aapt resource value: 0x7f010105
+ public const int behavior_hideable = 2130772229;
+
+ // aapt resource value: 0x7f010131
+ public const int behavior_overlapTop = 2130772273;
+
+ // aapt resource value: 0x7f010104
+ public const int behavior_peekHeight = 2130772228;
+
+ // aapt resource value: 0x7f010106
+ public const int behavior_skipCollapsed = 2130772230;
+
+ // aapt resource value: 0x7f01015a
+ public const int biometricPromptDialogTheme = 2130772314;
+
+ // aapt resource value: 0x7f010126
+ public const int borderWidth = 2130772262;
+
+ // aapt resource value: 0x7f010072
+ public const int borderlessButtonStyle = 2130772082;
+
+ // aapt resource value: 0x7f010120
+ public const int bottomSheetDialogTheme = 2130772256;
+
+ // aapt resource value: 0x7f010121
+ public const int bottomSheetStyle = 2130772257;
+
+ // aapt resource value: 0x7f01006f
+ public const int buttonBarButtonStyle = 2130772079;
+
+ // aapt resource value: 0x7f01009f
+ public const int buttonBarNegativeButtonStyle = 2130772127;
+
+ // aapt resource value: 0x7f0100a0
+ public const int buttonBarNeutralButtonStyle = 2130772128;
+
+ // aapt resource value: 0x7f01009e
+ public const int buttonBarPositiveButtonStyle = 2130772126;
+
+ // aapt resource value: 0x7f01006e
+ public const int buttonBarStyle = 2130772078;
+
+ // aapt resource value: 0x7f0100f2
+ public const int buttonGravity = 2130772210;
+
+ // aapt resource value: 0x7f01002a
+ public const int buttonPanelSideLayout = 2130772010;
+
+ // aapt resource value: 0x7f0100a2
+ public const int buttonStyle = 2130772130;
+
+ // aapt resource value: 0x7f0100a3
+ public const int buttonStyleSmall = 2130772131;
+
+ // aapt resource value: 0x7f0100b4
+ public const int buttonTint = 2130772148;
+
+ // aapt resource value: 0x7f0100b5
+ public const int buttonTintMode = 2130772149;
+
+ // aapt resource value: 0x7f0100a4
+ public const int checkboxStyle = 2130772132;
+
+ // aapt resource value: 0x7f0100a5
+ public const int checkedTextViewStyle = 2130772133;
+
+ // aapt resource value: 0x7f0100d5
+ public const int closeIcon = 2130772181;
+
+ // aapt resource value: 0x7f010027
+ public const int closeItemLayout = 2130772007;
+
+ // aapt resource value: 0x7f0100f4
+ public const int collapseContentDescription = 2130772212;
+
+ // aapt resource value: 0x7f0100f3
+ public const int collapseIcon = 2130772211;
+
+ // aapt resource value: 0x7f010113
+ public const int collapsedTitleGravity = 2130772243;
+
+ // aapt resource value: 0x7f01010d
+ public const int collapsedTitleTextAppearance = 2130772237;
+
+ // aapt resource value: 0x7f0100b6
+ public const int color = 2130772150;
+
+ // aapt resource value: 0x7f010091
+ public const int colorAccent = 2130772113;
+
+ // aapt resource value: 0x7f010098
+ public const int colorBackgroundFloating = 2130772120;
+
+ // aapt resource value: 0x7f010095
+ public const int colorButtonNormal = 2130772117;
+
+ // aapt resource value: 0x7f010093
+ public const int colorControlActivated = 2130772115;
+
+ // aapt resource value: 0x7f010094
+ public const int colorControlHighlight = 2130772116;
+
+ // aapt resource value: 0x7f010092
+ public const int colorControlNormal = 2130772114;
+
+ // aapt resource value: 0x7f0100b1
+ public const int colorError = 2130772145;
+
+ // aapt resource value: 0x7f01008f
+ public const int colorPrimary = 2130772111;
+
+ // aapt resource value: 0x7f010090
+ public const int colorPrimaryDark = 2130772112;
+
+ // aapt resource value: 0x7f010096
+ public const int colorSwitchThumbNormal = 2130772118;
+
+ // aapt resource value: 0x7f0100da
+ public const int commitIcon = 2130772186;
+
+ // aapt resource value: 0x7f0100c7
+ public const int contentDescription = 2130772167;
+
+ // aapt resource value: 0x7f010020
+ public const int contentInsetEnd = 2130772000;
+
+ // aapt resource value: 0x7f010024
+ public const int contentInsetEndWithActions = 2130772004;
+
+ // aapt resource value: 0x7f010021
+ public const int contentInsetLeft = 2130772001;
+
+ // aapt resource value: 0x7f010022
+ public const int contentInsetRight = 2130772002;
+
+ // aapt resource value: 0x7f01001f
+ public const int contentInsetStart = 2130771999;
+
+ // aapt resource value: 0x7f010023
+ public const int contentInsetStartWithNavigation = 2130772003;
+
+ // aapt resource value: 0x7f01010e
+ public const int contentScrim = 2130772238;
+
+ // aapt resource value: 0x7f010097
+ public const int controlBackground = 2130772119;
+
+ // aapt resource value: 0x7f010147
+ public const int counterEnabled = 2130772295;
+
+ // aapt resource value: 0x7f010148
+ public const int counterMaxLength = 2130772296;
+
+ // aapt resource value: 0x7f01014a
+ public const int counterOverflowTextAppearance = 2130772298;
+
+ // aapt resource value: 0x7f010149
+ public const int counterTextAppearance = 2130772297;
+
+ // aapt resource value: 0x7f0101b2
+ public const int curtain_bar_bg_color = 2130772402;
+
+ // aapt resource value: 0x7f0101b3
+ public const int curtain_bar_border_color = 2130772403;
+
+ // aapt resource value: 0x7f0101b0
+ public const int curtain_bar_color = 2130772400;
+
+ // aapt resource value: 0x7f0101b5
+ public const int curtain_bar_height = 2130772405;
+
+ // aapt resource value: 0x7f0101b4
+ public const int curtain_bar_width = 2130772404;
+
+ // aapt resource value: 0x7f010018
+ public const int customNavigationLayout = 2130771992;
+
+ // aapt resource value: 0x7f0100d4
+ public const int defaultQueryHint = 2130772180;
+
+ // aapt resource value: 0x7f010067
+ public const int dialogPreferredPadding = 2130772071;
+
+ // aapt resource value: 0x7f010066
+ public const int dialogTheme = 2130772070;
+
+ // aapt resource value: 0x7f01000e
+ public const int displayOptions = 2130771982;
+
+ // aapt resource value: 0x7f010014
+ public const int divider = 2130771988;
+
+ // aapt resource value: 0x7f010074
+ public const int dividerHorizontal = 2130772084;
+
+ // aapt resource value: 0x7f0100c0
+ public const int dividerPadding = 2130772160;
+
+ // aapt resource value: 0x7f010073
+ public const int dividerVertical = 2130772083;
+
+ // aapt resource value: 0x7f0100b8
+ public const int drawableSize = 2130772152;
+
+ // aapt resource value: 0x7f010009
+ public const int drawerArrowStyle = 2130771977;
+
+ // aapt resource value: 0x7f010086
+ public const int dropDownListViewStyle = 2130772102;
+
+ // aapt resource value: 0x7f01006a
+ public const int dropdownListPreferredItemHeight = 2130772074;
+
+ // aapt resource value: 0x7f01007b
+ public const int editTextBackground = 2130772091;
+
+ // aapt resource value: 0x7f01007a
+ public const int editTextColor = 2130772090;
+
+ // aapt resource value: 0x7f0100a6
+ public const int editTextStyle = 2130772134;
+
+ // aapt resource value: 0x7f010025
+ public const int elevation = 2130772005;
+
+ // aapt resource value: 0x7f010145
+ public const int errorEnabled = 2130772293;
+
+ // aapt resource value: 0x7f010146
+ public const int errorTextAppearance = 2130772294;
+
+ // aapt resource value: 0x7f010029
+ public const int expandActivityOverflowButtonDrawable = 2130772009;
+
+ // aapt resource value: 0x7f0100ff
+ public const int expanded = 2130772223;
+
+ // aapt resource value: 0x7f010114
+ public const int expandedTitleGravity = 2130772244;
+
+ // aapt resource value: 0x7f010107
+ public const int expandedTitleMargin = 2130772231;
+
+ // aapt resource value: 0x7f01010b
+ public const int expandedTitleMarginBottom = 2130772235;
+
+ // aapt resource value: 0x7f01010a
+ public const int expandedTitleMarginEnd = 2130772234;
+
+ // aapt resource value: 0x7f010108
+ public const int expandedTitleMarginStart = 2130772232;
+
+ // aapt resource value: 0x7f010109
+ public const int expandedTitleMarginTop = 2130772233;
+
+ // aapt resource value: 0x7f01010c
+ public const int expandedTitleTextAppearance = 2130772236;
+
+ // aapt resource value: 0x7f010124
+ public const int fabSize = 2130772260;
+
+ // aapt resource value: 0x7f010004
+ public const int fastScrollEnabled = 2130771972;
+
+ // aapt resource value: 0x7f010007
+ public const int fastScrollHorizontalThumbDrawable = 2130771975;
+
+ // aapt resource value: 0x7f010008
+ public const int fastScrollHorizontalTrackDrawable = 2130771976;
+
+ // aapt resource value: 0x7f010005
+ public const int fastScrollVerticalThumbDrawable = 2130771973;
+
+ // aapt resource value: 0x7f010006
+ public const int fastScrollVerticalTrackDrawable = 2130771974;
+
+ // aapt resource value: 0x7f010158
+ public const int font = 2130772312;
+
+ // aapt resource value: 0x7f01003c
+ public const int fontFamily = 2130772028;
+
+ // aapt resource value: 0x7f010151
+ public const int fontProviderAuthority = 2130772305;
+
+ // aapt resource value: 0x7f010154
+ public const int fontProviderCerts = 2130772308;
+
+ // aapt resource value: 0x7f010155
+ public const int fontProviderFetchStrategy = 2130772309;
+
+ // aapt resource value: 0x7f010156
+ public const int fontProviderFetchTimeout = 2130772310;
+
+ // aapt resource value: 0x7f010152
+ public const int fontProviderPackage = 2130772306;
+
+ // aapt resource value: 0x7f010153
+ public const int fontProviderQuery = 2130772307;
+
+ // aapt resource value: 0x7f010157
+ public const int fontStyle = 2130772311;
+
+ // aapt resource value: 0x7f010159
+ public const int fontWeight = 2130772313;
+
+ // aapt resource value: 0x7f010129
+ public const int foregroundInsidePadding = 2130772265;
+
+ // aapt resource value: 0x7f0100b9
+ public const int gapBetweenBars = 2130772153;
+
+ // aapt resource value: 0x7f0100d6
+ public const int goIcon = 2130772182;
+
+ // aapt resource value: 0x7f0101ac
+ public const int hdl_arc_thumb_mode = 2130772396;
+
+ // aapt resource value: 0x7f01012f
+ public const int headerLayout = 2130772271;
+
+ // aapt resource value: 0x7f01000a
+ public const int height = 2130771978;
+
+ // aapt resource value: 0x7f01001e
+ public const int hideOnContentScroll = 2130771998;
+
+ // aapt resource value: 0x7f01014b
+ public const int hintAnimationEnabled = 2130772299;
+
+ // aapt resource value: 0x7f010144
+ public const int hintEnabled = 2130772292;
+
+ // aapt resource value: 0x7f010143
+ public const int hintTextAppearance = 2130772291;
+
+ // aapt resource value: 0x7f01006c
+ public const int homeAsUpIndicator = 2130772076;
+
+ // aapt resource value: 0x7f010019
+ public const int homeLayout = 2130771993;
+
+ // aapt resource value: 0x7f010012
+ public const int icon = 2130771986;
+
+ // aapt resource value: 0x7f0100c9
+ public const int iconTint = 2130772169;
+
+ // aapt resource value: 0x7f0100ca
+ public const int iconTintMode = 2130772170;
+
+ // aapt resource value: 0x7f0100d2
+ public const int iconifiedByDefault = 2130772178;
+
+ // aapt resource value: 0x7f01007c
+ public const int imageButtonStyle = 2130772092;
+
+ // aapt resource value: 0x7f01001b
+ public const int indeterminateProgressStyle = 2130771995;
+
+ // aapt resource value: 0x7f010028
+ public const int initialActivityCount = 2130772008;
+
+ // aapt resource value: 0x7f010130
+ public const int insetForeground = 2130772272;
+
+ // aapt resource value: 0x7f01000b
+ public const int isLightTheme = 2130771979;
+
+ // aapt resource value: 0x7f01012d
+ public const int itemBackground = 2130772269;
+
+ // aapt resource value: 0x7f01012b
+ public const int itemIconTint = 2130772267;
+
+ // aapt resource value: 0x7f01001d
+ public const int itemPadding = 2130771997;
+
+ // aapt resource value: 0x7f01012e
+ public const int itemTextAppearance = 2130772270;
+
+ // aapt resource value: 0x7f01012c
+ public const int itemTextColor = 2130772268;
+
+ // aapt resource value: 0x7f010118
+ public const int keylines = 2130772248;
+
+ // aapt resource value: 0x7f0100d1
+ public const int layout = 2130772177;
+
+ // aapt resource value: 0x7f010000
+ public const int layoutManager = 2130771968;
+
+ // aapt resource value: 0x7f01011b
+ public const int layout_anchor = 2130772251;
+
+ // aapt resource value: 0x7f01011d
+ public const int layout_anchorGravity = 2130772253;
+
+ // aapt resource value: 0x7f01011a
+ public const int layout_behavior = 2130772250;
+
+ // aapt resource value: 0x7f010116
+ public const int layout_collapseMode = 2130772246;
+
+ // aapt resource value: 0x7f010117
+ public const int layout_collapseParallaxMultiplier = 2130772247;
+
+ // aapt resource value: 0x7f01011f
+ public const int layout_dodgeInsetEdges = 2130772255;
+
+ // aapt resource value: 0x7f01011e
+ public const int layout_insetEdge = 2130772254;
+
+ // aapt resource value: 0x7f01011c
+ public const int layout_keyline = 2130772252;
+
+ // aapt resource value: 0x7f010102
+ public const int layout_scrollFlags = 2130772226;
+
+ // aapt resource value: 0x7f010103
+ public const int layout_scrollInterpolator = 2130772227;
+
+ // aapt resource value: 0x7f010197
+ public const int layout_srlBackgroundColor = 2130772375;
+
+ // aapt resource value: 0x7f01015b
+ public const int layout_srlSpinnerStyle = 2130772315;
+
+ // aapt resource value: 0x7f01008e
+ public const int listChoiceBackgroundIndicator = 2130772110;
+
+ // aapt resource value: 0x7f010068
+ public const int listDividerAlertDialog = 2130772072;
+
+ // aapt resource value: 0x7f01002e
+ public const int listItemLayout = 2130772014;
+
+ // aapt resource value: 0x7f01002b
+ public const int listLayout = 2130772011;
+
+ // aapt resource value: 0x7f0100ae
+ public const int listMenuViewStyle = 2130772142;
+
+ // aapt resource value: 0x7f010087
+ public const int listPopupWindowStyle = 2130772103;
+
+ // aapt resource value: 0x7f010081
+ public const int listPreferredItemHeight = 2130772097;
+
+ // aapt resource value: 0x7f010083
+ public const int listPreferredItemHeightLarge = 2130772099;
+
+ // aapt resource value: 0x7f010082
+ public const int listPreferredItemHeightSmall = 2130772098;
+
+ // aapt resource value: 0x7f010084
+ public const int listPreferredItemPaddingLeft = 2130772100;
+
+ // aapt resource value: 0x7f010085
+ public const int listPreferredItemPaddingRight = 2130772101;
+
+ // aapt resource value: 0x7f010013
+ public const int logo = 2130771987;
+
+ // aapt resource value: 0x7f0100f7
+ public const int logoDescription = 2130772215;
+
+ // aapt resource value: 0x7f010132
+ public const int maxActionInlineWidth = 2130772274;
+
+ // aapt resource value: 0x7f0100f1
+ public const int maxButtonHeight = 2130772209;
+
+ // aapt resource value: 0x7f0100be
+ public const int measureWithLargestChild = 2130772158;
+
+ // aapt resource value: 0x7f01012a
+ public const int menu = 2130772266;
+
+ // aapt resource value: 0x7f01002c
+ public const int multiChoiceItemLayout = 2130772012;
+
+ // aapt resource value: 0x7f0100f6
+ public const int navigationContentDescription = 2130772214;
+
+ // aapt resource value: 0x7f0100f5
+ public const int navigationIcon = 2130772213;
+
+ // aapt resource value: 0x7f01000d
+ public const int navigationMode = 2130771981;
+
+ // aapt resource value: 0x7f0100c2
+ public const int numericModifiers = 2130772162;
+
+ // aapt resource value: 0x7f0100cd
+ public const int overlapAnchor = 2130772173;
+
+ // aapt resource value: 0x7f0100cf
+ public const int paddingBottomNoButtons = 2130772175;
+
+ // aapt resource value: 0x7f0100fb
+ public const int paddingEnd = 2130772219;
+
+ // aapt resource value: 0x7f0100fa
+ public const int paddingStart = 2130772218;
+
+ // aapt resource value: 0x7f0100d0
+ public const int paddingTopNoTitle = 2130772176;
+
+ // aapt resource value: 0x7f01008b
+ public const int panelBackground = 2130772107;
+
+ // aapt resource value: 0x7f01008d
+ public const int panelMenuListTheme = 2130772109;
+
+ // aapt resource value: 0x7f01008c
+ public const int panelMenuListWidth = 2130772108;
+
+ // aapt resource value: 0x7f01014e
+ public const int passwordToggleContentDescription = 2130772302;
+
+ // aapt resource value: 0x7f01014d
+ public const int passwordToggleDrawable = 2130772301;
+
+ // aapt resource value: 0x7f01014c
+ public const int passwordToggleEnabled = 2130772300;
+
+ // aapt resource value: 0x7f01014f
+ public const int passwordToggleTint = 2130772303;
+
+ // aapt resource value: 0x7f010150
+ public const int passwordToggleTintMode = 2130772304;
+
+ // aapt resource value: 0x7f010078
+ public const int popupMenuStyle = 2130772088;
+
+ // aapt resource value: 0x7f010026
+ public const int popupTheme = 2130772006;
+
+ // aapt resource value: 0x7f010079
+ public const int popupWindowStyle = 2130772089;
+
+ // aapt resource value: 0x7f0100cb
+ public const int preserveIconSpacing = 2130772171;
+
+ // aapt resource value: 0x7f010125
+ public const int pressedTranslationZ = 2130772261;
+
+ // aapt resource value: 0x7f01001c
+ public const int progressBarPadding = 2130771996;
+
+ // aapt resource value: 0x7f01001a
+ public const int progressBarStyle = 2130771994;
+
+ // aapt resource value: 0x7f0100dc
+ public const int queryBackground = 2130772188;
+
+ // aapt resource value: 0x7f0100d3
+ public const int queryHint = 2130772179;
+
+ // aapt resource value: 0x7f0100a7
+ public const int radioButtonStyle = 2130772135;
+
+ // aapt resource value: 0x7f0100a8
+ public const int ratingBarStyle = 2130772136;
+
+ // aapt resource value: 0x7f0100a9
+ public const int ratingBarStyleIndicator = 2130772137;
+
+ // aapt resource value: 0x7f0100aa
+ public const int ratingBarStyleSmall = 2130772138;
+
+ // aapt resource value: 0x7f010002
+ public const int reverseLayout = 2130771970;
+
+ // aapt resource value: 0x7f010123
+ public const int rippleColor = 2130772259;
+
+ // aapt resource value: 0x7f010112
+ public const int scrimAnimationDuration = 2130772242;
+
+ // aapt resource value: 0x7f010111
+ public const int scrimVisibleHeightTrigger = 2130772241;
+
+ // aapt resource value: 0x7f0100d8
+ public const int searchHintIcon = 2130772184;
+
+ // aapt resource value: 0x7f0100d7
+ public const int searchIcon = 2130772183;
+
+ // aapt resource value: 0x7f010080
+ public const int searchViewStyle = 2130772096;
+
+ // aapt resource value: 0x7f0101b1
+ public const int second_curtain_bar_color = 2130772401;
+
+ // aapt resource value: 0x7f0101b7
+ public const int second_wave_color = 2130772407;
+
+ // aapt resource value: 0x7f0100ab
+ public const int seekBarStyle = 2130772139;
+
+ // aapt resource value: 0x7f010070
+ public const int selectableItemBackground = 2130772080;
+
+ // aapt resource value: 0x7f010071
+ public const int selectableItemBackgroundBorderless = 2130772081;
+
+ // aapt resource value: 0x7f0100c3
+ public const int showAsAction = 2130772163;
+
+ // aapt resource value: 0x7f0100bf
+ public const int showDividers = 2130772159;
+
+ // aapt resource value: 0x7f0100e8
+ public const int showText = 2130772200;
+
+ // aapt resource value: 0x7f01002f
+ public const int showTitle = 2130772015;
+
+ // aapt resource value: 0x7f01002d
+ public const int singleChoiceItemLayout = 2130772013;
+
+ // aapt resource value: 0x7f010001
+ public const int spanCount = 2130771969;
+
+ // aapt resource value: 0x7f0100b7
+ public const int spinBars = 2130772151;
+
+ // aapt resource value: 0x7f01006b
+ public const int spinnerDropDownItemStyle = 2130772075;
+
+ // aapt resource value: 0x7f0100ac
+ public const int spinnerStyle = 2130772140;
+
+ // aapt resource value: 0x7f0100e7
+ public const int splitTrack = 2130772199;
+
+ // aapt resource value: 0x7f010030
+ public const int srcCompat = 2130772016;
+
+ // aapt resource value: 0x7f01015c
+ public const int srlAccentColor = 2130772316;
+
+ // aapt resource value: 0x7f010172
+ public const int srlAnimatingColor = 2130772338;
+
+ // aapt resource value: 0x7f01015d
+ public const int srlClassicsSpinnerStyle = 2130772317;
+
+ // aapt resource value: 0x7f010194
+ public const int srlDisableContentWhenLoading = 2130772372;
+
+ // aapt resource value: 0x7f010193
+ public const int srlDisableContentWhenRefresh = 2130772371;
+
+ // aapt resource value: 0x7f01017b
+ public const int srlDragRate = 2130772347;
+
+ // aapt resource value: 0x7f01015e
+ public const int srlDrawableArrow = 2130772318;
+
+ // aapt resource value: 0x7f01015f
+ public const int srlDrawableArrowSize = 2130772319;
+
+ // aapt resource value: 0x7f010160
+ public const int srlDrawableMarginRight = 2130772320;
+
+ // aapt resource value: 0x7f010161
+ public const int srlDrawableProgress = 2130772321;
+
+ // aapt resource value: 0x7f010162
+ public const int srlDrawableProgressSize = 2130772322;
+
+ // aapt resource value: 0x7f010163
+ public const int srlDrawableSize = 2130772323;
+
+ // aapt resource value: 0x7f010187
+ public const int srlEnableAutoLoadMore = 2130772359;
+
+ // aapt resource value: 0x7f010191
+ public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
+
+ // aapt resource value: 0x7f010190
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
+
+ // aapt resource value: 0x7f01018e
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
+
+ // aapt resource value: 0x7f01018f
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
+
+ // aapt resource value: 0x7f010183
+ public const int srlEnableFooterTranslationContent = 2130772355;
+
+ // aapt resource value: 0x7f010182
+ public const int srlEnableHeaderTranslationContent = 2130772354;
+
+ // aapt resource value: 0x7f010164
+ public const int srlEnableHorizontalDrag = 2130772324;
+
+ // aapt resource value: 0x7f010175
+ public const int srlEnableLastTime = 2130772341;
+
+ // aapt resource value: 0x7f010181
+ public const int srlEnableLoadMore = 2130772353;
+
+ // aapt resource value: 0x7f01018d
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
+
+ // aapt resource value: 0x7f01018a
+ public const int srlEnableNestedScrolling = 2130772362;
+
+ // aapt resource value: 0x7f010188
+ public const int srlEnableOverScrollBounce = 2130772360;
+
+ // aapt resource value: 0x7f010192
+ public const int srlEnableOverScrollDrag = 2130772370;
+
+ // aapt resource value: 0x7f010186
+ public const int srlEnablePreviewInEditMode = 2130772358;
+
+ // aapt resource value: 0x7f01019d
+ public const int srlEnablePullToCloseTwoLevel = 2130772381;
+
+ // aapt resource value: 0x7f010189
+ public const int srlEnablePureScrollMode = 2130772361;
+
+ // aapt resource value: 0x7f010180
+ public const int srlEnableRefresh = 2130772352;
+
+ // aapt resource value: 0x7f01018b
+ public const int srlEnableScrollContentWhenLoaded = 2130772363;
+
+ // aapt resource value: 0x7f01018c
+ public const int srlEnableScrollContentWhenRefreshed = 2130772364;
+
+ // aapt resource value: 0x7f01019c
+ public const int srlEnableTwoLevel = 2130772380;
+
+ // aapt resource value: 0x7f010165
+ public const int srlFinishDuration = 2130772325;
+
+ // aapt resource value: 0x7f010196
+ public const int srlFixedFooterViewId = 2130772374;
+
+ // aapt resource value: 0x7f010195
+ public const int srlFixedHeaderViewId = 2130772373;
+
+ // aapt resource value: 0x7f01019b
+ public const int srlFloorDuration = 2130772379;
+
+ // aapt resource value: 0x7f010199
+ public const int srlFloorRage = 2130772377;
+
+ // aapt resource value: 0x7f010178
+ public const int srlFooterHeight = 2130772344;
+
+ // aapt resource value: 0x7f01017a
+ public const int srlFooterInsetStart = 2130772346;
+
+ // aapt resource value: 0x7f01017d
+ public const int srlFooterMaxDragRate = 2130772349;
+
+ // aapt resource value: 0x7f010185
+ public const int srlFooterTranslationViewId = 2130772357;
+
+ // aapt resource value: 0x7f01017f
+ public const int srlFooterTriggerRate = 2130772351;
+
+ // aapt resource value: 0x7f010177
+ public const int srlHeaderHeight = 2130772343;
+
+ // aapt resource value: 0x7f010179
+ public const int srlHeaderInsetStart = 2130772345;
+
+ // aapt resource value: 0x7f01017c
+ public const int srlHeaderMaxDragRate = 2130772348;
+
+ // aapt resource value: 0x7f010184
+ public const int srlHeaderTranslationViewId = 2130772356;
+
+ // aapt resource value: 0x7f01017e
+ public const int srlHeaderTriggerRate = 2130772350;
+
+ // aapt resource value: 0x7f010198
+ public const int srlMaxRage = 2130772376;
+
+ // aapt resource value: 0x7f010173
+ public const int srlNormalColor = 2130772339;
+
+ // aapt resource value: 0x7f010166
+ public const int srlPrimaryColor = 2130772326;
+
+ // aapt resource value: 0x7f010176
+ public const int srlReboundDuration = 2130772342;
+
+ // aapt resource value: 0x7f01019a
+ public const int srlRefreshRage = 2130772378;
+
+ // aapt resource value: 0x7f010167
+ public const int srlTextFailed = 2130772327;
+
+ // aapt resource value: 0x7f010168
+ public const int srlTextFinish = 2130772328;
+
+ // aapt resource value: 0x7f010169
+ public const int srlTextLoading = 2130772329;
+
+ // aapt resource value: 0x7f01016a
+ public const int srlTextNothing = 2130772330;
+
+ // aapt resource value: 0x7f01016b
+ public const int srlTextPulling = 2130772331;
+
+ // aapt resource value: 0x7f01016c
+ public const int srlTextRefreshing = 2130772332;
+
+ // aapt resource value: 0x7f01016d
+ public const int srlTextRelease = 2130772333;
+
+ // aapt resource value: 0x7f01016e
+ public const int srlTextSecondary = 2130772334;
+
+ // aapt resource value: 0x7f01016f
+ public const int srlTextSizeTime = 2130772335;
+
+ // aapt resource value: 0x7f010170
+ public const int srlTextSizeTitle = 2130772336;
+
+ // aapt resource value: 0x7f010174
+ public const int srlTextTimeMarginTop = 2130772340;
+
+ // aapt resource value: 0x7f010171
+ public const int srlTextUpdate = 2130772337;
+
+ // aapt resource value: 0x7f010003
+ public const int stackFromEnd = 2130771971;
+
+ // aapt resource value: 0x7f0100ce
+ public const int state_above_anchor = 2130772174;
+
+ // aapt resource value: 0x7f010100
+ public const int state_collapsed = 2130772224;
+
+ // aapt resource value: 0x7f010101
+ public const int state_collapsible = 2130772225;
+
+ // aapt resource value: 0x7f010119
+ public const int statusBarBackground = 2130772249;
+
+ // aapt resource value: 0x7f01010f
+ public const int statusBarScrim = 2130772239;
+
+ // aapt resource value: 0x7f0100cc
+ public const int subMenuArrow = 2130772172;
+
+ // aapt resource value: 0x7f0100dd
+ public const int submitBackground = 2130772189;
+
+ // aapt resource value: 0x7f01000f
+ public const int subtitle = 2130771983;
+
+ // aapt resource value: 0x7f0100ea
+ public const int subtitleTextAppearance = 2130772202;
+
+ // aapt resource value: 0x7f0100f9
+ public const int subtitleTextColor = 2130772217;
+
+ // aapt resource value: 0x7f010011
+ public const int subtitleTextStyle = 2130771985;
+
+ // aapt resource value: 0x7f0100db
+ public const int suggestionRowLayout = 2130772187;
+
+ // aapt resource value: 0x7f0100e5
+ public const int switchMinWidth = 2130772197;
+
+ // aapt resource value: 0x7f0100e6
+ public const int switchPadding = 2130772198;
+
+ // aapt resource value: 0x7f0100ad
+ public const int switchStyle = 2130772141;
+
+ // aapt resource value: 0x7f0100e4
+ public const int switchTextAppearance = 2130772196;
+
+ // aapt resource value: 0x7f010136
+ public const int tabBackground = 2130772278;
+
+ // aapt resource value: 0x7f010135
+ public const int tabContentStart = 2130772277;
+
+ // aapt resource value: 0x7f010138
+ public const int tabGravity = 2130772280;
+
+ // aapt resource value: 0x7f010133
+ public const int tabIndicatorColor = 2130772275;
+
+ // aapt resource value: 0x7f010134
+ public const int tabIndicatorHeight = 2130772276;
+
+ // aapt resource value: 0x7f01013a
+ public const int tabMaxWidth = 2130772282;
+
+ // aapt resource value: 0x7f010139
+ public const int tabMinWidth = 2130772281;
+
+ // aapt resource value: 0x7f010137
+ public const int tabMode = 2130772279;
+
+ // aapt resource value: 0x7f010142
+ public const int tabPadding = 2130772290;
+
+ // aapt resource value: 0x7f010141
+ public const int tabPaddingBottom = 2130772289;
+
+ // aapt resource value: 0x7f010140
+ public const int tabPaddingEnd = 2130772288;
+
+ // aapt resource value: 0x7f01013e
+ public const int tabPaddingStart = 2130772286;
+
+ // aapt resource value: 0x7f01013f
+ public const int tabPaddingTop = 2130772287;
+
+ // aapt resource value: 0x7f01013d
+ public const int tabSelectedTextColor = 2130772285;
+
+ // aapt resource value: 0x7f01013b
+ public const int tabTextAppearance = 2130772283;
+
+ // aapt resource value: 0x7f01013c
+ public const int tabTextColor = 2130772284;
+
+ // aapt resource value: 0x7f010036
+ public const int textAllCaps = 2130772022;
+
+ // aapt resource value: 0x7f010063
+ public const int textAppearanceLargePopupMenu = 2130772067;
+
+ // aapt resource value: 0x7f010088
+ public const int textAppearanceListItem = 2130772104;
+
+ // aapt resource value: 0x7f010089
+ public const int textAppearanceListItemSecondary = 2130772105;
+
+ // aapt resource value: 0x7f01008a
+ public const int textAppearanceListItemSmall = 2130772106;
+
+ // aapt resource value: 0x7f010065
+ public const int textAppearancePopupMenuHeader = 2130772069;
+
+ // aapt resource value: 0x7f01007e
+ public const int textAppearanceSearchResultSubtitle = 2130772094;
+
+ // aapt resource value: 0x7f01007d
+ public const int textAppearanceSearchResultTitle = 2130772093;
+
+ // aapt resource value: 0x7f010064
+ public const int textAppearanceSmallPopupMenu = 2130772068;
+
+ // aapt resource value: 0x7f01009d
+ public const int textColorAlertDialogListItem = 2130772125;
+
+ // aapt resource value: 0x7f010122
+ public const int textColorError = 2130772258;
+
+ // aapt resource value: 0x7f01007f
+ public const int textColorSearchUrl = 2130772095;
+
+ // aapt resource value: 0x7f0100fc
+ public const int theme = 2130772220;
+
+ // aapt resource value: 0x7f0100bd
+ public const int thickness = 2130772157;
+
+ // aapt resource value: 0x7f0100e3
+ public const int thumbTextPadding = 2130772195;
+
+ // aapt resource value: 0x7f0100de
+ public const int thumbTint = 2130772190;
+
+ // aapt resource value: 0x7f0100df
+ public const int thumbTintMode = 2130772191;
+
+ // aapt resource value: 0x7f010033
+ public const int tickMark = 2130772019;
+
+ // aapt resource value: 0x7f010034
+ public const int tickMarkTint = 2130772020;
+
+ // aapt resource value: 0x7f010035
+ public const int tickMarkTintMode = 2130772021;
+
+ // aapt resource value: 0x7f010031
+ public const int tint = 2130772017;
+
+ // aapt resource value: 0x7f010032
+ public const int tintMode = 2130772018;
+
+ // aapt resource value: 0x7f01000c
+ public const int title = 2130771980;
+
+ // aapt resource value: 0x7f010115
+ public const int titleEnabled = 2130772245;
+
+ // aapt resource value: 0x7f0100eb
+ public const int titleMargin = 2130772203;
+
+ // aapt resource value: 0x7f0100ef
+ public const int titleMarginBottom = 2130772207;
+
+ // aapt resource value: 0x7f0100ed
+ public const int titleMarginEnd = 2130772205;
+
+ // aapt resource value: 0x7f0100ec
+ public const int titleMarginStart = 2130772204;
+
+ // aapt resource value: 0x7f0100ee
+ public const int titleMarginTop = 2130772206;
+
+ // aapt resource value: 0x7f0100f0
+ public const int titleMargins = 2130772208;
+
+ // aapt resource value: 0x7f0100e9
+ public const int titleTextAppearance = 2130772201;
+
+ // aapt resource value: 0x7f0100f8
+ public const int titleTextColor = 2130772216;
+
+ // aapt resource value: 0x7f010010
+ public const int titleTextStyle = 2130771984;
+
+ // aapt resource value: 0x7f010110
+ public const int toolbarId = 2130772240;
+
+ // aapt resource value: 0x7f010077
+ public const int toolbarNavigationButtonStyle = 2130772087;
+
+ // aapt resource value: 0x7f010076
+ public const int toolbarStyle = 2130772086;
+
+ // aapt resource value: 0x7f0100b0
+ public const int tooltipForegroundColor = 2130772144;
+
+ // aapt resource value: 0x7f0100af
+ public const int tooltipFrameBackground = 2130772143;
+
+ // aapt resource value: 0x7f0100c8
+ public const int tooltipText = 2130772168;
+
+ // aapt resource value: 0x7f0100e0
+ public const int track = 2130772192;
+
+ // aapt resource value: 0x7f0100e1
+ public const int trackTint = 2130772193;
+
+ // aapt resource value: 0x7f0100e2
+ public const int trackTintMode = 2130772194;
+
+ // aapt resource value: 0x7f010127
+ public const int useCompatPadding = 2130772263;
+
+ // aapt resource value: 0x7f0100d9
+ public const int voiceIcon = 2130772185;
+
+ // aapt resource value: 0x7f0101b8
+ public const int wave_bg_color = 2130772408;
+
+ // aapt resource value: 0x7f0101b9
+ public const int wave_border_color = 2130772409;
+
+ // aapt resource value: 0x7f0101b6
+ public const int wave_color = 2130772406;
+
+ // aapt resource value: 0x7f0101bb
+ public const int wave_height = 2130772411;
+
+ // aapt resource value: 0x7f0101ba
+ public const int wave_width = 2130772410;
+
+ // aapt resource value: 0x7f0101c0
+ public const int wheelview_dividerColor = 2130772416;
+
+ // aapt resource value: 0x7f0101bc
+ public const int wheelview_gravity = 2130772412;
+
+ // aapt resource value: 0x7f0101c1
+ public const int wheelview_lineSpacingMultiplier = 2130772417;
+
+ // aapt resource value: 0x7f0101bf
+ public const int wheelview_textColorCenter = 2130772415;
+
+ // aapt resource value: 0x7f0101be
+ public const int wheelview_textColorOut = 2130772414;
+
+ // aapt resource value: 0x7f0101bd
+ public const int wheelview_textSize = 2130772413;
+
+ // aapt resource value: 0x7f01003d
+ public const int windowActionBar = 2130772029;
+
+ // aapt resource value: 0x7f01003f
+ public const int windowActionBarOverlay = 2130772031;
+
+ // aapt resource value: 0x7f010040
+ public const int windowActionModeOverlay = 2130772032;
+
+ // aapt resource value: 0x7f010044
+ public const int windowFixedHeightMajor = 2130772036;
+
+ // aapt resource value: 0x7f010042
+ public const int windowFixedHeightMinor = 2130772034;
+
+ // aapt resource value: 0x7f010041
+ public const int windowFixedWidthMajor = 2130772033;
+
+ // aapt resource value: 0x7f010043
+ public const int windowFixedWidthMinor = 2130772035;
+
+ // aapt resource value: 0x7f010045
+ public const int windowMinWidthMajor = 2130772037;
+
+ // aapt resource value: 0x7f010046
+ public const int windowMinWidthMinor = 2130772038;
+
+ // aapt resource value: 0x7f01003e
+ public const int windowNoTitle = 2130772030;
+
static Attribute()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Attribute()
{
}
}
-
+
public partial class Boolean
{
-
- // aapt resource value: 0x7F050000
- public const int abc_action_bar_embed_tabs = 2131034112;
-
- // aapt resource value: 0x7F050001
- public const int abc_allow_stacked_button_bar = 2131034113;
-
- // aapt resource value: 0x7F050002
- public const int abc_config_actionMenuItemAllCaps = 2131034114;
-
- // aapt resource value: 0x7F050003
- public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
-
- // aapt resource value: 0x7F050004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
-
+
+ // aapt resource value: 0x7f0c0000
+ public const int abc_action_bar_embed_tabs = 2131492864;
+
+ // aapt resource value: 0x7f0c0001
+ public const int abc_allow_stacked_button_bar = 2131492865;
+
+ // aapt resource value: 0x7f0c0002
+ public const int abc_config_actionMenuItemAllCaps = 2131492866;
+
+ // aapt resource value: 0x7f0c0003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
+
+ // aapt resource value: 0x7f0c0004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
+
static Boolean()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Boolean()
{
}
}
-
+
public partial class Color
{
-
- // aapt resource value: 0x7F060000
- public const int abc_background_cache_hint_selector_material_dark = 2131099648;
-
- // aapt resource value: 0x7F060001
- public const int abc_background_cache_hint_selector_material_light = 2131099649;
-
- // aapt resource value: 0x7F060002
- public const int abc_btn_colored_borderless_text_material = 2131099650;
-
- // aapt resource value: 0x7F060003
- public const int abc_btn_colored_text_material = 2131099651;
-
- // aapt resource value: 0x7F060004
- public const int abc_color_highlight_material = 2131099652;
-
- // aapt resource value: 0x7F060005
- public const int abc_hint_foreground_material_dark = 2131099653;
-
- // aapt resource value: 0x7F060006
- public const int abc_hint_foreground_material_light = 2131099654;
-
- // aapt resource value: 0x7F060007
- public const int abc_input_method_navigation_guard = 2131099655;
-
- // aapt resource value: 0x7F060008
- public const int abc_primary_text_disable_only_material_dark = 2131099656;
-
- // aapt resource value: 0x7F060009
- public const int abc_primary_text_disable_only_material_light = 2131099657;
-
- // aapt resource value: 0x7F06000A
- public const int abc_primary_text_material_dark = 2131099658;
-
- // aapt resource value: 0x7F06000B
- public const int abc_primary_text_material_light = 2131099659;
-
- // aapt resource value: 0x7F06000C
- public const int abc_search_url_text = 2131099660;
-
- // aapt resource value: 0x7F06000D
- public const int abc_search_url_text_normal = 2131099661;
-
- // aapt resource value: 0x7F06000E
- public const int abc_search_url_text_pressed = 2131099662;
-
- // aapt resource value: 0x7F06000F
- public const int abc_search_url_text_selected = 2131099663;
-
- // aapt resource value: 0x7F060010
- public const int abc_secondary_text_material_dark = 2131099664;
-
- // aapt resource value: 0x7F060011
- public const int abc_secondary_text_material_light = 2131099665;
-
- // aapt resource value: 0x7F060012
- public const int abc_tint_btn_checkable = 2131099666;
-
- // aapt resource value: 0x7F060013
- public const int abc_tint_default = 2131099667;
-
- // aapt resource value: 0x7F060014
- public const int abc_tint_edittext = 2131099668;
-
- // aapt resource value: 0x7F060015
- public const int abc_tint_seek_thumb = 2131099669;
-
- // aapt resource value: 0x7F060016
- public const int abc_tint_spinner = 2131099670;
-
- // aapt resource value: 0x7F060017
- public const int abc_tint_switch_track = 2131099671;
-
- // aapt resource value: 0x7F060018
- public const int accent_material_dark = 2131099672;
-
- // aapt resource value: 0x7F060019
- public const int accent_material_light = 2131099673;
-
- // aapt resource value: 0x7F06001A
- public const int background_floating_material_dark = 2131099674;
-
- // aapt resource value: 0x7F06001B
- public const int background_floating_material_light = 2131099675;
-
- // aapt resource value: 0x7F06001C
- public const int background_material_dark = 2131099676;
-
- // aapt resource value: 0x7F06001D
- public const int background_material_light = 2131099677;
-
- // aapt resource value: 0x7F06001E
- public const int bright_foreground_disabled_material_dark = 2131099678;
-
- // aapt resource value: 0x7F06001F
- public const int bright_foreground_disabled_material_light = 2131099679;
-
- // aapt resource value: 0x7F060020
- public const int bright_foreground_inverse_material_dark = 2131099680;
-
- // aapt resource value: 0x7F060021
- public const int bright_foreground_inverse_material_light = 2131099681;
-
- // aapt resource value: 0x7F060022
- public const int bright_foreground_material_dark = 2131099682;
-
- // aapt resource value: 0x7F060023
- public const int bright_foreground_material_light = 2131099683;
-
- // aapt resource value: 0x7F060024
- public const int button_material_dark = 2131099684;
-
- // aapt resource value: 0x7F060025
- public const int button_material_light = 2131099685;
-
- // aapt resource value: 0x7F060026
- public const int design_bottom_navigation_shadow_color = 2131099686;
-
- // aapt resource value: 0x7F060027
- public const int design_error = 2131099687;
-
- // aapt resource value: 0x7F060028
- public const int design_fab_shadow_end_color = 2131099688;
-
- // aapt resource value: 0x7F060029
- public const int design_fab_shadow_mid_color = 2131099689;
-
- // aapt resource value: 0x7F06002A
- public const int design_fab_shadow_start_color = 2131099690;
-
- // aapt resource value: 0x7F06002B
- public const int design_fab_stroke_end_inner_color = 2131099691;
-
- // aapt resource value: 0x7F06002C
- public const int design_fab_stroke_end_outer_color = 2131099692;
-
- // aapt resource value: 0x7F06002D
- public const int design_fab_stroke_top_inner_color = 2131099693;
-
- // aapt resource value: 0x7F06002E
- public const int design_fab_stroke_top_outer_color = 2131099694;
-
- // aapt resource value: 0x7F06002F
- public const int design_snackbar_background_color = 2131099695;
-
- // aapt resource value: 0x7F060030
- public const int design_tint_password_toggle = 2131099696;
-
- // aapt resource value: 0x7F060031
- public const int dim_foreground_disabled_material_dark = 2131099697;
-
- // aapt resource value: 0x7F060032
- public const int dim_foreground_disabled_material_light = 2131099698;
-
- // aapt resource value: 0x7F060033
- public const int dim_foreground_material_dark = 2131099699;
-
- // aapt resource value: 0x7F060034
- public const int dim_foreground_material_light = 2131099700;
-
- // aapt resource value: 0x7F060035
- public const int error_color_material = 2131099701;
-
- // aapt resource value: 0x7F060036
- public const int foreground_material_dark = 2131099702;
-
- // aapt resource value: 0x7F060037
- public const int foreground_material_light = 2131099703;
-
- // aapt resource value: 0x7F060038
- public const int gd_top_view = 2131099704;
-
- // aapt resource value: 0x7F060039
- public const int highlighted_text_material_dark = 2131099705;
-
- // aapt resource value: 0x7F06003A
- public const int highlighted_text_material_light = 2131099706;
-
- // aapt resource value: 0x7F06003B
- public const int material_blue_grey_800 = 2131099707;
-
- // aapt resource value: 0x7F06003C
- public const int material_blue_grey_900 = 2131099708;
-
- // aapt resource value: 0x7F06003D
- public const int material_blue_grey_950 = 2131099709;
-
- // aapt resource value: 0x7F06003E
- public const int material_deep_teal_200 = 2131099710;
-
- // aapt resource value: 0x7F06003F
- public const int material_deep_teal_500 = 2131099711;
-
- // aapt resource value: 0x7F060040
- public const int material_grey_100 = 2131099712;
-
- // aapt resource value: 0x7F060041
- public const int material_grey_300 = 2131099713;
-
- // aapt resource value: 0x7F060042
- public const int material_grey_50 = 2131099714;
-
- // aapt resource value: 0x7F060043
- public const int material_grey_600 = 2131099715;
-
- // aapt resource value: 0x7F060044
- public const int material_grey_800 = 2131099716;
-
- // aapt resource value: 0x7F060045
- public const int material_grey_850 = 2131099717;
-
- // aapt resource value: 0x7F060046
- public const int material_grey_900 = 2131099718;
-
- // aapt resource value: 0x7F060047
- public const int material_red_500 = 2131099719;
-
- // aapt resource value: 0x7F060048
- public const int notification_action_color_filter = 2131099720;
-
- // aapt resource value: 0x7F060049
- public const int notification_icon_bg_color = 2131099721;
-
- // aapt resource value: 0x7F06004A
- public const int notification_material_background_media_default_color = 2131099722;
-
- // aapt resource value: 0x7F06004B
- public const int pickerview_bgColor_default = 2131099723;
-
- // aapt resource value: 0x7F06004C
- public const int pickerview_bgColor_overlay = 2131099724;
-
- // aapt resource value: 0x7F06004D
- public const int pickerview_bg_topbar = 2131099725;
-
- // aapt resource value: 0x7F06004E
- public const int pickerview_timebtn_nor = 2131099726;
-
- // aapt resource value: 0x7F06004F
- public const int pickerview_timebtn_pre = 2131099727;
-
- // aapt resource value: 0x7F060050
- public const int pickerview_topbar_title = 2131099728;
-
- // aapt resource value: 0x7F060051
- public const int pickerview_wheelview_textcolor_center = 2131099729;
-
- // aapt resource value: 0x7F060052
- public const int pickerview_wheelview_textcolor_divider = 2131099730;
-
- // aapt resource value: 0x7F060053
- public const int pickerview_wheelview_textcolor_out = 2131099731;
-
- // aapt resource value: 0x7F060054
- public const int primary_dark_material_dark = 2131099732;
-
- // aapt resource value: 0x7F060055
- public const int primary_dark_material_light = 2131099733;
-
- // aapt resource value: 0x7F060056
- public const int primary_material_dark = 2131099734;
-
- // aapt resource value: 0x7F060057
- public const int primary_material_light = 2131099735;
-
- // aapt resource value: 0x7F060058
- public const int primary_text_default_material_dark = 2131099736;
-
- // aapt resource value: 0x7F060059
- public const int primary_text_default_material_light = 2131099737;
-
- // aapt resource value: 0x7F06005A
- public const int primary_text_disabled_material_dark = 2131099738;
-
- // aapt resource value: 0x7F06005B
- public const int primary_text_disabled_material_light = 2131099739;
-
- // aapt resource value: 0x7F06005C
- public const int ripple_material_dark = 2131099740;
-
- // aapt resource value: 0x7F06005D
- public const int ripple_material_light = 2131099741;
-
- // aapt resource value: 0x7F06005E
- public const int secondary_text_default_material_dark = 2131099742;
-
- // aapt resource value: 0x7F06005F
- public const int secondary_text_default_material_light = 2131099743;
-
- // aapt resource value: 0x7F060060
- public const int secondary_text_disabled_material_dark = 2131099744;
-
- // aapt resource value: 0x7F060061
- public const int secondary_text_disabled_material_light = 2131099745;
-
- // aapt resource value: 0x7F060062
- public const int switch_thumb_disabled_material_dark = 2131099746;
-
- // aapt resource value: 0x7F060063
- public const int switch_thumb_disabled_material_light = 2131099747;
-
- // aapt resource value: 0x7F060064
- public const int switch_thumb_material_dark = 2131099748;
-
- // aapt resource value: 0x7F060065
- public const int switch_thumb_material_light = 2131099749;
-
- // aapt resource value: 0x7F060066
- public const int switch_thumb_normal_material_dark = 2131099750;
-
- // aapt resource value: 0x7F060067
- public const int switch_thumb_normal_material_light = 2131099751;
-
- // aapt resource value: 0x7F060068
- public const int tooltip_background_dark = 2131099752;
-
- // aapt resource value: 0x7F060069
- public const int tooltip_background_light = 2131099753;
-
+
+ // aapt resource value: 0x7f0d0052
+ public const int abc_background_cache_hint_selector_material_dark = 2131558482;
+
+ // aapt resource value: 0x7f0d0053
+ public const int abc_background_cache_hint_selector_material_light = 2131558483;
+
+ // aapt resource value: 0x7f0d0054
+ public const int abc_btn_colored_borderless_text_material = 2131558484;
+
+ // aapt resource value: 0x7f0d0055
+ public const int abc_btn_colored_text_material = 2131558485;
+
+ // aapt resource value: 0x7f0d0056
+ public const int abc_color_highlight_material = 2131558486;
+
+ // aapt resource value: 0x7f0d0057
+ public const int abc_hint_foreground_material_dark = 2131558487;
+
+ // aapt resource value: 0x7f0d0058
+ public const int abc_hint_foreground_material_light = 2131558488;
+
+ // aapt resource value: 0x7f0d0000
+ public const int abc_input_method_navigation_guard = 2131558400;
+
+ // aapt resource value: 0x7f0d0059
+ public const int abc_primary_text_disable_only_material_dark = 2131558489;
+
+ // aapt resource value: 0x7f0d005a
+ public const int abc_primary_text_disable_only_material_light = 2131558490;
+
+ // aapt resource value: 0x7f0d005b
+ public const int abc_primary_text_material_dark = 2131558491;
+
+ // aapt resource value: 0x7f0d005c
+ public const int abc_primary_text_material_light = 2131558492;
+
+ // aapt resource value: 0x7f0d005d
+ public const int abc_search_url_text = 2131558493;
+
+ // aapt resource value: 0x7f0d0001
+ public const int abc_search_url_text_normal = 2131558401;
+
+ // aapt resource value: 0x7f0d0002
+ public const int abc_search_url_text_pressed = 2131558402;
+
+ // aapt resource value: 0x7f0d0003
+ public const int abc_search_url_text_selected = 2131558403;
+
+ // aapt resource value: 0x7f0d005e
+ public const int abc_secondary_text_material_dark = 2131558494;
+
+ // aapt resource value: 0x7f0d005f
+ public const int abc_secondary_text_material_light = 2131558495;
+
+ // aapt resource value: 0x7f0d0060
+ public const int abc_tint_btn_checkable = 2131558496;
+
+ // aapt resource value: 0x7f0d0061
+ public const int abc_tint_default = 2131558497;
+
+ // aapt resource value: 0x7f0d0062
+ public const int abc_tint_edittext = 2131558498;
+
+ // aapt resource value: 0x7f0d0063
+ public const int abc_tint_seek_thumb = 2131558499;
+
+ // aapt resource value: 0x7f0d0064
+ public const int abc_tint_spinner = 2131558500;
+
+ // aapt resource value: 0x7f0d0065
+ public const int abc_tint_switch_track = 2131558501;
+
+ // aapt resource value: 0x7f0d0004
+ public const int accent_material_dark = 2131558404;
+
+ // aapt resource value: 0x7f0d0005
+ public const int accent_material_light = 2131558405;
+
+ // aapt resource value: 0x7f0d0006
+ public const int background_floating_material_dark = 2131558406;
+
+ // aapt resource value: 0x7f0d0007
+ public const int background_floating_material_light = 2131558407;
+
+ // aapt resource value: 0x7f0d0008
+ public const int background_material_dark = 2131558408;
+
+ // aapt resource value: 0x7f0d0009
+ public const int background_material_light = 2131558409;
+
+ // aapt resource value: 0x7f0d000a
+ public const int bright_foreground_disabled_material_dark = 2131558410;
+
+ // aapt resource value: 0x7f0d000b
+ public const int bright_foreground_disabled_material_light = 2131558411;
+
+ // aapt resource value: 0x7f0d000c
+ public const int bright_foreground_inverse_material_dark = 2131558412;
+
+ // aapt resource value: 0x7f0d000d
+ public const int bright_foreground_inverse_material_light = 2131558413;
+
+ // aapt resource value: 0x7f0d000e
+ public const int bright_foreground_material_dark = 2131558414;
+
+ // aapt resource value: 0x7f0d000f
+ public const int bright_foreground_material_light = 2131558415;
+
+ // aapt resource value: 0x7f0d0010
+ public const int button_material_dark = 2131558416;
+
+ // aapt resource value: 0x7f0d0011
+ public const int button_material_light = 2131558417;
+
+ // aapt resource value: 0x7f0d003c
+ public const int design_bottom_navigation_shadow_color = 2131558460;
+
+ // aapt resource value: 0x7f0d0066
+ public const int design_error = 2131558502;
+
+ // aapt resource value: 0x7f0d003d
+ public const int design_fab_shadow_end_color = 2131558461;
+
+ // aapt resource value: 0x7f0d003e
+ public const int design_fab_shadow_mid_color = 2131558462;
+
+ // aapt resource value: 0x7f0d003f
+ public const int design_fab_shadow_start_color = 2131558463;
+
+ // aapt resource value: 0x7f0d0040
+ public const int design_fab_stroke_end_inner_color = 2131558464;
+
+ // aapt resource value: 0x7f0d0041
+ public const int design_fab_stroke_end_outer_color = 2131558465;
+
+ // aapt resource value: 0x7f0d0042
+ public const int design_fab_stroke_top_inner_color = 2131558466;
+
+ // aapt resource value: 0x7f0d0043
+ public const int design_fab_stroke_top_outer_color = 2131558467;
+
+ // aapt resource value: 0x7f0d0044
+ public const int design_snackbar_background_color = 2131558468;
+
+ // aapt resource value: 0x7f0d0067
+ public const int design_tint_password_toggle = 2131558503;
+
+ // aapt resource value: 0x7f0d0012
+ public const int dim_foreground_disabled_material_dark = 2131558418;
+
+ // aapt resource value: 0x7f0d0013
+ public const int dim_foreground_disabled_material_light = 2131558419;
+
+ // aapt resource value: 0x7f0d0014
+ public const int dim_foreground_material_dark = 2131558420;
+
+ // aapt resource value: 0x7f0d0015
+ public const int dim_foreground_material_light = 2131558421;
+
+ // aapt resource value: 0x7f0d0016
+ public const int error_color_material = 2131558422;
+
+ // aapt resource value: 0x7f0d0017
+ public const int foreground_material_dark = 2131558423;
+
+ // aapt resource value: 0x7f0d0018
+ public const int foreground_material_light = 2131558424;
+
+ // aapt resource value: 0x7f0d0048
+ public const int gd_top_view = 2131558472;
+
+ // aapt resource value: 0x7f0d0019
+ public const int highlighted_text_material_dark = 2131558425;
+
+ // aapt resource value: 0x7f0d001a
+ public const int highlighted_text_material_light = 2131558426;
+
+ // aapt resource value: 0x7f0d001b
+ public const int material_blue_grey_800 = 2131558427;
+
+ // aapt resource value: 0x7f0d001c
+ public const int material_blue_grey_900 = 2131558428;
+
+ // aapt resource value: 0x7f0d001d
+ public const int material_blue_grey_950 = 2131558429;
+
+ // aapt resource value: 0x7f0d001e
+ public const int material_deep_teal_200 = 2131558430;
+
+ // aapt resource value: 0x7f0d001f
+ public const int material_deep_teal_500 = 2131558431;
+
+ // aapt resource value: 0x7f0d0020
+ public const int material_grey_100 = 2131558432;
+
+ // aapt resource value: 0x7f0d0021
+ public const int material_grey_300 = 2131558433;
+
+ // aapt resource value: 0x7f0d0022
+ public const int material_grey_50 = 2131558434;
+
+ // aapt resource value: 0x7f0d0023
+ public const int material_grey_600 = 2131558435;
+
+ // aapt resource value: 0x7f0d0024
+ public const int material_grey_800 = 2131558436;
+
+ // aapt resource value: 0x7f0d0025
+ public const int material_grey_850 = 2131558437;
+
+ // aapt resource value: 0x7f0d0026
+ public const int material_grey_900 = 2131558438;
+
+ // aapt resource value: 0x7f0d0047
+ public const int material_red_500 = 2131558471;
+
+ // aapt resource value: 0x7f0d0045
+ public const int notification_action_color_filter = 2131558469;
+
+ // aapt resource value: 0x7f0d0046
+ public const int notification_icon_bg_color = 2131558470;
+
+ // aapt resource value: 0x7f0d003b
+ public const int notification_material_background_media_default_color = 2131558459;
+
+ // aapt resource value: 0x7f0d0049
+ public const int pickerview_bgColor_default = 2131558473;
+
+ // aapt resource value: 0x7f0d004a
+ public const int pickerview_bgColor_overlay = 2131558474;
+
+ // aapt resource value: 0x7f0d004b
+ public const int pickerview_bg_topbar = 2131558475;
+
+ // aapt resource value: 0x7f0d004c
+ public const int pickerview_timebtn_nor = 2131558476;
+
+ // aapt resource value: 0x7f0d004d
+ public const int pickerview_timebtn_pre = 2131558477;
+
+ // aapt resource value: 0x7f0d004e
+ public const int pickerview_topbar_title = 2131558478;
+
+ // aapt resource value: 0x7f0d004f
+ public const int pickerview_wheelview_textcolor_center = 2131558479;
+
+ // aapt resource value: 0x7f0d0050
+ public const int pickerview_wheelview_textcolor_divider = 2131558480;
+
+ // aapt resource value: 0x7f0d0051
+ public const int pickerview_wheelview_textcolor_out = 2131558481;
+
+ // aapt resource value: 0x7f0d0027
+ public const int primary_dark_material_dark = 2131558439;
+
+ // aapt resource value: 0x7f0d0028
+ public const int primary_dark_material_light = 2131558440;
+
+ // aapt resource value: 0x7f0d0029
+ public const int primary_material_dark = 2131558441;
+
+ // aapt resource value: 0x7f0d002a
+ public const int primary_material_light = 2131558442;
+
+ // aapt resource value: 0x7f0d002b
+ public const int primary_text_default_material_dark = 2131558443;
+
+ // aapt resource value: 0x7f0d002c
+ public const int primary_text_default_material_light = 2131558444;
+
+ // aapt resource value: 0x7f0d002d
+ public const int primary_text_disabled_material_dark = 2131558445;
+
+ // aapt resource value: 0x7f0d002e
+ public const int primary_text_disabled_material_light = 2131558446;
+
+ // aapt resource value: 0x7f0d002f
+ public const int ripple_material_dark = 2131558447;
+
+ // aapt resource value: 0x7f0d0030
+ public const int ripple_material_light = 2131558448;
+
+ // aapt resource value: 0x7f0d0031
+ public const int secondary_text_default_material_dark = 2131558449;
+
+ // aapt resource value: 0x7f0d0032
+ public const int secondary_text_default_material_light = 2131558450;
+
+ // aapt resource value: 0x7f0d0033
+ public const int secondary_text_disabled_material_dark = 2131558451;
+
+ // aapt resource value: 0x7f0d0034
+ public const int secondary_text_disabled_material_light = 2131558452;
+
+ // aapt resource value: 0x7f0d0035
+ public const int switch_thumb_disabled_material_dark = 2131558453;
+
+ // aapt resource value: 0x7f0d0036
+ public const int switch_thumb_disabled_material_light = 2131558454;
+
+ // aapt resource value: 0x7f0d0068
+ public const int switch_thumb_material_dark = 2131558504;
+
+ // aapt resource value: 0x7f0d0069
+ public const int switch_thumb_material_light = 2131558505;
+
+ // aapt resource value: 0x7f0d0037
+ public const int switch_thumb_normal_material_dark = 2131558455;
+
+ // aapt resource value: 0x7f0d0038
+ public const int switch_thumb_normal_material_light = 2131558456;
+
+ // aapt resource value: 0x7f0d0039
+ public const int tooltip_background_dark = 2131558457;
+
+ // aapt resource value: 0x7f0d003a
+ public const int tooltip_background_light = 2131558458;
+
static Color()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Color()
{
}
}
-
+
public partial class Dimension
{
-
- // aapt resource value: 0x7F070000
- public const int abc_action_bar_content_inset_material = 2131165184;
-
- // aapt resource value: 0x7F070001
- public const int abc_action_bar_content_inset_with_nav = 2131165185;
-
- // aapt resource value: 0x7F070002
- public const int abc_action_bar_default_height_material = 2131165186;
-
- // aapt resource value: 0x7F070003
- public const int abc_action_bar_default_padding_end_material = 2131165187;
-
- // aapt resource value: 0x7F070004
- public const int abc_action_bar_default_padding_start_material = 2131165188;
-
- // aapt resource value: 0x7F070005
- public const int abc_action_bar_elevation_material = 2131165189;
-
- // aapt resource value: 0x7F070006
- public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
-
- // aapt resource value: 0x7F070007
- public const int abc_action_bar_overflow_padding_end_material = 2131165191;
-
- // aapt resource value: 0x7F070008
- public const int abc_action_bar_overflow_padding_start_material = 2131165192;
-
- // aapt resource value: 0x7F070009
- public const int abc_action_bar_progress_bar_size = 2131165193;
-
- // aapt resource value: 0x7F07000A
- public const int abc_action_bar_stacked_max_height = 2131165194;
-
- // aapt resource value: 0x7F07000B
- public const int abc_action_bar_stacked_tab_max_width = 2131165195;
-
- // aapt resource value: 0x7F07000C
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
-
- // aapt resource value: 0x7F07000D
- public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
-
- // aapt resource value: 0x7F07000E
- public const int abc_action_button_min_height_material = 2131165198;
-
- // aapt resource value: 0x7F07000F
- public const int abc_action_button_min_width_material = 2131165199;
-
- // aapt resource value: 0x7F070010
- public const int abc_action_button_min_width_overflow_material = 2131165200;
-
- // aapt resource value: 0x7F070011
- public const int abc_alert_dialog_button_bar_height = 2131165201;
-
- // aapt resource value: 0x7F070012
- public const int abc_button_inset_horizontal_material = 2131165202;
-
- // aapt resource value: 0x7F070013
- public const int abc_button_inset_vertical_material = 2131165203;
-
- // aapt resource value: 0x7F070014
- public const int abc_button_padding_horizontal_material = 2131165204;
-
- // aapt resource value: 0x7F070015
- public const int abc_button_padding_vertical_material = 2131165205;
-
- // aapt resource value: 0x7F070016
- public const int abc_cascading_menus_min_smallest_width = 2131165206;
-
- // aapt resource value: 0x7F070017
- public const int abc_config_prefDialogWidth = 2131165207;
-
- // aapt resource value: 0x7F070018
- public const int abc_control_corner_material = 2131165208;
-
- // aapt resource value: 0x7F070019
- public const int abc_control_inset_material = 2131165209;
-
- // aapt resource value: 0x7F07001A
- public const int abc_control_padding_material = 2131165210;
-
- // aapt resource value: 0x7F07001B
- public const int abc_dialog_fixed_height_major = 2131165211;
-
- // aapt resource value: 0x7F07001C
- public const int abc_dialog_fixed_height_minor = 2131165212;
-
- // aapt resource value: 0x7F07001D
- public const int abc_dialog_fixed_width_major = 2131165213;
-
- // aapt resource value: 0x7F07001E
- public const int abc_dialog_fixed_width_minor = 2131165214;
-
- // aapt resource value: 0x7F07001F
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
-
- // aapt resource value: 0x7F070020
- public const int abc_dialog_list_padding_top_no_title = 2131165216;
-
- // aapt resource value: 0x7F070021
- public const int abc_dialog_min_width_major = 2131165217;
-
- // aapt resource value: 0x7F070022
- public const int abc_dialog_min_width_minor = 2131165218;
-
- // aapt resource value: 0x7F070023
- public const int abc_dialog_padding_material = 2131165219;
-
- // aapt resource value: 0x7F070024
- public const int abc_dialog_padding_top_material = 2131165220;
-
- // aapt resource value: 0x7F070025
- public const int abc_dialog_title_divider_material = 2131165221;
-
- // aapt resource value: 0x7F070026
- public const int abc_disabled_alpha_material_dark = 2131165222;
-
- // aapt resource value: 0x7F070027
- public const int abc_disabled_alpha_material_light = 2131165223;
-
- // aapt resource value: 0x7F070028
- public const int abc_dropdownitem_icon_width = 2131165224;
-
- // aapt resource value: 0x7F070029
- public const int abc_dropdownitem_text_padding_left = 2131165225;
-
- // aapt resource value: 0x7F07002A
- public const int abc_dropdownitem_text_padding_right = 2131165226;
-
- // aapt resource value: 0x7F07002B
- public const int abc_edit_text_inset_bottom_material = 2131165227;
-
- // aapt resource value: 0x7F07002C
- public const int abc_edit_text_inset_horizontal_material = 2131165228;
-
- // aapt resource value: 0x7F07002D
- public const int abc_edit_text_inset_top_material = 2131165229;
-
- // aapt resource value: 0x7F07002E
- public const int abc_floating_window_z = 2131165230;
-
- // aapt resource value: 0x7F07002F
- public const int abc_list_item_padding_horizontal_material = 2131165231;
-
- // aapt resource value: 0x7F070030
- public const int abc_panel_menu_list_width = 2131165232;
-
- // aapt resource value: 0x7F070031
- public const int abc_progress_bar_height_material = 2131165233;
-
- // aapt resource value: 0x7F070032
- public const int abc_search_view_preferred_height = 2131165234;
-
- // aapt resource value: 0x7F070033
- public const int abc_search_view_preferred_width = 2131165235;
-
- // aapt resource value: 0x7F070034
- public const int abc_seekbar_track_background_height_material = 2131165236;
-
- // aapt resource value: 0x7F070035
- public const int abc_seekbar_track_progress_height_material = 2131165237;
-
- // aapt resource value: 0x7F070036
- public const int abc_select_dialog_padding_start_material = 2131165238;
-
- // aapt resource value: 0x7F070037
- public const int abc_switch_padding = 2131165239;
-
- // aapt resource value: 0x7F070038
- public const int abc_text_size_body_1_material = 2131165240;
-
- // aapt resource value: 0x7F070039
- public const int abc_text_size_body_2_material = 2131165241;
-
- // aapt resource value: 0x7F07003A
- public const int abc_text_size_button_material = 2131165242;
-
- // aapt resource value: 0x7F07003B
- public const int abc_text_size_caption_material = 2131165243;
-
- // aapt resource value: 0x7F07003C
- public const int abc_text_size_display_1_material = 2131165244;
-
- // aapt resource value: 0x7F07003D
- public const int abc_text_size_display_2_material = 2131165245;
-
- // aapt resource value: 0x7F07003E
- public const int abc_text_size_display_3_material = 2131165246;
-
- // aapt resource value: 0x7F07003F
- public const int abc_text_size_display_4_material = 2131165247;
-
- // aapt resource value: 0x7F070040
- public const int abc_text_size_headline_material = 2131165248;
-
- // aapt resource value: 0x7F070041
- public const int abc_text_size_large_material = 2131165249;
-
- // aapt resource value: 0x7F070042
- public const int abc_text_size_medium_material = 2131165250;
-
- // aapt resource value: 0x7F070043
- public const int abc_text_size_menu_header_material = 2131165251;
-
- // aapt resource value: 0x7F070044
- public const int abc_text_size_menu_material = 2131165252;
-
- // aapt resource value: 0x7F070045
- public const int abc_text_size_small_material = 2131165253;
-
- // aapt resource value: 0x7F070046
- public const int abc_text_size_subhead_material = 2131165254;
-
- // aapt resource value: 0x7F070047
- public const int abc_text_size_subtitle_material_toolbar = 2131165255;
-
- // aapt resource value: 0x7F070048
- public const int abc_text_size_title_material = 2131165256;
-
- // aapt resource value: 0x7F070049
- public const int abc_text_size_title_material_toolbar = 2131165257;
-
- // aapt resource value: 0x7F07004A
- public const int compat_button_inset_horizontal_material = 2131165258;
-
- // aapt resource value: 0x7F07004B
- public const int compat_button_inset_vertical_material = 2131165259;
-
- // aapt resource value: 0x7F07004C
- public const int compat_button_padding_horizontal_material = 2131165260;
-
- // aapt resource value: 0x7F07004D
- public const int compat_button_padding_vertical_material = 2131165261;
-
- // aapt resource value: 0x7F07004E
- public const int compat_control_corner_material = 2131165262;
-
- // aapt resource value: 0x7F07004F
- public const int design_appbar_elevation = 2131165263;
-
- // aapt resource value: 0x7F070050
- public const int design_bottom_navigation_active_item_max_width = 2131165264;
-
- // aapt resource value: 0x7F070051
- public const int design_bottom_navigation_active_text_size = 2131165265;
-
- // aapt resource value: 0x7F070052
- public const int design_bottom_navigation_elevation = 2131165266;
-
- // aapt resource value: 0x7F070053
- public const int design_bottom_navigation_height = 2131165267;
-
- // aapt resource value: 0x7F070054
- public const int design_bottom_navigation_item_max_width = 2131165268;
-
- // aapt resource value: 0x7F070055
- public const int design_bottom_navigation_item_min_width = 2131165269;
-
- // aapt resource value: 0x7F070056
- public const int design_bottom_navigation_margin = 2131165270;
-
- // aapt resource value: 0x7F070057
- public const int design_bottom_navigation_shadow_height = 2131165271;
-
- // aapt resource value: 0x7F070058
- public const int design_bottom_navigation_text_size = 2131165272;
-
- // aapt resource value: 0x7F070059
- public const int design_bottom_sheet_modal_elevation = 2131165273;
-
- // aapt resource value: 0x7F07005A
- public const int design_bottom_sheet_peek_height_min = 2131165274;
-
- // aapt resource value: 0x7F07005B
- public const int design_fab_border_width = 2131165275;
-
- // aapt resource value: 0x7F07005C
- public const int design_fab_elevation = 2131165276;
-
- // aapt resource value: 0x7F07005D
- public const int design_fab_image_size = 2131165277;
-
- // aapt resource value: 0x7F07005E
- public const int design_fab_size_mini = 2131165278;
-
- // aapt resource value: 0x7F07005F
- public const int design_fab_size_normal = 2131165279;
-
- // aapt resource value: 0x7F070060
- public const int design_fab_translation_z_pressed = 2131165280;
-
- // aapt resource value: 0x7F070061
- public const int design_navigation_elevation = 2131165281;
-
- // aapt resource value: 0x7F070062
- public const int design_navigation_icon_padding = 2131165282;
-
- // aapt resource value: 0x7F070063
- public const int design_navigation_icon_size = 2131165283;
-
- // aapt resource value: 0x7F070064
- public const int design_navigation_max_width = 2131165284;
-
- // aapt resource value: 0x7F070065
- public const int design_navigation_padding_bottom = 2131165285;
-
- // aapt resource value: 0x7F070066
- public const int design_navigation_separator_vertical_padding = 2131165286;
-
- // aapt resource value: 0x7F070067
- public const int design_snackbar_action_inline_max_width = 2131165287;
-
- // aapt resource value: 0x7F070068
- public const int design_snackbar_background_corner_radius = 2131165288;
-
- // aapt resource value: 0x7F070069
- public const int design_snackbar_elevation = 2131165289;
-
- // aapt resource value: 0x7F07006A
- public const int design_snackbar_extra_spacing_horizontal = 2131165290;
-
- // aapt resource value: 0x7F07006B
- public const int design_snackbar_max_width = 2131165291;
-
- // aapt resource value: 0x7F07006C
- public const int design_snackbar_min_width = 2131165292;
-
- // aapt resource value: 0x7F07006D
- public const int design_snackbar_padding_horizontal = 2131165293;
-
- // aapt resource value: 0x7F07006E
- public const int design_snackbar_padding_vertical = 2131165294;
-
- // aapt resource value: 0x7F07006F
- public const int design_snackbar_padding_vertical_2lines = 2131165295;
-
- // aapt resource value: 0x7F070070
- public const int design_snackbar_text_size = 2131165296;
-
- // aapt resource value: 0x7F070071
- public const int design_tab_max_width = 2131165297;
-
- // aapt resource value: 0x7F070072
- public const int design_tab_scrollable_min_width = 2131165298;
-
- // aapt resource value: 0x7F070073
- public const int design_tab_text_size = 2131165299;
-
- // aapt resource value: 0x7F070074
- public const int design_tab_text_size_2line = 2131165300;
-
- // aapt resource value: 0x7F070075
- public const int disabled_alpha_material_dark = 2131165301;
-
- // aapt resource value: 0x7F070076
- public const int disabled_alpha_material_light = 2131165302;
-
- // aapt resource value: 0x7F070077
- public const int fastscroll_default_thickness = 2131165303;
-
- // aapt resource value: 0x7F070078
- public const int fastscroll_margin = 2131165304;
-
- // aapt resource value: 0x7F070079
- public const int fastscroll_minimum_range = 2131165305;
-
- // aapt resource value: 0x7F07007A
- public const int fingerprint_icon_size = 2131165306;
-
- // aapt resource value: 0x7F07007B
- public const int fingerprint_status_layout_margin_vertical = 2131165307;
-
- // aapt resource value: 0x7F07007C
- public const int highlight_alpha_material_colored = 2131165308;
-
- // aapt resource value: 0x7F07007D
- public const int highlight_alpha_material_dark = 2131165309;
-
- // aapt resource value: 0x7F07007E
- public const int highlight_alpha_material_light = 2131165310;
-
- // aapt resource value: 0x7F07007F
- public const int hint_alpha_material_dark = 2131165311;
-
- // aapt resource value: 0x7F070080
- public const int hint_alpha_material_light = 2131165312;
-
- // aapt resource value: 0x7F070081
- public const int hint_pressed_alpha_material_dark = 2131165313;
-
- // aapt resource value: 0x7F070082
- public const int hint_pressed_alpha_material_light = 2131165314;
-
- // aapt resource value: 0x7F070083
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
-
- // aapt resource value: 0x7F070084
- public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
-
- // aapt resource value: 0x7F070085
- public const int item_touch_helper_swipe_escape_velocity = 2131165317;
-
- // aapt resource value: 0x7F070086
- public const int notification_action_icon_size = 2131165318;
-
- // aapt resource value: 0x7F070087
- public const int notification_action_text_size = 2131165319;
-
- // aapt resource value: 0x7F070088
- public const int notification_big_circle_margin = 2131165320;
-
- // aapt resource value: 0x7F070089
- public const int notification_content_margin_start = 2131165321;
-
- // aapt resource value: 0x7F07008A
- public const int notification_large_icon_height = 2131165322;
-
- // aapt resource value: 0x7F07008B
- public const int notification_large_icon_width = 2131165323;
-
- // aapt resource value: 0x7F07008C
- public const int notification_main_column_padding_top = 2131165324;
-
- // aapt resource value: 0x7F07008D
- public const int notification_media_narrow_margin = 2131165325;
-
- // aapt resource value: 0x7F07008E
- public const int notification_right_icon_size = 2131165326;
-
- // aapt resource value: 0x7F07008F
- public const int notification_right_side_padding_top = 2131165327;
-
- // aapt resource value: 0x7F070090
- public const int notification_small_icon_background_padding = 2131165328;
-
- // aapt resource value: 0x7F070091
- public const int notification_small_icon_size_as_large = 2131165329;
-
- // aapt resource value: 0x7F070092
- public const int notification_subtext_size = 2131165330;
-
- // aapt resource value: 0x7F070093
- public const int notification_top_pad = 2131165331;
-
- // aapt resource value: 0x7F070094
- public const int notification_top_pad_large_text = 2131165332;
-
- // aapt resource value: 0x7F070095
- public const int pickerview_textsize = 2131165333;
-
- // aapt resource value: 0x7F070096
- public const int pickerview_topbar_btn_textsize = 2131165334;
-
- // aapt resource value: 0x7F070097
- public const int pickerview_topbar_height = 2131165335;
-
- // aapt resource value: 0x7F070098
- public const int pickerview_topbar_padding = 2131165336;
-
- // aapt resource value: 0x7F070099
- public const int pickerview_topbar_title_textsize = 2131165337;
-
- // aapt resource value: 0x7F07009A
- public const int tooltip_corner_radius = 2131165338;
-
- // aapt resource value: 0x7F07009B
- public const int tooltip_horizontal_padding = 2131165339;
-
- // aapt resource value: 0x7F07009C
- public const int tooltip_margin = 2131165340;
-
- // aapt resource value: 0x7F07009D
- public const int tooltip_precise_anchor_extra_offset = 2131165341;
-
- // aapt resource value: 0x7F07009E
- public const int tooltip_precise_anchor_threshold = 2131165342;
-
- // aapt resource value: 0x7F07009F
- public const int tooltip_vertical_padding = 2131165343;
-
- // aapt resource value: 0x7F0700A0
- public const int tooltip_y_offset_non_touch = 2131165344;
-
- // aapt resource value: 0x7F0700A1
- public const int tooltip_y_offset_touch = 2131165345;
-
+
+ // aapt resource value: 0x7f080012
+ public const int abc_action_bar_content_inset_material = 2131230738;
+
+ // aapt resource value: 0x7f080013
+ public const int abc_action_bar_content_inset_with_nav = 2131230739;
+
+ // aapt resource value: 0x7f080007
+ public const int abc_action_bar_default_height_material = 2131230727;
+
+ // aapt resource value: 0x7f080014
+ public const int abc_action_bar_default_padding_end_material = 2131230740;
+
+ // aapt resource value: 0x7f080015
+ public const int abc_action_bar_default_padding_start_material = 2131230741;
+
+ // aapt resource value: 0x7f080017
+ public const int abc_action_bar_elevation_material = 2131230743;
+
+ // aapt resource value: 0x7f080018
+ public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
+
+ // aapt resource value: 0x7f080019
+ public const int abc_action_bar_overflow_padding_end_material = 2131230745;
+
+ // aapt resource value: 0x7f08001a
+ public const int abc_action_bar_overflow_padding_start_material = 2131230746;
+
+ // aapt resource value: 0x7f080008
+ public const int abc_action_bar_progress_bar_size = 2131230728;
+
+ // aapt resource value: 0x7f08001b
+ public const int abc_action_bar_stacked_max_height = 2131230747;
+
+ // aapt resource value: 0x7f08001c
+ public const int abc_action_bar_stacked_tab_max_width = 2131230748;
+
+ // aapt resource value: 0x7f08001d
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
+
+ // aapt resource value: 0x7f08001e
+ public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
+
+ // aapt resource value: 0x7f08001f
+ public const int abc_action_button_min_height_material = 2131230751;
+
+ // aapt resource value: 0x7f080020
+ public const int abc_action_button_min_width_material = 2131230752;
+
+ // aapt resource value: 0x7f080021
+ public const int abc_action_button_min_width_overflow_material = 2131230753;
+
+ // aapt resource value: 0x7f080006
+ public const int abc_alert_dialog_button_bar_height = 2131230726;
+
+ // aapt resource value: 0x7f080022
+ public const int abc_button_inset_horizontal_material = 2131230754;
+
+ // aapt resource value: 0x7f080023
+ public const int abc_button_inset_vertical_material = 2131230755;
+
+ // aapt resource value: 0x7f080024
+ public const int abc_button_padding_horizontal_material = 2131230756;
+
+ // aapt resource value: 0x7f080025
+ public const int abc_button_padding_vertical_material = 2131230757;
+
+ // aapt resource value: 0x7f080026
+ public const int abc_cascading_menus_min_smallest_width = 2131230758;
+
+ // aapt resource value: 0x7f08000b
+ public const int abc_config_prefDialogWidth = 2131230731;
+
+ // aapt resource value: 0x7f080027
+ public const int abc_control_corner_material = 2131230759;
+
+ // aapt resource value: 0x7f080028
+ public const int abc_control_inset_material = 2131230760;
+
+ // aapt resource value: 0x7f080029
+ public const int abc_control_padding_material = 2131230761;
+
+ // aapt resource value: 0x7f08000c
+ public const int abc_dialog_fixed_height_major = 2131230732;
+
+ // aapt resource value: 0x7f08000d
+ public const int abc_dialog_fixed_height_minor = 2131230733;
+
+ // aapt resource value: 0x7f08000e
+ public const int abc_dialog_fixed_width_major = 2131230734;
+
+ // aapt resource value: 0x7f08000f
+ public const int abc_dialog_fixed_width_minor = 2131230735;
+
+ // aapt resource value: 0x7f08002a
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
+
+ // aapt resource value: 0x7f08002b
+ public const int abc_dialog_list_padding_top_no_title = 2131230763;
+
+ // aapt resource value: 0x7f080010
+ public const int abc_dialog_min_width_major = 2131230736;
+
+ // aapt resource value: 0x7f080011
+ public const int abc_dialog_min_width_minor = 2131230737;
+
+ // aapt resource value: 0x7f08002c
+ public const int abc_dialog_padding_material = 2131230764;
+
+ // aapt resource value: 0x7f08002d
+ public const int abc_dialog_padding_top_material = 2131230765;
+
+ // aapt resource value: 0x7f08002e
+ public const int abc_dialog_title_divider_material = 2131230766;
+
+ // aapt resource value: 0x7f08002f
+ public const int abc_disabled_alpha_material_dark = 2131230767;
+
+ // aapt resource value: 0x7f080030
+ public const int abc_disabled_alpha_material_light = 2131230768;
+
+ // aapt resource value: 0x7f080031
+ public const int abc_dropdownitem_icon_width = 2131230769;
+
+ // aapt resource value: 0x7f080032
+ public const int abc_dropdownitem_text_padding_left = 2131230770;
+
+ // aapt resource value: 0x7f080033
+ public const int abc_dropdownitem_text_padding_right = 2131230771;
+
+ // aapt resource value: 0x7f080034
+ public const int abc_edit_text_inset_bottom_material = 2131230772;
+
+ // aapt resource value: 0x7f080035
+ public const int abc_edit_text_inset_horizontal_material = 2131230773;
+
+ // aapt resource value: 0x7f080036
+ public const int abc_edit_text_inset_top_material = 2131230774;
+
+ // aapt resource value: 0x7f080037
+ public const int abc_floating_window_z = 2131230775;
+
+ // aapt resource value: 0x7f080038
+ public const int abc_list_item_padding_horizontal_material = 2131230776;
+
+ // aapt resource value: 0x7f080039
+ public const int abc_panel_menu_list_width = 2131230777;
+
+ // aapt resource value: 0x7f08003a
+ public const int abc_progress_bar_height_material = 2131230778;
+
+ // aapt resource value: 0x7f08003b
+ public const int abc_search_view_preferred_height = 2131230779;
+
+ // aapt resource value: 0x7f08003c
+ public const int abc_search_view_preferred_width = 2131230780;
+
+ // aapt resource value: 0x7f08003d
+ public const int abc_seekbar_track_background_height_material = 2131230781;
+
+ // aapt resource value: 0x7f08003e
+ public const int abc_seekbar_track_progress_height_material = 2131230782;
+
+ // aapt resource value: 0x7f08003f
+ public const int abc_select_dialog_padding_start_material = 2131230783;
+
+ // aapt resource value: 0x7f080016
+ public const int abc_switch_padding = 2131230742;
+
+ // aapt resource value: 0x7f080040
+ public const int abc_text_size_body_1_material = 2131230784;
+
+ // aapt resource value: 0x7f080041
+ public const int abc_text_size_body_2_material = 2131230785;
+
+ // aapt resource value: 0x7f080042
+ public const int abc_text_size_button_material = 2131230786;
+
+ // aapt resource value: 0x7f080043
+ public const int abc_text_size_caption_material = 2131230787;
+
+ // aapt resource value: 0x7f080044
+ public const int abc_text_size_display_1_material = 2131230788;
+
+ // aapt resource value: 0x7f080045
+ public const int abc_text_size_display_2_material = 2131230789;
+
+ // aapt resource value: 0x7f080046
+ public const int abc_text_size_display_3_material = 2131230790;
+
+ // aapt resource value: 0x7f080047
+ public const int abc_text_size_display_4_material = 2131230791;
+
+ // aapt resource value: 0x7f080048
+ public const int abc_text_size_headline_material = 2131230792;
+
+ // aapt resource value: 0x7f080049
+ public const int abc_text_size_large_material = 2131230793;
+
+ // aapt resource value: 0x7f08004a
+ public const int abc_text_size_medium_material = 2131230794;
+
+ // aapt resource value: 0x7f08004b
+ public const int abc_text_size_menu_header_material = 2131230795;
+
+ // aapt resource value: 0x7f08004c
+ public const int abc_text_size_menu_material = 2131230796;
+
+ // aapt resource value: 0x7f08004d
+ public const int abc_text_size_small_material = 2131230797;
+
+ // aapt resource value: 0x7f08004e
+ public const int abc_text_size_subhead_material = 2131230798;
+
+ // aapt resource value: 0x7f080009
+ public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+
+ // aapt resource value: 0x7f08004f
+ public const int abc_text_size_title_material = 2131230799;
+
+ // aapt resource value: 0x7f08000a
+ public const int abc_text_size_title_material_toolbar = 2131230730;
+
+ // aapt resource value: 0x7f08008b
+ public const int compat_button_inset_horizontal_material = 2131230859;
+
+ // aapt resource value: 0x7f08008c
+ public const int compat_button_inset_vertical_material = 2131230860;
+
+ // aapt resource value: 0x7f08008d
+ public const int compat_button_padding_horizontal_material = 2131230861;
+
+ // aapt resource value: 0x7f08008e
+ public const int compat_button_padding_vertical_material = 2131230862;
+
+ // aapt resource value: 0x7f08008f
+ public const int compat_control_corner_material = 2131230863;
+
+ // aapt resource value: 0x7f080069
+ public const int design_appbar_elevation = 2131230825;
+
+ // aapt resource value: 0x7f08006a
+ public const int design_bottom_navigation_active_item_max_width = 2131230826;
+
+ // aapt resource value: 0x7f08006b
+ public const int design_bottom_navigation_active_text_size = 2131230827;
+
+ // aapt resource value: 0x7f08006c
+ public const int design_bottom_navigation_elevation = 2131230828;
+
+ // aapt resource value: 0x7f08006d
+ public const int design_bottom_navigation_height = 2131230829;
+
+ // aapt resource value: 0x7f08006e
+ public const int design_bottom_navigation_item_max_width = 2131230830;
+
+ // aapt resource value: 0x7f08006f
+ public const int design_bottom_navigation_item_min_width = 2131230831;
+
+ // aapt resource value: 0x7f080070
+ public const int design_bottom_navigation_margin = 2131230832;
+
+ // aapt resource value: 0x7f080071
+ public const int design_bottom_navigation_shadow_height = 2131230833;
+
+ // aapt resource value: 0x7f080072
+ public const int design_bottom_navigation_text_size = 2131230834;
+
+ // aapt resource value: 0x7f080073
+ public const int design_bottom_sheet_modal_elevation = 2131230835;
+
+ // aapt resource value: 0x7f080074
+ public const int design_bottom_sheet_peek_height_min = 2131230836;
+
+ // aapt resource value: 0x7f080075
+ public const int design_fab_border_width = 2131230837;
+
+ // aapt resource value: 0x7f080076
+ public const int design_fab_elevation = 2131230838;
+
+ // aapt resource value: 0x7f080077
+ public const int design_fab_image_size = 2131230839;
+
+ // aapt resource value: 0x7f080078
+ public const int design_fab_size_mini = 2131230840;
+
+ // aapt resource value: 0x7f080079
+ public const int design_fab_size_normal = 2131230841;
+
+ // aapt resource value: 0x7f08007a
+ public const int design_fab_translation_z_pressed = 2131230842;
+
+ // aapt resource value: 0x7f08007b
+ public const int design_navigation_elevation = 2131230843;
+
+ // aapt resource value: 0x7f08007c
+ public const int design_navigation_icon_padding = 2131230844;
+
+ // aapt resource value: 0x7f08007d
+ public const int design_navigation_icon_size = 2131230845;
+
+ // aapt resource value: 0x7f080061
+ public const int design_navigation_max_width = 2131230817;
+
+ // aapt resource value: 0x7f08007e
+ public const int design_navigation_padding_bottom = 2131230846;
+
+ // aapt resource value: 0x7f08007f
+ public const int design_navigation_separator_vertical_padding = 2131230847;
+
+ // aapt resource value: 0x7f080062
+ public const int design_snackbar_action_inline_max_width = 2131230818;
+
+ // aapt resource value: 0x7f080063
+ public const int design_snackbar_background_corner_radius = 2131230819;
+
+ // aapt resource value: 0x7f080080
+ public const int design_snackbar_elevation = 2131230848;
+
+ // aapt resource value: 0x7f080064
+ public const int design_snackbar_extra_spacing_horizontal = 2131230820;
+
+ // aapt resource value: 0x7f080065
+ public const int design_snackbar_max_width = 2131230821;
+
+ // aapt resource value: 0x7f080066
+ public const int design_snackbar_min_width = 2131230822;
+
+ // aapt resource value: 0x7f080081
+ public const int design_snackbar_padding_horizontal = 2131230849;
+
+ // aapt resource value: 0x7f080082
+ public const int design_snackbar_padding_vertical = 2131230850;
+
+ // aapt resource value: 0x7f080067
+ public const int design_snackbar_padding_vertical_2lines = 2131230823;
+
+ // aapt resource value: 0x7f080083
+ public const int design_snackbar_text_size = 2131230851;
+
+ // aapt resource value: 0x7f080084
+ public const int design_tab_max_width = 2131230852;
+
+ // aapt resource value: 0x7f080068
+ public const int design_tab_scrollable_min_width = 2131230824;
+
+ // aapt resource value: 0x7f080085
+ public const int design_tab_text_size = 2131230853;
+
+ // aapt resource value: 0x7f080086
+ public const int design_tab_text_size_2line = 2131230854;
+
+ // aapt resource value: 0x7f080050
+ public const int disabled_alpha_material_dark = 2131230800;
+
+ // aapt resource value: 0x7f080051
+ public const int disabled_alpha_material_light = 2131230801;
+
+ // aapt resource value: 0x7f080000
+ public const int fastscroll_default_thickness = 2131230720;
+
+ // aapt resource value: 0x7f080001
+ public const int fastscroll_margin = 2131230721;
+
+ // aapt resource value: 0x7f080002
+ public const int fastscroll_minimum_range = 2131230722;
+
+ // aapt resource value: 0x7f08009c
+ public const int fingerprint_icon_size = 2131230876;
+
+ // aapt resource value: 0x7f08009b
+ public const int fingerprint_status_layout_margin_vertical = 2131230875;
+
+ // aapt resource value: 0x7f080052
+ public const int highlight_alpha_material_colored = 2131230802;
+
+ // aapt resource value: 0x7f080053
+ public const int highlight_alpha_material_dark = 2131230803;
+
+ // aapt resource value: 0x7f080054
+ public const int highlight_alpha_material_light = 2131230804;
+
+ // aapt resource value: 0x7f080055
+ public const int hint_alpha_material_dark = 2131230805;
+
+ // aapt resource value: 0x7f080056
+ public const int hint_alpha_material_light = 2131230806;
+
+ // aapt resource value: 0x7f080057
+ public const int hint_pressed_alpha_material_dark = 2131230807;
+
+ // aapt resource value: 0x7f080058
+ public const int hint_pressed_alpha_material_light = 2131230808;
+
+ // aapt resource value: 0x7f080003
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+
+ // aapt resource value: 0x7f080004
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+
+ // aapt resource value: 0x7f080005
+ public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+
+ // aapt resource value: 0x7f080090
+ public const int notification_action_icon_size = 2131230864;
+
+ // aapt resource value: 0x7f080091
+ public const int notification_action_text_size = 2131230865;
+
+ // aapt resource value: 0x7f080092
+ public const int notification_big_circle_margin = 2131230866;
+
+ // aapt resource value: 0x7f080088
+ public const int notification_content_margin_start = 2131230856;
+
+ // aapt resource value: 0x7f080093
+ public const int notification_large_icon_height = 2131230867;
+
+ // aapt resource value: 0x7f080094
+ public const int notification_large_icon_width = 2131230868;
+
+ // aapt resource value: 0x7f080089
+ public const int notification_main_column_padding_top = 2131230857;
+
+ // aapt resource value: 0x7f08008a
+ public const int notification_media_narrow_margin = 2131230858;
+
+ // aapt resource value: 0x7f080095
+ public const int notification_right_icon_size = 2131230869;
+
+ // aapt resource value: 0x7f080087
+ public const int notification_right_side_padding_top = 2131230855;
+
+ // aapt resource value: 0x7f080096
+ public const int notification_small_icon_background_padding = 2131230870;
+
+ // aapt resource value: 0x7f080097
+ public const int notification_small_icon_size_as_large = 2131230871;
+
+ // aapt resource value: 0x7f080098
+ public const int notification_subtext_size = 2131230872;
+
+ // aapt resource value: 0x7f080099
+ public const int notification_top_pad = 2131230873;
+
+ // aapt resource value: 0x7f08009a
+ public const int notification_top_pad_large_text = 2131230874;
+
+ // aapt resource value: 0x7f08009d
+ public const int pickerview_textsize = 2131230877;
+
+ // aapt resource value: 0x7f08009e
+ public const int pickerview_topbar_btn_textsize = 2131230878;
+
+ // aapt resource value: 0x7f08009f
+ public const int pickerview_topbar_height = 2131230879;
+
+ // aapt resource value: 0x7f0800a0
+ public const int pickerview_topbar_padding = 2131230880;
+
+ // aapt resource value: 0x7f0800a1
+ public const int pickerview_topbar_title_textsize = 2131230881;
+
+ // aapt resource value: 0x7f080059
+ public const int tooltip_corner_radius = 2131230809;
+
+ // aapt resource value: 0x7f08005a
+ public const int tooltip_horizontal_padding = 2131230810;
+
+ // aapt resource value: 0x7f08005b
+ public const int tooltip_margin = 2131230811;
+
+ // aapt resource value: 0x7f08005c
+ public const int tooltip_precise_anchor_extra_offset = 2131230812;
+
+ // aapt resource value: 0x7f08005d
+ public const int tooltip_precise_anchor_threshold = 2131230813;
+
+ // aapt resource value: 0x7f08005e
+ public const int tooltip_vertical_padding = 2131230814;
+
+ // aapt resource value: 0x7f08005f
+ public const int tooltip_y_offset_non_touch = 2131230815;
+
+ // aapt resource value: 0x7f080060
+ public const int tooltip_y_offset_touch = 2131230816;
+
static Dimension()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Dimension()
{
}
}
-
+
public partial class Drawable
{
-
- // aapt resource value: 0x7F080006
- public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
-
- // aapt resource value: 0x7F080007
- public const int abc_action_bar_item_background_material = 2131230727;
-
- // aapt resource value: 0x7F080008
- public const int abc_btn_borderless_material = 2131230728;
-
- // aapt resource value: 0x7F080009
- public const int abc_btn_check_material = 2131230729;
-
- // aapt resource value: 0x7F08000A
- public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
-
- // aapt resource value: 0x7F08000B
- public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
-
- // aapt resource value: 0x7F08000C
- public const int abc_btn_colored_material = 2131230732;
-
- // aapt resource value: 0x7F08000D
- public const int abc_btn_default_mtrl_shape = 2131230733;
-
- // aapt resource value: 0x7F08000E
- public const int abc_btn_radio_material = 2131230734;
-
- // aapt resource value: 0x7F08000F
- public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
-
- // aapt resource value: 0x7F080010
- public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
-
- // aapt resource value: 0x7F080011
- public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
-
- // aapt resource value: 0x7F080012
- public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
-
- // aapt resource value: 0x7F080013
- public const int abc_cab_background_internal_bg = 2131230739;
-
- // aapt resource value: 0x7F080014
- public const int abc_cab_background_top_material = 2131230740;
-
- // aapt resource value: 0x7F080015
- public const int abc_cab_background_top_mtrl_alpha = 2131230741;
-
- // aapt resource value: 0x7F080016
- public const int abc_control_background_material = 2131230742;
-
- // aapt resource value: 0x7F080017
- public const int abc_dialog_material_background = 2131230743;
-
- // aapt resource value: 0x7F080018
- public const int abc_edit_text_material = 2131230744;
-
- // aapt resource value: 0x7F080019
- public const int abc_ic_ab_back_material = 2131230745;
-
- // aapt resource value: 0x7F08001A
- public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
-
- // aapt resource value: 0x7F08001B
- public const int abc_ic_clear_material = 2131230747;
-
- // aapt resource value: 0x7F08001C
- public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
-
- // aapt resource value: 0x7F08001D
- public const int abc_ic_go_search_api_material = 2131230749;
-
- // aapt resource value: 0x7F08001E
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
-
- // aapt resource value: 0x7F08001F
- public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
-
- // aapt resource value: 0x7F080020
- public const int abc_ic_menu_overflow_material = 2131230752;
-
- // aapt resource value: 0x7F080021
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
-
- // aapt resource value: 0x7F080022
- public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
-
- // aapt resource value: 0x7F080023
- public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
-
- // aapt resource value: 0x7F080024
- public const int abc_ic_search_api_material = 2131230756;
-
- // aapt resource value: 0x7F080025
- public const int abc_ic_star_black_16dp = 2131230757;
-
- // aapt resource value: 0x7F080026
- public const int abc_ic_star_black_36dp = 2131230758;
-
- // aapt resource value: 0x7F080027
- public const int abc_ic_star_black_48dp = 2131230759;
-
- // aapt resource value: 0x7F080028
- public const int abc_ic_star_half_black_16dp = 2131230760;
-
- // aapt resource value: 0x7F080029
- public const int abc_ic_star_half_black_36dp = 2131230761;
-
- // aapt resource value: 0x7F08002A
- public const int abc_ic_star_half_black_48dp = 2131230762;
-
- // aapt resource value: 0x7F08002B
- public const int abc_ic_voice_search_api_material = 2131230763;
-
- // aapt resource value: 0x7F08002C
- public const int abc_item_background_holo_dark = 2131230764;
-
- // aapt resource value: 0x7F08002D
- public const int abc_item_background_holo_light = 2131230765;
-
- // aapt resource value: 0x7F08002E
- public const int abc_list_divider_mtrl_alpha = 2131230766;
-
- // aapt resource value: 0x7F08002F
- public const int abc_list_focused_holo = 2131230767;
-
- // aapt resource value: 0x7F080030
- public const int abc_list_longpressed_holo = 2131230768;
-
- // aapt resource value: 0x7F080031
- public const int abc_list_pressed_holo_dark = 2131230769;
-
- // aapt resource value: 0x7F080032
- public const int abc_list_pressed_holo_light = 2131230770;
-
- // aapt resource value: 0x7F080033
- public const int abc_list_selector_background_transition_holo_dark = 2131230771;
-
- // aapt resource value: 0x7F080034
- public const int abc_list_selector_background_transition_holo_light = 2131230772;
-
- // aapt resource value: 0x7F080035
- public const int abc_list_selector_disabled_holo_dark = 2131230773;
-
- // aapt resource value: 0x7F080036
- public const int abc_list_selector_disabled_holo_light = 2131230774;
-
- // aapt resource value: 0x7F080037
- public const int abc_list_selector_holo_dark = 2131230775;
-
- // aapt resource value: 0x7F080038
- public const int abc_list_selector_holo_light = 2131230776;
-
- // aapt resource value: 0x7F080039
- public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
-
- // aapt resource value: 0x7F08003A
- public const int abc_popup_background_mtrl_mult = 2131230778;
-
- // aapt resource value: 0x7F08003B
- public const int abc_ratingbar_indicator_material = 2131230779;
-
- // aapt resource value: 0x7F08003C
- public const int abc_ratingbar_material = 2131230780;
-
- // aapt resource value: 0x7F08003D
- public const int abc_ratingbar_small_material = 2131230781;
-
- // aapt resource value: 0x7F08003E
- public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
-
- // aapt resource value: 0x7F08003F
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
-
- // aapt resource value: 0x7F080040
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
-
- // aapt resource value: 0x7F080041
- public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
-
- // aapt resource value: 0x7F080042
- public const int abc_scrubber_track_mtrl_alpha = 2131230786;
-
- // aapt resource value: 0x7F080043
- public const int abc_seekbar_thumb_material = 2131230787;
-
- // aapt resource value: 0x7F080044
- public const int abc_seekbar_tick_mark_material = 2131230788;
-
- // aapt resource value: 0x7F080045
- public const int abc_seekbar_track_material = 2131230789;
-
- // aapt resource value: 0x7F080046
- public const int abc_spinner_mtrl_am_alpha = 2131230790;
-
- // aapt resource value: 0x7F080047
- public const int abc_spinner_textfield_background_material = 2131230791;
-
- // aapt resource value: 0x7F080048
- public const int abc_switch_thumb_material = 2131230792;
-
- // aapt resource value: 0x7F080049
- public const int abc_switch_track_mtrl_alpha = 2131230793;
-
- // aapt resource value: 0x7F08004A
- public const int abc_tab_indicator_material = 2131230794;
-
- // aapt resource value: 0x7F08004B
- public const int abc_tab_indicator_mtrl_alpha = 2131230795;
-
- // aapt resource value: 0x7F080053
- public const int abc_textfield_activated_mtrl_alpha = 2131230803;
-
- // aapt resource value: 0x7F080054
- public const int abc_textfield_default_mtrl_alpha = 2131230804;
-
- // aapt resource value: 0x7F080055
- public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
-
- // aapt resource value: 0x7F080056
- public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
-
- // aapt resource value: 0x7F080057
- public const int abc_textfield_search_material = 2131230807;
-
- // aapt resource value: 0x7F08004C
- public const int abc_text_cursor_material = 2131230796;
-
- // aapt resource value: 0x7F08004D
- public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
-
- // aapt resource value: 0x7F08004E
- public const int abc_text_select_handle_left_mtrl_light = 2131230798;
-
- // aapt resource value: 0x7F08004F
- public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
-
- // aapt resource value: 0x7F080050
- public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
-
- // aapt resource value: 0x7F080051
- public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
-
- // aapt resource value: 0x7F080052
- public const int abc_text_select_handle_right_mtrl_light = 2131230802;
-
- // aapt resource value: 0x7F080058
- public const int abc_vector_test = 2131230808;
-
- // aapt resource value: 0x7F080059
- public const int avd_hide_password = 2131230809;
-
- // aapt resource value: 0x7F08005A
- public const int avd_show_password = 2131230810;
-
- // aapt resource value: 0x7F08005B
- public const int design_bottom_navigation_item_background = 2131230811;
-
- // aapt resource value: 0x7F08005C
- public const int design_fab_background = 2131230812;
-
- // aapt resource value: 0x7F08005D
- public const int design_ic_visibility = 2131230813;
-
- // aapt resource value: 0x7F08005E
- public const int design_ic_visibility_off = 2131230814;
-
- // aapt resource value: 0x7F08005F
- public const int design_password_eye = 2131230815;
-
- // aapt resource value: 0x7F080060
- public const int design_snackbar_background = 2131230816;
-
- // aapt resource value: 0x7F080061
- public const int fingerprint_draw_off = 2131230817;
-
- // aapt resource value: 0x7F080062
- public const int fingerprint_draw_off_animation = 2131230818;
-
- // aapt resource value: 0x7F080063
- public const int fingerprint_draw_on = 2131230819;
-
- // aapt resource value: 0x7F080064
- public const int fingerprint_draw_on_animation = 2131230820;
-
- // aapt resource value: 0x7F080065
- public const int fingerprint_error = 2131230821;
-
- // aapt resource value: 0x7F080066
- public const int fingerprint_error_off = 2131230822;
-
- // aapt resource value: 0x7F080067
- public const int fingerprint_error_off_animation = 2131230823;
-
- // aapt resource value: 0x7F080068
- public const int fingerprint_error_on = 2131230824;
-
- // aapt resource value: 0x7F080069
- public const int fingerprint_error_on_animation = 2131230825;
-
- // aapt resource value: 0x7F08006A
- public const int fingerprint_error_state_to_fp = 2131230826;
-
- // aapt resource value: 0x7F08006B
- public const int fingerprint_error_state_to_fp_animation = 2131230827;
-
- // aapt resource value: 0x7F08006C
- public const int fingerprint_fingerprint = 2131230828;
-
- // aapt resource value: 0x7F08006D
- public const int fingerprint_fp_to_error_state = 2131230829;
-
- // aapt resource value: 0x7F08006E
- public const int fingerprint_fp_to_error_state_animation = 2131230830;
-
- // aapt resource value: 0x7F08006F
- public const int gd_btn_shape_app_b = 2131230831;
-
- // aapt resource value: 0x7F080070
- public const int gd_btn_shape_app_g = 2131230832;
-
- // aapt resource value: 0x7F080071
- public const int gd_btn_shape_app_w = 2131230833;
-
- // aapt resource value: 0x7F080072
- public const int gd_btn_shape_shadow_w = 2131230834;
-
- // aapt resource value: 0x7F080073
- public const int gd_click_effect_select = 2131230835;
-
+
+ // aapt resource value: 0x7f020000
+ public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+
+ // aapt resource value: 0x7f020001
+ public const int abc_action_bar_item_background_material = 2130837505;
+
+ // aapt resource value: 0x7f020002
+ public const int abc_btn_borderless_material = 2130837506;
+
+ // aapt resource value: 0x7f020003
+ public const int abc_btn_check_material = 2130837507;
+
+ // aapt resource value: 0x7f020004
+ public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+
+ // aapt resource value: 0x7f020005
+ public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+
+ // aapt resource value: 0x7f020006
+ public const int abc_btn_colored_material = 2130837510;
+
+ // aapt resource value: 0x7f020007
+ public const int abc_btn_default_mtrl_shape = 2130837511;
+
+ // aapt resource value: 0x7f020008
+ public const int abc_btn_radio_material = 2130837512;
+
+ // aapt resource value: 0x7f020009
+ public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+
+ // aapt resource value: 0x7f02000a
+ public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+
+ // aapt resource value: 0x7f02000b
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+
+ // aapt resource value: 0x7f02000c
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+
+ // aapt resource value: 0x7f02000d
+ public const int abc_cab_background_internal_bg = 2130837517;
+
+ // aapt resource value: 0x7f02000e
+ public const int abc_cab_background_top_material = 2130837518;
+
+ // aapt resource value: 0x7f02000f
+ public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+
+ // aapt resource value: 0x7f020010
+ public const int abc_control_background_material = 2130837520;
+
+ // aapt resource value: 0x7f020011
+ public const int abc_dialog_material_background = 2130837521;
+
+ // aapt resource value: 0x7f020012
+ public const int abc_edit_text_material = 2130837522;
+
+ // aapt resource value: 0x7f020013
+ public const int abc_ic_ab_back_material = 2130837523;
+
+ // aapt resource value: 0x7f020014
+ public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+
+ // aapt resource value: 0x7f020015
+ public const int abc_ic_clear_material = 2130837525;
+
+ // aapt resource value: 0x7f020016
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+
+ // aapt resource value: 0x7f020017
+ public const int abc_ic_go_search_api_material = 2130837527;
+
+ // aapt resource value: 0x7f020018
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+
+ // aapt resource value: 0x7f020019
+ public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+
+ // aapt resource value: 0x7f02001a
+ public const int abc_ic_menu_overflow_material = 2130837530;
+
+ // aapt resource value: 0x7f02001b
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+
+ // aapt resource value: 0x7f02001c
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+
+ // aapt resource value: 0x7f02001d
+ public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+
+ // aapt resource value: 0x7f02001e
+ public const int abc_ic_search_api_material = 2130837534;
+
+ // aapt resource value: 0x7f02001f
+ public const int abc_ic_star_black_16dp = 2130837535;
+
+ // aapt resource value: 0x7f020020
+ public const int abc_ic_star_black_36dp = 2130837536;
+
+ // aapt resource value: 0x7f020021
+ public const int abc_ic_star_black_48dp = 2130837537;
+
+ // aapt resource value: 0x7f020022
+ public const int abc_ic_star_half_black_16dp = 2130837538;
+
+ // aapt resource value: 0x7f020023
+ public const int abc_ic_star_half_black_36dp = 2130837539;
+
+ // aapt resource value: 0x7f020024
+ public const int abc_ic_star_half_black_48dp = 2130837540;
+
+ // aapt resource value: 0x7f020025
+ public const int abc_ic_voice_search_api_material = 2130837541;
+
+ // aapt resource value: 0x7f020026
+ public const int abc_item_background_holo_dark = 2130837542;
+
+ // aapt resource value: 0x7f020027
+ public const int abc_item_background_holo_light = 2130837543;
+
+ // aapt resource value: 0x7f020028
+ public const int abc_list_divider_mtrl_alpha = 2130837544;
+
+ // aapt resource value: 0x7f020029
+ public const int abc_list_focused_holo = 2130837545;
+
+ // aapt resource value: 0x7f02002a
+ public const int abc_list_longpressed_holo = 2130837546;
+
+ // aapt resource value: 0x7f02002b
+ public const int abc_list_pressed_holo_dark = 2130837547;
+
+ // aapt resource value: 0x7f02002c
+ public const int abc_list_pressed_holo_light = 2130837548;
+
+ // aapt resource value: 0x7f02002d
+ public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+
+ // aapt resource value: 0x7f02002e
+ public const int abc_list_selector_background_transition_holo_light = 2130837550;
+
+ // aapt resource value: 0x7f02002f
+ public const int abc_list_selector_disabled_holo_dark = 2130837551;
+
+ // aapt resource value: 0x7f020030
+ public const int abc_list_selector_disabled_holo_light = 2130837552;
+
+ // aapt resource value: 0x7f020031
+ public const int abc_list_selector_holo_dark = 2130837553;
+
+ // aapt resource value: 0x7f020032
+ public const int abc_list_selector_holo_light = 2130837554;
+
+ // aapt resource value: 0x7f020033
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+
+ // aapt resource value: 0x7f020034
+ public const int abc_popup_background_mtrl_mult = 2130837556;
+
+ // aapt resource value: 0x7f020035
+ public const int abc_ratingbar_indicator_material = 2130837557;
+
+ // aapt resource value: 0x7f020036
+ public const int abc_ratingbar_material = 2130837558;
+
+ // aapt resource value: 0x7f020037
+ public const int abc_ratingbar_small_material = 2130837559;
+
+ // aapt resource value: 0x7f020038
+ public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+
+ // aapt resource value: 0x7f020039
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+
+ // aapt resource value: 0x7f02003a
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+
+ // aapt resource value: 0x7f02003b
+ public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+
+ // aapt resource value: 0x7f02003c
+ public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+
+ // aapt resource value: 0x7f02003d
+ public const int abc_seekbar_thumb_material = 2130837565;
+
+ // aapt resource value: 0x7f02003e
+ public const int abc_seekbar_tick_mark_material = 2130837566;
+
+ // aapt resource value: 0x7f02003f
+ public const int abc_seekbar_track_material = 2130837567;
+
+ // aapt resource value: 0x7f020040
+ public const int abc_spinner_mtrl_am_alpha = 2130837568;
+
+ // aapt resource value: 0x7f020041
+ public const int abc_spinner_textfield_background_material = 2130837569;
+
+ // aapt resource value: 0x7f020042
+ public const int abc_switch_thumb_material = 2130837570;
+
+ // aapt resource value: 0x7f020043
+ public const int abc_switch_track_mtrl_alpha = 2130837571;
+
+ // aapt resource value: 0x7f020044
+ public const int abc_tab_indicator_material = 2130837572;
+
+ // aapt resource value: 0x7f020045
+ public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+
+ // aapt resource value: 0x7f020046
+ public const int abc_text_cursor_material = 2130837574;
+
+ // aapt resource value: 0x7f020047
+ public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+
+ // aapt resource value: 0x7f020048
+ public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+
+ // aapt resource value: 0x7f020049
+ public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+
+ // aapt resource value: 0x7f02004a
+ public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+
+ // 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: 0x7f020052
+ public const int abc_vector_test = 2130837586;
+
+ // aapt resource value: 0x7f020053
+ public const int avd_hide_password = 2130837587;
+
+ // aapt resource value: 0x7f02009e
+ public const int avd_hide_password_1 = 2130837662;
+
+ // aapt resource value: 0x7f02009f
+ public const int avd_hide_password_2 = 2130837663;
+
+ // aapt resource value: 0x7f0200a0
+ public const int avd_hide_password_3 = 2130837664;
+
+ // aapt resource value: 0x7f020054
+ public const int avd_show_password = 2130837588;
+
+ // aapt resource value: 0x7f0200a1
+ public const int avd_show_password_1 = 2130837665;
+
+ // aapt resource value: 0x7f0200a2
+ public const int avd_show_password_2 = 2130837666;
+
+ // aapt resource value: 0x7f0200a3
+ public const int avd_show_password_3 = 2130837667;
+
+ // aapt resource value: 0x7f020055
+ public const int design_bottom_navigation_item_background = 2130837589;
+
+ // aapt resource value: 0x7f020056
+ public const int design_fab_background = 2130837590;
+
+ // aapt resource value: 0x7f020057
+ public const int design_ic_visibility = 2130837591;
+
+ // aapt resource value: 0x7f020058
+ public const int design_ic_visibility_off = 2130837592;
+
+ // aapt resource value: 0x7f020059
+ public const int design_password_eye = 2130837593;
+
+ // aapt resource value: 0x7f02005a
+ public const int design_snackbar_background = 2130837594;
+
+ // aapt resource value: 0x7f02005b
+ public const int fingerprint_draw_off = 2130837595;
+
+ // aapt resource value: 0x7f02005c
+ public const int fingerprint_draw_off_animation = 2130837596;
+
+ // aapt resource value: 0x7f02005d
+ public const int fingerprint_draw_on = 2130837597;
+
+ // aapt resource value: 0x7f02005e
+ public const int fingerprint_draw_on_animation = 2130837598;
+
+ // aapt resource value: 0x7f02005f
+ public const int fingerprint_error = 2130837599;
+
+ // aapt resource value: 0x7f020060
+ public const int fingerprint_error_off = 2130837600;
+
+ // aapt resource value: 0x7f020061
+ public const int fingerprint_error_off_animation = 2130837601;
+
+ // aapt resource value: 0x7f020062
+ public const int fingerprint_error_on = 2130837602;
+
+ // aapt resource value: 0x7f020063
+ public const int fingerprint_error_on_animation = 2130837603;
+
+ // aapt resource value: 0x7f020064
+ public const int fingerprint_error_state_to_fp = 2130837604;
+
+ // aapt resource value: 0x7f020065
+ public const int fingerprint_error_state_to_fp_animation = 2130837605;
+
+ // aapt resource value: 0x7f020066
+ public const int fingerprint_fingerprint = 2130837606;
+
+ // aapt resource value: 0x7f020067
+ public const int fingerprint_fp_to_error_state = 2130837607;
+
// aapt resource value: 0x7F080092
public const int Icon = 2131230866;
-
- // aapt resource value: 0x7F080074
- public const int ic_gdmap_add = 2131230836;
-
- // aapt resource value: 0x7F080075
- public const int ic_gdmap_back = 2131230837;
-
- // aapt resource value: 0x7F080076
- public const int ic_gdmap_delete = 2131230838;
-
- // aapt resource value: 0x7F080077
- public const int ic_gdmap_home = 2131230839;
-
- // aapt resource value: 0x7F080078
- public const int ic_gdmap_mylocation = 2131230840;
-
- // aapt resource value: 0x7F080079
- public const int ic_gdmap_now = 2131230841;
-
- // aapt resource value: 0x7F08007A
- public const int ic_gdmap_search = 2131230842;
-
- // aapt resource value: 0x7F08007B
- public const int ic_gdmap_zoom_out = 2131230843;
-
- // aapt resource value: 0x7F08007C
- public const int ic_gps_point = 2131230844;
-
- // aapt resource value: 0x7F08007D
- public const int ic_wd_arc_scale_bg = 2131230845;
-
- // aapt resource value: 0x7F08007E
- public const int ic_wd_curtain_bg_top = 2131230846;
-
- // aapt resource value: 0x7F08007F
- public const int ic_wd_curtain_h_bg = 2131230847;
-
- // aapt resource value: 0x7F080080
- public const int ic_wd_curtain_h_open = 2131230848;
-
- // aapt resource value: 0x7F080081
- public const int ic_wd_curtain_h_progress = 2131230849;
-
- // aapt resource value: 0x7F080082
- public const int ic_wd_curtain_h_top = 2131230850;
-
- // aapt resource value: 0x7F080083
- public const int ic_wd_curtain_open = 2131230851;
-
- // aapt resource value: 0x7F080084
- public const int ic_wd_curtain_roll_bg = 2131230852;
-
- // aapt resource value: 0x7F080085
- public const int ic_wd_curtain_roll_progress = 2131230853;
-
+
+ // aapt resource value: 0x7f020069
+ public const int gd_btn_shape_app_b = 2130837609;
+
+ // aapt resource value: 0x7f02006a
+ public const int gd_btn_shape_app_g = 2130837610;
+
+ // aapt resource value: 0x7f02006b
+ public const int gd_btn_shape_app_w = 2130837611;
+
+ // aapt resource value: 0x7f02006c
+ public const int gd_btn_shape_shadow_w = 2130837612;
+
+ // aapt resource value: 0x7f02006d
+ public const int gd_click_effect_select = 2130837613;
+
+ // aapt resource value: 0x7f02006e
+ public const int ic_gdmap_add = 2130837614;
+
+ // aapt resource value: 0x7f02006f
+ public const int ic_gdmap_back = 2130837615;
+
+ // aapt resource value: 0x7f020070
+ public const int ic_gdmap_delete = 2130837616;
+
+ // aapt resource value: 0x7f020071
+ public const int ic_gdmap_home = 2130837617;
+
+ // aapt resource value: 0x7f020072
+ public const int ic_gdmap_mylocation = 2130837618;
+
+ // aapt resource value: 0x7f020073
+ public const int ic_gdmap_now = 2130837619;
+
+ // aapt resource value: 0x7f020074
+ public const int ic_gdmap_search = 2130837620;
+
+ // aapt resource value: 0x7f020075
+ public const int ic_gdmap_zoom_out = 2130837621;
+
+ // aapt resource value: 0x7f020076
+ public const int ic_gps_point = 2130837622;
+
+ // aapt resource value: 0x7f020077
+ public const int ic_wd_arc_scale_bg = 2130837623;
+
+ // aapt resource value: 0x7f020078
+ public const int ic_wd_curtain_bg_top = 2130837624;
+
+ // aapt resource value: 0x7f020079
+ public const int ic_wd_curtain_h_bg = 2130837625;
+
+ // aapt resource value: 0x7f02007a
+ public const int ic_wd_curtain_h_open = 2130837626;
+
// aapt resource value: 0x7F080086
public const int ic_wd_on_curtain_blinds_progress = 2131230854;
-
+
// aapt resource value: 0x7F080087
public const int ic_wd_on_curtain_blinds_progress2 = 2131230855;
-
+
// aapt resource value: 0x7F080088
public const int ic_wd_on_curtain_blinds_progress_close = 2131230856;
-
+
// aapt resource value: 0x7F080089
public const int ic_wd_on_curtain_blinds_progress_close2 = 2131230857;
-
+
// aapt resource value: 0x7F08008A
public const int ic_wd_on_curtain_h_bg = 2131230858;
-
+
// aapt resource value: 0x7F08008B
public const int ic_wd_on_curtain_h_open = 2131230859;
-
+
// aapt resource value: 0x7F08008C
public const int ic_wd_on_curtain_h_progress = 2131230860;
-
+
// aapt resource value: 0x7F08008D
public const int ic_wd_on_curtain_h_progress_close = 2131230861;
-
+
// aapt resource value: 0x7F08008E
public const int ic_wd_on_curtain_open = 2131230862;
-
+
// aapt resource value: 0x7F08008F
public const int ic_wd_on_curtain_roll_bg = 2131230863;
-
+
// aapt resource value: 0x7F080090
public const int ic_wd_on_curtain_roll_progress = 2131230864;
-
+
// aapt resource value: 0x7F080091
public const int ic_wd_on_curtain_roll_progress_close = 2131230865;
-
+
// aapt resource value: 0x7F080093
public const int Loading = 2131230867;
-
+
// aapt resource value: 0x7F080094
public const int navigation_empty_icon = 2131230868;
-
+
// aapt resource value: 0x7F080095
public const int notification_action_background = 2131230869;
-
+
// aapt resource value: 0x7F080096
public const int notification_bg = 2131230870;
-
+
// aapt resource value: 0x7F080097
public const int notification_bg_low = 2131230871;
-
+
// aapt resource value: 0x7F080098
public const int notification_bg_low_normal = 2131230872;
-
+
// aapt resource value: 0x7F080099
public const int notification_bg_low_pressed = 2131230873;
-
+
// aapt resource value: 0x7F08009A
public const int notification_bg_normal = 2131230874;
-
+
// aapt resource value: 0x7F08009B
public const int notification_bg_normal_pressed = 2131230875;
-
+
// aapt resource value: 0x7F08009C
public const int notification_icon_background = 2131230876;
-
+
// aapt resource value: 0x7F08009D
public const int notification_template_icon_bg = 2131230877;
-
+
// aapt resource value: 0x7F08009E
public const int notification_template_icon_low_bg = 2131230878;
-
+
// aapt resource value: 0x7F08009F
public const int notification_tile_bg = 2131230879;
-
+
// aapt resource value: 0x7F0800A0
public const int notify_panel_notification_icon_bg = 2131230880;
-
+
// aapt resource value: 0x7F0800A1
public const int selector_pickerview_btn = 2131230881;
-
+
// aapt resource value: 0x7F0800A2
public const int tooltip_frame_dark = 2131230882;
-
+
// aapt resource value: 0x7F0800A3
public const int tooltip_frame_light = 2131230883;
-
+
static Drawable()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Drawable()
{
}
}
-
+
public partial class Id
{
-
+
// aapt resource value: 0x7F090015
public const int action0 = 2131296277;
-
+
// aapt resource value: 0x7F090027
public const int actions = 2131296295;
-
+
// aapt resource value: 0x7F090016
public const int action_bar = 2131296278;
-
+
// aapt resource value: 0x7F090017
public const int action_bar_activity_content = 2131296279;
-
+
// aapt resource value: 0x7F090018
public const int action_bar_container = 2131296280;
-
+
// aapt resource value: 0x7F090019
public const int action_bar_root = 2131296281;
-
+
// aapt resource value: 0x7F09001A
public const int action_bar_spinner = 2131296282;
-
+
// aapt resource value: 0x7F09001B
public const int action_bar_subtitle = 2131296283;
-
+
// aapt resource value: 0x7F09001C
public const int action_bar_title = 2131296284;
-
+
// aapt resource value: 0x7F09001D
public const int action_container = 2131296285;
-
+
// aapt resource value: 0x7F09001E
public const int action_context_bar = 2131296286;
-
+
// aapt resource value: 0x7F09001F
public const int action_divider = 2131296287;
-
+
// aapt resource value: 0x7F090020
public const int action_image = 2131296288;
-
+
// aapt resource value: 0x7F090021
public const int action_menu_divider = 2131296289;
-
+
// aapt resource value: 0x7F090022
public const int action_menu_presenter = 2131296290;
-
+
// aapt resource value: 0x7F090023
public const int action_mode_bar = 2131296291;
-
+
// aapt resource value: 0x7F090024
public const int action_mode_bar_stub = 2131296292;
-
+
// aapt resource value: 0x7F090025
public const int action_mode_close_button = 2131296293;
-
+
// aapt resource value: 0x7F090026
public const int action_text = 2131296294;
-
+
// aapt resource value: 0x7F090028
public const int activity_chooser_view_content = 2131296296;
-
+
// aapt resource value: 0x7F090029
public const int add = 2131296297;
-
+
// aapt resource value: 0x7F09002A
public const int alertTitle = 2131296298;
-
+
// aapt resource value: 0x7F09002B
public const int all = 2131296299;
-
+
// aapt resource value: 0x7F090000
public const int ALT = 2131296256;
-
+
// aapt resource value: 0x7F09002C
public const int always = 2131296300;
-
+
// aapt resource value: 0x7F09002D
public const int async = 2131296301;
-
+
// aapt resource value: 0x7F09002E
public const int auto = 2131296302;
-
+
// aapt resource value: 0x7F09002F
public const int beginning = 2131296303;
-
+
// aapt resource value: 0x7F090030
public const int blocking = 2131296304;
-
+
// aapt resource value: 0x7F090031
public const int bottom = 2131296305;
-
+
// aapt resource value: 0x7F090032
public const int btnCancel = 2131296306;
-
+
// aapt resource value: 0x7F090033
public const int btnSubmit = 2131296307;
-
+
// aapt resource value: 0x7F090034
public const int buttonPanel = 2131296308;
-
+
// aapt resource value: 0x7F090035
public const int cancel_action = 2131296309;
-
+
// aapt resource value: 0x7F090036
public const int center = 2131296310;
-
+
// aapt resource value: 0x7F090037
public const int center_horizontal = 2131296311;
-
+
// aapt resource value: 0x7F090038
public const int center_vertical = 2131296312;
-
+
// aapt resource value: 0x7F090039
public const int checkbox = 2131296313;
-
+
// aapt resource value: 0x7F09003A
public const int chronometer = 2131296314;
-
+
// aapt resource value: 0x7F09003B
public const int clip_horizontal = 2131296315;
-
+
// aapt resource value: 0x7F09003C
public const int clip_vertical = 2131296316;
-
+
// aapt resource value: 0x7F09003D
public const int collapseActionView = 2131296317;
-
+
// aapt resource value: 0x7F09003E
public const int container = 2131296318;
-
+
// aapt resource value: 0x7F09003F
public const int contentFrame = 2131296319;
-
+
// aapt resource value: 0x7F090040
public const int contentPanel = 2131296320;
-
+
// aapt resource value: 0x7F090041
public const int content_container = 2131296321;
-
+
// aapt resource value: 0x7F090042
public const int coordinator = 2131296322;
-
+
// aapt resource value: 0x7F090001
public const int CTRL = 2131296257;
-
+
// aapt resource value: 0x7F090002
public const int Custom = 2131296258;
-
+
// aapt resource value: 0x7F090043
public const int custom = 2131296323;
-
+
// aapt resource value: 0x7F090003
public const int CustomLabel = 2131296259;
-
+
// aapt resource value: 0x7F090044
public const int customPanel = 2131296324;
-
+
// aapt resource value: 0x7F090045
public const int day = 2131296325;
-
+
// aapt resource value: 0x7F090046
public const int decor_content_parent = 2131296326;
-
+
// aapt resource value: 0x7F090047
public const int default_activity_button = 2131296327;
-
+
// aapt resource value: 0x7F090048
public const int description = 2131296328;
-
+
// aapt resource value: 0x7F090049
public const int design_bottom_sheet = 2131296329;
-
+
// aapt resource value: 0x7F09004A
public const int design_menu_item_action_area = 2131296330;
-
+
// aapt resource value: 0x7F09004B
public const int design_menu_item_action_area_stub = 2131296331;
-
+
// aapt resource value: 0x7F09004C
public const int design_menu_item_text = 2131296332;
-
+
// aapt resource value: 0x7F09004D
public const int design_navigation_view = 2131296333;
-
+
// aapt resource value: 0x7F09004E
public const int disableHome = 2131296334;
-
+
// aapt resource value: 0x7F09004F
public const int edit_query = 2131296335;
-
+
// aapt resource value: 0x7F090050
public const int end = 2131296336;
-
+
// aapt resource value: 0x7F090051
public const int end_padder = 2131296337;
-
+
// aapt resource value: 0x7F090052
public const int enterAlways = 2131296338;
-
+
// aapt resource value: 0x7F090053
public const int enterAlwaysCollapsed = 2131296339;
-
+
// aapt resource value: 0x7F090054
public const int exitUntilCollapsed = 2131296340;
-
+
// aapt resource value: 0x7F090056
public const int expanded_menu = 2131296342;
-
+
// aapt resource value: 0x7F090055
public const int expand_activities_button = 2131296341;
-
+
// aapt resource value: 0x7F090057
public const int fill = 2131296343;
-
+
// aapt resource value: 0x7F090004
public const int FILL = 2131296260;
-
+
// aapt resource value: 0x7F090058
public const int fill_horizontal = 2131296344;
-
+
// aapt resource value: 0x7F090005
public const int FILL_STROKE = 2131296261;
-
+
// aapt resource value: 0x7F090059
public const int fill_vertical = 2131296345;
-
+
// aapt resource value: 0x7F09005A
public const int fingerprint_icon = 2131296346;
-
+
// aapt resource value: 0x7F09005B
public const int @fixed = 2131296347;
-
+
// aapt resource value: 0x7F090007
public const int FixedBehind = 2131296263;
-
+
// aapt resource value: 0x7F090008
public const int FixedFront = 2131296264;
-
+
// aapt resource value: 0x7F09005C
public const int forever = 2131296348;
-
+
// aapt resource value: 0x7F090006
public const int FUNCTION = 2131296262;
-
+
// aapt resource value: 0x7F09005D
public const int gd_btn_back = 2131296349;
-
+
// aapt resource value: 0x7F09005E
public const int gd_btn_myLocation = 2131296350;
-
+
// aapt resource value: 0x7F09005F
public const int gd_btn_save = 2131296351;
-
+
// aapt resource value: 0x7F090060
public const int gd_img_search_delete = 2131296352;
-
+
// aapt resource value: 0x7F090061
public const int gd_ll_myhome = 2131296353;
-
+
// aapt resource value: 0x7F090062
public const int gd_ll_search = 2131296354;
-
+
// aapt resource value: 0x7F090063
public const int gd_mapView = 2131296355;
-
+
// aapt resource value: 0x7F090064
public const int gd_rl_topview = 2131296356;
-
+
// aapt resource value: 0x7F090065
public const int gd_tv_activity_title = 2131296357;
-
+
// aapt resource value: 0x7F090066
public const int gd_tv_radius = 2131296358;
-
+
// aapt resource value: 0x7F090067
public const int gd_tv_search_title = 2131296359;
-
+
// aapt resource value: 0x7F090068
public const int hdl_gallery_rootView = 2131296360;
-
+
// aapt resource value: 0x7F090069
public const int hdl_gallery_viewPager = 2131296361;
-
+
// aapt resource value: 0x7F09006A
public const int hdl_options1 = 2131296362;
-
+
// aapt resource value: 0x7F09006B
public const int hdl_options2 = 2131296363;
-
+
// aapt resource value: 0x7F09006C
public const int hdl_options3 = 2131296364;
-
+
// aapt resource value: 0x7F09006D
public const int hdl_pickerview_ll = 2131296365;
-
+
// aapt resource value: 0x7F09006E
public const int home = 2131296366;
-
+
// aapt resource value: 0x7F09006F
public const int homeAsUp = 2131296367;
-
+
// aapt resource value: 0x7F090070
public const int hour = 2131296368;
-
+
// aapt resource value: 0x7F090071
public const int icon = 2131296369;
-
+
// aapt resource value: 0x7F090072
public const int icon_group = 2131296370;
-
+
// aapt resource value: 0x7F090073
public const int ifRoom = 2131296371;
-
+
// aapt resource value: 0x7F090074
public const int image = 2131296372;
-
+
// aapt resource value: 0x7F090075
public const int info = 2131296373;
-
+
// aapt resource value: 0x7F090076
public const int italic = 2131296374;
-
+
// aapt resource value: 0x7F090077
public const int item_touch_helper_previous_elevation = 2131296375;
-
+
// aapt resource value: 0x7F090078
public const int largeLabel = 2131296376;
-
+
// aapt resource value: 0x7F090079
public const int left = 2131296377;
-
+
// aapt resource value: 0x7F09007A
public const int line1 = 2131296378;
-
+
// aapt resource value: 0x7F09007B
public const int line3 = 2131296379;
-
+
// aapt resource value: 0x7F09007C
public const int listMode = 2131296380;
-
+
// aapt resource value: 0x7F09007D
public const int list_item = 2131296381;
-
+
// aapt resource value: 0x7F09007E
public const int masked = 2131296382;
-
+
// aapt resource value: 0x7F09000A
public const int MatchLayout = 2131296266;
-
+
// aapt resource value: 0x7F09007F
public const int media_actions = 2131296383;
-
+
// aapt resource value: 0x7F090080
public const int message = 2131296384;
-
+
// aapt resource value: 0x7F090009
public const int META = 2131296265;
-
+
// aapt resource value: 0x7F090081
public const int middle = 2131296385;
-
+
// aapt resource value: 0x7F090082
public const int min = 2131296386;
-
+
// aapt resource value: 0x7F090083
public const int mini = 2131296387;
-
+
// aapt resource value: 0x7F090084
public const int month = 2131296388;
-
+
// aapt resource value: 0x7F090085
public const int multiply = 2131296389;
-
+
// aapt resource value: 0x7F090086
public const int myButton = 2131296390;
-
+
// aapt resource value: 0x7F090087
public const int navigation_header_container = 2131296391;
-
+
// aapt resource value: 0x7F090088
public const int never = 2131296392;
-
+
// aapt resource value: 0x7F090089
public const int none = 2131296393;
-
+
// aapt resource value: 0x7F09008A
public const int normal = 2131296394;
-
+
// aapt resource value: 0x7F09000B
public const int Notice = 2131296267;
-
+
// aapt resource value: 0x7F09008B
public const int notification_background = 2131296395;
-
+
// aapt resource value: 0x7F09008C
public const int notification_main_column = 2131296396;
-
+
// aapt resource value: 0x7F09008D
public const int notification_main_column_container = 2131296397;
-
+
// aapt resource value: 0x7F09008E
public const int options1 = 2131296398;
-
+
// aapt resource value: 0x7F09008F
public const int options2 = 2131296399;
-
+
// aapt resource value: 0x7F090090
public const int options3 = 2131296400;
-
+
// aapt resource value: 0x7F090091
public const int optionspicker = 2131296401;
-
+
// aapt resource value: 0x7F090092
public const int outmost_container = 2131296402;
-
+
// aapt resource value: 0x7F090093
public const int parallax = 2131296403;
-
+
// aapt resource value: 0x7F090094
public const int parentPanel = 2131296404;
-
+
// aapt resource value: 0x7F09000C
public const int Password = 2131296268;
-
+
// aapt resource value: 0x7F09000D
public const int PasswordLabel = 2131296269;
-
+
// aapt resource value: 0x7F090095
public const int pin = 2131296405;
-
+
// aapt resource value: 0x7F090096
public const int progress_circular = 2131296406;
-
+
// aapt resource value: 0x7F090097
public const int progress_horizontal = 2131296407;
-
+
// aapt resource value: 0x7F090098
public const int radio = 2131296408;
-
+
// aapt resource value: 0x7F090099
public const int right = 2131296409;
-
+
// aapt resource value: 0x7F09009A
public const int right_icon = 2131296410;
-
+
// aapt resource value: 0x7F09009B
public const int right_side = 2131296411;
-
+
// aapt resource value: 0x7F09009C
public const int rv_topbar = 2131296412;
-
+
// aapt resource value: 0x7F090013
public const int Scale = 2131296275;
-
+
// aapt resource value: 0x7F09009D
public const int screen = 2131296413;
-
+
// aapt resource value: 0x7F09009E
public const int scroll = 2131296414;
-
+
// aapt resource value: 0x7F0900A2
public const int scrollable = 2131296418;
-
+
// aapt resource value: 0x7F09009F
public const int scrollIndicatorDown = 2131296415;
-
+
// aapt resource value: 0x7F0900A0
public const int scrollIndicatorUp = 2131296416;
-
+
// aapt resource value: 0x7F0900A1
public const int scrollView = 2131296417;
-
+
// aapt resource value: 0x7F0900A3
public const int search_badge = 2131296419;
-
+
// aapt resource value: 0x7F0900A4
public const int search_bar = 2131296420;
-
+
// aapt resource value: 0x7F0900A5
public const int search_button = 2131296421;
-
+
// aapt resource value: 0x7F0900A6
public const int search_close_btn = 2131296422;
-
+
// aapt resource value: 0x7F0900A7
public const int search_edit_frame = 2131296423;
-
+
// aapt resource value: 0x7F0900A8
public const int search_go_btn = 2131296424;
-
+
// aapt resource value: 0x7F0900A9
public const int search_mag_icon = 2131296425;
-
+
// aapt resource value: 0x7F0900AA
public const int search_plate = 2131296426;
-
+
// aapt resource value: 0x7F0900AB
public const int search_src_text = 2131296427;
-
+
// aapt resource value: 0x7F0900AC
public const int search_voice_btn = 2131296428;
-
+
// aapt resource value: 0x7F0900AD
public const int second = 2131296429;
-
+
// aapt resource value: 0x7F0900AE
public const int select_dialog_listview = 2131296430;
-
+
// aapt resource value: 0x7F09000E
public const int SHIFT = 2131296270;
-
+
// aapt resource value: 0x7F0900AF
public const int shortcut = 2131296431;
-
+
// aapt resource value: 0x7F0900B0
public const int showCustom = 2131296432;
-
+
// aapt resource value: 0x7F0900B1
public const int showHome = 2131296433;
-
+
// aapt resource value: 0x7F0900B2
public const int showTitle = 2131296434;
-
+
// aapt resource value: 0x7F0900B3
public const int smallLabel = 2131296435;
-
+
// aapt resource value: 0x7F0900B4
public const int snackbar_action = 2131296436;
-
+
// aapt resource value: 0x7F0900B5
public const int snackbar_text = 2131296437;
-
+
// aapt resource value: 0x7F0900B6
public const int snap = 2131296438;
-
+
// aapt resource value: 0x7F0900B7
public const int spacer = 2131296439;
-
+
// aapt resource value: 0x7F0900B8
public const int split_action_bar = 2131296440;
-
+
// aapt resource value: 0x7F0900B9
public const int src_atop = 2131296441;
-
+
// aapt resource value: 0x7F0900BA
public const int src_in = 2131296442;
-
+
// aapt resource value: 0x7F0900BB
public const int src_over = 2131296443;
-
+
// aapt resource value: 0x7F0900BC
public const int srl_classics_arrow = 2131296444;
-
+
// aapt resource value: 0x7F0900BD
public const int srl_classics_center = 2131296445;
-
+
// aapt resource value: 0x7F0900BE
public const int srl_classics_progress = 2131296446;
-
+
// aapt resource value: 0x7F0900BF
public const int srl_classics_title = 2131296447;
-
+
// aapt resource value: 0x7F0900C0
public const int srl_classics_update = 2131296448;
-
+
// aapt resource value: 0x7F09000F
public const int SSID = 2131296271;
-
+
// aapt resource value: 0x7F090010
public const int SSIDLabel = 2131296272;
-
+
// aapt resource value: 0x7F0900C1
public const int start = 2131296449;
-
+
// aapt resource value: 0x7F0900C2
public const int startV1 = 2131296450;
-
+
// aapt resource value: 0x7F0900C3
public const int startV1V4 = 2131296451;
-
+
// aapt resource value: 0x7F0900C4
public const int startV4 = 2131296452;
-
+
// aapt resource value: 0x7F0900C5
public const int status = 2131296453;
-
+
// aapt resource value: 0x7F0900C6
public const int status_bar_latest_event_content = 2131296454;
-
+
// aapt resource value: 0x7F0900C7
public const int stop = 2131296455;
-
+
// aapt resource value: 0x7F090011
public const int STROKE = 2131296273;
-
+
// aapt resource value: 0x7F0900C8
public const int submenuarrow = 2131296456;
-
+
// aapt resource value: 0x7F0900C9
public const int submit_area = 2131296457;
-
+
// aapt resource value: 0x7F0900CA
public const int subtitle = 2131296458;
-
+
// aapt resource value: 0x7F090012
public const int SYM = 2131296274;
-
+
// aapt resource value: 0x7F0900CB
public const int tabMode = 2131296459;
-
+
// aapt resource value: 0x7F0900CC
public const int text = 2131296460;
-
+
// aapt resource value: 0x7F0900CD
public const int text2 = 2131296461;
-
+
// aapt resource value: 0x7F0900D1
public const int textinput_counter = 2131296465;
-
+
// aapt resource value: 0x7F0900D2
public const int textinput_error = 2131296466;
-
+
// aapt resource value: 0x7F0900CE
public const int textSpacerNoButtons = 2131296462;
-
+
// aapt resource value: 0x7F0900CF
public const int textSpacerNoTitle = 2131296463;
-
+
// aapt resource value: 0x7F0900D0
public const int text_input_password_toggle = 2131296464;
-
+
// aapt resource value: 0x7F0900D3
public const int time = 2131296467;
-
+
// aapt resource value: 0x7F0900D4
public const int timepicker = 2131296468;
-
+
// aapt resource value: 0x7F0900D5
public const int title = 2131296469;
-
+
// aapt resource value: 0x7F0900D6
public const int titleDividerNoCustom = 2131296470;
-
+
// aapt resource value: 0x7F0900D7
public const int title_template = 2131296471;
-
+
// aapt resource value: 0x7F0900D8
public const int top = 2131296472;
-
+
// aapt resource value: 0x7F0900D9
public const int topPanel = 2131296473;
-
+
// aapt resource value: 0x7F0900DA
public const int touch_outside = 2131296474;
-
+
// aapt resource value: 0x7F090014
public const int Translate = 2131296276;
-
+
// aapt resource value: 0x7F0900DB
public const int tvTitle = 2131296475;
-
+
// aapt resource value: 0x7F0900DC
public const int tv_zxing_back = 2131296476;
-
+
// aapt resource value: 0x7F0900DD
public const int tv_zxing_flash = 2131296477;
-
+
// aapt resource value: 0x7F0900DE
public const int tv_zxing_scan = 2131296478;
-
+
// aapt resource value: 0x7F0900DF
public const int uniform = 2131296479;
-
+
// aapt resource value: 0x7F0900E0
public const int up = 2131296480;
-
+
// aapt resource value: 0x7F0900E1
public const int useLogo = 2131296481;
-
+
// aapt resource value: 0x7F0900E2
public const int view_offset_helper = 2131296482;
-
+
// aapt resource value: 0x7F0900E3
public const int visible = 2131296483;
-
+
// aapt resource value: 0x7F0900E4
public const int withText = 2131296484;
-
+
// aapt resource value: 0x7F0900E5
public const int wrap_content = 2131296485;
-
+
// aapt resource value: 0x7F0900E6
public const int year = 2131296486;
-
+
static Id()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Id()
{
}
}
-
+
public partial class Integer
{
-
- // aapt resource value: 0x7F0A0000
- public const int abc_config_activityDefaultDur = 2131361792;
-
- // aapt resource value: 0x7F0A0001
- public const int abc_config_activityShortDur = 2131361793;
-
- // aapt resource value: 0x7F0A0002
- public const int animation_default_duration = 2131361794;
-
- // aapt resource value: 0x7F0A0003
- public const int app_bar_elevation_anim_duration = 2131361795;
-
- // aapt resource value: 0x7F0A0004
- public const int bottom_sheet_slide_duration = 2131361796;
-
- // aapt resource value: 0x7F0A0005
- public const int cancel_button_image_alpha = 2131361797;
-
- // aapt resource value: 0x7F0A0006
- public const int config_tooltipAnimTime = 2131361798;
-
- // aapt resource value: 0x7F0A0007
- public const int design_snackbar_text_max_lines = 2131361799;
-
- // aapt resource value: 0x7F0A0008
- public const int hide_password_duration = 2131361800;
-
- // aapt resource value: 0x7F0A0009
- public const int show_password_duration = 2131361801;
-
- // aapt resource value: 0x7F0A000A
- public const int status_bar_notification_info_maxnum = 2131361802;
-
+
+ // aapt resource value: 0x7f0e0000
+ public const int abc_config_activityDefaultDur = 2131623936;
+
+ // aapt resource value: 0x7f0e0001
+ public const int abc_config_activityShortDur = 2131623937;
+
+ // aapt resource value: 0x7f0e000a
+ public const int animation_default_duration = 2131623946;
+
+ // aapt resource value: 0x7f0e0005
+ public const int app_bar_elevation_anim_duration = 2131623941;
+
+ // aapt resource value: 0x7f0e0006
+ public const int bottom_sheet_slide_duration = 2131623942;
+
+ // aapt resource value: 0x7f0e0002
+ public const int cancel_button_image_alpha = 2131623938;
+
+ // aapt resource value: 0x7f0e0003
+ public const int config_tooltipAnimTime = 2131623939;
+
+ // aapt resource value: 0x7f0e0004
+ public const int design_snackbar_text_max_lines = 2131623940;
+
+ // aapt resource value: 0x7f0e0007
+ public const int hide_password_duration = 2131623943;
+
+ // aapt resource value: 0x7f0e0008
+ public const int show_password_duration = 2131623944;
+
+ // aapt resource value: 0x7f0e0009
+ public const int status_bar_notification_info_maxnum = 2131623945;
+
static Integer()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Integer()
{
}
}
-
+
public partial class Layout
{
-
- // aapt resource value: 0x7F0B0000
- public const int abc_action_bar_title_item = 2131427328;
-
- // aapt resource value: 0x7F0B0001
- public const int abc_action_bar_up_container = 2131427329;
-
- // aapt resource value: 0x7F0B0002
- public const int abc_action_bar_view_list_nav_layout = 2131427330;
-
- // aapt resource value: 0x7F0B0003
- public const int abc_action_menu_item_layout = 2131427331;
-
- // aapt resource value: 0x7F0B0004
- public const int abc_action_menu_layout = 2131427332;
-
- // aapt resource value: 0x7F0B0005
- public const int abc_action_mode_bar = 2131427333;
-
- // aapt resource value: 0x7F0B0006
- public const int abc_action_mode_close_item_material = 2131427334;
-
- // aapt resource value: 0x7F0B0007
- public const int abc_activity_chooser_view = 2131427335;
-
- // aapt resource value: 0x7F0B0008
- public const int abc_activity_chooser_view_list_item = 2131427336;
-
- // aapt resource value: 0x7F0B0009
- public const int abc_alert_dialog_button_bar_material = 2131427337;
-
- // aapt resource value: 0x7F0B000A
- public const int abc_alert_dialog_material = 2131427338;
-
- // aapt resource value: 0x7F0B000B
- public const int abc_alert_dialog_title_material = 2131427339;
-
- // aapt resource value: 0x7F0B000C
- public const int abc_dialog_title_material = 2131427340;
-
- // aapt resource value: 0x7F0B000D
- public const int abc_expanded_menu_layout = 2131427341;
-
- // aapt resource value: 0x7F0B000E
- public const int abc_list_menu_item_checkbox = 2131427342;
-
- // aapt resource value: 0x7F0B000F
- public const int abc_list_menu_item_icon = 2131427343;
-
- // aapt resource value: 0x7F0B0010
- public const int abc_list_menu_item_layout = 2131427344;
-
- // aapt resource value: 0x7F0B0011
- public const int abc_list_menu_item_radio = 2131427345;
-
- // aapt resource value: 0x7F0B0012
- public const int abc_popup_menu_header_item_layout = 2131427346;
-
- // aapt resource value: 0x7F0B0013
- public const int abc_popup_menu_item_layout = 2131427347;
-
- // aapt resource value: 0x7F0B0014
- public const int abc_screen_content_include = 2131427348;
-
- // aapt resource value: 0x7F0B0015
- public const int abc_screen_simple = 2131427349;
-
- // aapt resource value: 0x7F0B0016
- public const int abc_screen_simple_overlay_action_mode = 2131427350;
-
- // aapt resource value: 0x7F0B0017
- public const int abc_screen_toolbar = 2131427351;
-
- // aapt resource value: 0x7F0B0018
- public const int abc_search_dropdown_item_icons_2line = 2131427352;
-
- // aapt resource value: 0x7F0B0019
- public const int abc_search_view = 2131427353;
-
- // aapt resource value: 0x7F0B001A
- public const int abc_select_dialog_material = 2131427354;
-
+
+ // aapt resource value: 0x7f040000
+ public const int abc_action_bar_title_item = 2130968576;
+
+ // aapt resource value: 0x7f040001
+ public const int abc_action_bar_up_container = 2130968577;
+
+ // aapt resource value: 0x7f040002
+ public const int abc_action_bar_view_list_nav_layout = 2130968578;
+
+ // aapt resource value: 0x7f040003
+ public const int abc_action_menu_item_layout = 2130968579;
+
+ // aapt resource value: 0x7f040004
+ public const int abc_action_menu_layout = 2130968580;
+
+ // aapt resource value: 0x7f040005
+ public const int abc_action_mode_bar = 2130968581;
+
+ // aapt resource value: 0x7f040006
+ public const int abc_action_mode_close_item_material = 2130968582;
+
+ // aapt resource value: 0x7f040007
+ public const int abc_activity_chooser_view = 2130968583;
+
+ // aapt resource value: 0x7f040008
+ public const int abc_activity_chooser_view_list_item = 2130968584;
+
+ // aapt resource value: 0x7f040009
+ public const int abc_alert_dialog_button_bar_material = 2130968585;
+
+ // aapt resource value: 0x7f04000a
+ public const int abc_alert_dialog_material = 2130968586;
+
+ // aapt resource value: 0x7f04000b
+ public const int abc_alert_dialog_title_material = 2130968587;
+
+ // aapt resource value: 0x7f04000c
+ public const int abc_dialog_title_material = 2130968588;
+
+ // aapt resource value: 0x7f04000d
+ public const int abc_expanded_menu_layout = 2130968589;
+
+ // aapt resource value: 0x7f04000e
+ public const int abc_list_menu_item_checkbox = 2130968590;
+
+ // aapt resource value: 0x7f04000f
+ public const int abc_list_menu_item_icon = 2130968591;
+
+ // aapt resource value: 0x7f040010
+ public const int abc_list_menu_item_layout = 2130968592;
+
+ // aapt resource value: 0x7f040011
+ public const int abc_list_menu_item_radio = 2130968593;
+
+ // aapt resource value: 0x7f040012
+ public const int abc_popup_menu_header_item_layout = 2130968594;
+
+ // aapt resource value: 0x7f040013
+ public const int abc_popup_menu_item_layout = 2130968595;
+
+ // aapt resource value: 0x7f040014
+ public const int abc_screen_content_include = 2130968596;
+
+ // aapt resource value: 0x7f040015
+ public const int abc_screen_simple = 2130968597;
+
+ // aapt resource value: 0x7f040016
+ public const int abc_screen_simple_overlay_action_mode = 2130968598;
+
+ // aapt resource value: 0x7f040017
+ public const int abc_screen_toolbar = 2130968599;
+
+ // aapt resource value: 0x7f040018
+ public const int abc_search_dropdown_item_icons_2line = 2130968600;
+
+ // aapt resource value: 0x7f040019
+ public const int abc_search_view = 2130968601;
+
// aapt resource value: 0x7F0B001B
public const int activity_elian = 2131427355;
-
+
// aapt resource value: 0x7F0B001C
public const int biometric_prompt_dialog_content = 2131427356;
-
+
// aapt resource value: 0x7F0B001D
public const int design_bottom_navigation_item = 2131427357;
-
+
// aapt resource value: 0x7F0B001E
public const int design_bottom_sheet_dialog = 2131427358;
-
+
// aapt resource value: 0x7F0B001F
public const int design_layout_snackbar = 2131427359;
-
+
// aapt resource value: 0x7F0B0020
public const int design_layout_snackbar_include = 2131427360;
-
+
// aapt resource value: 0x7F0B0021
public const int design_layout_tab_icon = 2131427361;
-
+
// aapt resource value: 0x7F0B0022
public const int design_layout_tab_text = 2131427362;
-
+
// aapt resource value: 0x7F0B0023
public const int design_menu_item_action_area = 2131427363;
-
+
// aapt resource value: 0x7F0B0024
public const int design_navigation_item = 2131427364;
-
+
// aapt resource value: 0x7F0B0025
public const int design_navigation_item_header = 2131427365;
-
+
// aapt resource value: 0x7F0B0026
public const int design_navigation_item_separator = 2131427366;
-
+
// aapt resource value: 0x7F0B0027
public const int design_navigation_item_subheader = 2131427367;
-
+
// aapt resource value: 0x7F0B0028
public const int design_navigation_menu = 2131427368;
-
+
// aapt resource value: 0x7F0B0029
public const int design_navigation_menu_item = 2131427369;
-
+
// aapt resource value: 0x7F0B002A
public const int design_text_input_password_icon = 2131427370;
-
+
// aapt resource value: 0x7F0B002B
public const int hdl_gallery_banner_view_layout = 2131427371;
-
+
// aapt resource value: 0x7F0B002C
public const int hdl_widget_activity_crop_image = 2131427372;
-
+
// aapt resource value: 0x7F0B002D
public const int hdl_widget_activity_geofence_round = 2131427373;
-
+
// aapt resource value: 0x7F0B002E
public const int hdl_widget_air_button = 2131427374;
-
+
// aapt resource value: 0x7F0B002F
public const int hdl_widget_include_pickerview_topbar = 2131427375;
-
+
// aapt resource value: 0x7F0B0030
public const int hdl_widget_layout_basepickerview = 2131427376;
-
+
// aapt resource value: 0x7F0B0031
public const int hdl_widget_pickerview = 2131427377;
-
+
// aapt resource value: 0x7F0B0032
public const int hdl_widget_pickerview_options = 2131427378;
-
+
// aapt resource value: 0x7F0B0033
public const int hdl_widget_pickerview_time = 2131427379;
-
+
// aapt resource value: 0x7F0B0034
public const int Main = 2131427380;
-
+
// aapt resource value: 0x7F0B0035
public const int notification_action = 2131427381;
-
+
// aapt resource value: 0x7F0B0036
public const int notification_action_tombstone = 2131427382;
-
+
// aapt resource value: 0x7F0B0037
public const int notification_media_action = 2131427383;
-
+
// aapt resource value: 0x7F0B0038
public const int notification_media_cancel_action = 2131427384;
-
+
// aapt resource value: 0x7F0B0039
public const int notification_template_big_media = 2131427385;
-
+
// aapt resource value: 0x7F0B003A
public const int notification_template_big_media_custom = 2131427386;
-
+
// aapt resource value: 0x7F0B003B
public const int notification_template_big_media_narrow = 2131427387;
-
+
// aapt resource value: 0x7F0B003C
public const int notification_template_big_media_narrow_custom = 2131427388;
-
+
// aapt resource value: 0x7F0B003D
public const int notification_template_custom_big = 2131427389;
-
+
// aapt resource value: 0x7F0B003E
public const int notification_template_icon_group = 2131427390;
-
+
// aapt resource value: 0x7F0B003F
public const int notification_template_lines_media = 2131427391;
-
+
// aapt resource value: 0x7F0B0040
public const int notification_template_media = 2131427392;
-
+
// aapt resource value: 0x7F0B0041
public const int notification_template_media_custom = 2131427393;
-
+
// aapt resource value: 0x7F0B0042
public const int notification_template_part_chronometer = 2131427394;
-
+
// aapt resource value: 0x7F0B0043
public const int notification_template_part_time = 2131427395;
-
+
// aapt resource value: 0x7F0B0044
public const int select_dialog_item_material = 2131427396;
-
+
// aapt resource value: 0x7F0B0045
public const int select_dialog_multichoice_material = 2131427397;
-
+
// aapt resource value: 0x7F0B0046
public const int select_dialog_singlechoice_material = 2131427398;
-
+
// aapt resource value: 0x7F0B0047
public const int srl_classics_footer = 2131427399;
-
+
// aapt resource value: 0x7F0B0048
public const int srl_classics_header = 2131427400;
-
+
// aapt resource value: 0x7F0B0049
public const int support_simple_spinner_dropdown_item = 2131427401;
-
+
// aapt resource value: 0x7F0B004A
public const int tooltip = 2131427402;
-
+
// aapt resource value: 0x7F0B004C
public const int zxingscanneractivitylayout = 2131427404;
-
+
// aapt resource value: 0x7F0B004D
public const int zxingscannerfragmentlayout = 2131427405;
-
+
// aapt resource value: 0x7F0B004B
public const int zxing_layout = 2131427403;
-
+
static Layout()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Layout()
{
}
}
-
+
public partial class Mipmap
{
-
- // aapt resource value: 0x7F0C0000
- public const int Icon = 2131492864;
-
+
+ // aapt resource value: 0x7f030000
+ public const int Icon = 2130903040;
+
static Mipmap()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Mipmap()
{
}
}
-
+
public partial class String
{
-
- // aapt resource value: 0x7F0D0000
- public const int abc_action_bar_home_description = 2131558400;
-
- // aapt resource value: 0x7F0D0001
- public const int abc_action_bar_home_description_format = 2131558401;
-
- // aapt resource value: 0x7F0D0002
- public const int abc_action_bar_home_subtitle_description_format = 2131558402;
-
- // aapt resource value: 0x7F0D0003
- public const int abc_action_bar_up_description = 2131558403;
-
- // aapt resource value: 0x7F0D0004
- public const int abc_action_menu_overflow_description = 2131558404;
-
- // aapt resource value: 0x7F0D0005
- public const int abc_action_mode_done = 2131558405;
-
- // aapt resource value: 0x7F0D0007
- public const int abc_activitychooserview_choose_application = 2131558407;
-
- // aapt resource value: 0x7F0D0006
- public const int abc_activity_chooser_view_see_all = 2131558406;
-
- // aapt resource value: 0x7F0D0008
- public const int abc_capital_off = 2131558408;
-
- // aapt resource value: 0x7F0D0009
- public const int abc_capital_on = 2131558409;
-
- // aapt resource value: 0x7F0D000A
- public const int abc_font_family_body_1_material = 2131558410;
-
- // aapt resource value: 0x7F0D000B
- public const int abc_font_family_body_2_material = 2131558411;
-
- // aapt resource value: 0x7F0D000C
- public const int abc_font_family_button_material = 2131558412;
-
- // aapt resource value: 0x7F0D000D
- public const int abc_font_family_caption_material = 2131558413;
-
- // aapt resource value: 0x7F0D000E
- public const int abc_font_family_display_1_material = 2131558414;
-
- // aapt resource value: 0x7F0D000F
- public const int abc_font_family_display_2_material = 2131558415;
-
- // aapt resource value: 0x7F0D0010
- public const int abc_font_family_display_3_material = 2131558416;
-
- // aapt resource value: 0x7F0D0011
- public const int abc_font_family_display_4_material = 2131558417;
-
- // aapt resource value: 0x7F0D0012
- public const int abc_font_family_headline_material = 2131558418;
-
- // aapt resource value: 0x7F0D0013
- public const int abc_font_family_menu_material = 2131558419;
-
- // aapt resource value: 0x7F0D0014
- public const int abc_font_family_subhead_material = 2131558420;
-
- // aapt resource value: 0x7F0D0015
- public const int abc_font_family_title_material = 2131558421;
-
- // aapt resource value: 0x7F0D0017
- public const int abc_searchview_description_clear = 2131558423;
-
- // aapt resource value: 0x7F0D0018
- public const int abc_searchview_description_query = 2131558424;
-
- // aapt resource value: 0x7F0D0019
- public const int abc_searchview_description_search = 2131558425;
-
- // aapt resource value: 0x7F0D001A
- public const int abc_searchview_description_submit = 2131558426;
-
- // aapt resource value: 0x7F0D001B
- public const int abc_searchview_description_voice = 2131558427;
-
- // aapt resource value: 0x7F0D0016
- public const int abc_search_hint = 2131558422;
-
- // aapt resource value: 0x7F0D001C
- public const int abc_shareactionprovider_share_with = 2131558428;
-
- // aapt resource value: 0x7F0D001D
- public const int abc_shareactionprovider_share_with_application = 2131558429;
-
- // aapt resource value: 0x7F0D001E
- public const int abc_toolbar_collapse_description = 2131558430;
-
- // aapt resource value: 0x7F0D0020
- public const int appbar_scrolling_view_behavior = 2131558432;
-
- // aapt resource value: 0x7F0D001F
- public const int app_name = 2131558431;
-
- // aapt resource value: 0x7F0D0021
- public const int bottom_sheet_behavior = 2131558433;
-
- // aapt resource value: 0x7F0D0022
- public const int character_counter_pattern = 2131558434;
-
- // aapt resource value: 0x7F0D0023
- public const int gd_activity_title = 2131558435;
-
- // aapt resource value: 0x7F0D0024
- public const int gd_cancel = 2131558436;
-
- // aapt resource value: 0x7F0D0025
- public const int gd_myhome = 2131558437;
-
- // aapt resource value: 0x7F0D0026
- public const int gd_notifyMsg = 2131558438;
-
- // aapt resource value: 0x7F0D0027
- public const int gd_notifyTitle = 2131558439;
-
- // aapt resource value: 0x7F0D0028
- public const int gd_save = 2131558440;
-
- // aapt resource value: 0x7F0D0029
- public const int gd_search_tip = 2131558441;
-
- // aapt resource value: 0x7F0D002A
- public const int gd_select_distance = 2131558442;
-
- // aapt resource value: 0x7F0D002B
- public const int gd_setting = 2131558443;
-
- // aapt resource value: 0x7F0D002C
- public const int hello = 2131558444;
-
- // aapt resource value: 0x7F0D002D
- public const int not_recognized_fingerprint_hint = 2131558445;
-
- // aapt resource value: 0x7F0D002E
- public const int password_toggle_content_description = 2131558446;
-
- // aapt resource value: 0x7F0D002F
- public const int path_password_eye = 2131558447;
-
- // aapt resource value: 0x7F0D0030
- public const int path_password_eye_mask_strike_through = 2131558448;
-
- // aapt resource value: 0x7F0D0031
- public const int path_password_eye_mask_visible = 2131558449;
-
- // aapt resource value: 0x7F0D0032
- public const int path_password_strike_through = 2131558450;
-
- // aapt resource value: 0x7F0D0033
- public const int pickerview_cancel = 2131558451;
-
- // aapt resource value: 0x7F0D0034
- public const int pickerview_day = 2131558452;
-
- // aapt resource value: 0x7F0D0035
- public const int pickerview_hours = 2131558453;
-
- // aapt resource value: 0x7F0D0036
- public const int pickerview_minutes = 2131558454;
-
- // aapt resource value: 0x7F0D0037
- public const int pickerview_month = 2131558455;
-
- // aapt resource value: 0x7F0D0038
- public const int pickerview_seconds = 2131558456;
-
- // aapt resource value: 0x7F0D0039
- public const int pickerview_submit = 2131558457;
-
- // aapt resource value: 0x7F0D003A
- public const int pickerview_year = 2131558458;
-
- // aapt resource value: 0x7F0D003B
- public const int search_menu_title = 2131558459;
-
- // aapt resource value: 0x7F0D003C
- public const int srl_component_falsify = 2131558460;
-
- // aapt resource value: 0x7F0D003D
- public const int srl_content_empty = 2131558461;
-
- // aapt resource value: 0x7F0D003E
- public const int srl_footer_failed = 2131558462;
-
- // aapt resource value: 0x7F0D003F
- public const int srl_footer_finish = 2131558463;
-
- // aapt resource value: 0x7F0D0040
- public const int srl_footer_loading = 2131558464;
-
- // aapt resource value: 0x7F0D0041
- public const int srl_footer_nothing = 2131558465;
-
- // aapt resource value: 0x7F0D0042
- public const int srl_footer_pulling = 2131558466;
-
- // aapt resource value: 0x7F0D0043
- public const int srl_footer_refreshing = 2131558467;
-
- // aapt resource value: 0x7F0D0044
- public const int srl_footer_release = 2131558468;
-
- // aapt resource value: 0x7F0D0045
- public const int srl_header_failed = 2131558469;
-
- // aapt resource value: 0x7F0D0046
- public const int srl_header_finish = 2131558470;
-
- // aapt resource value: 0x7F0D0047
- public const int srl_header_loading = 2131558471;
-
- // aapt resource value: 0x7F0D0048
- public const int srl_header_pulling = 2131558472;
-
- // aapt resource value: 0x7F0D0049
- public const int srl_header_refreshing = 2131558473;
-
- // aapt resource value: 0x7F0D004A
- public const int srl_header_release = 2131558474;
-
- // aapt resource value: 0x7F0D004B
- public const int srl_header_secondary = 2131558475;
-
- // aapt resource value: 0x7F0D004C
- public const int srl_header_update = 2131558476;
-
- // aapt resource value: 0x7F0D004D
- public const int status_bar_notification_info_overflow = 2131558477;
-
- // aapt resource value: 0x7F0D004E
- public const int touch_fingerprint_sensor_hint = 2131558478;
-
+
+ // aapt resource value: 0x7f0a0000
+ public const int abc_action_bar_home_description = 2131361792;
+
+ // aapt resource value: 0x7f0a0001
+ public const int abc_action_bar_home_description_format = 2131361793;
+
+ // aapt resource value: 0x7f0a0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131361794;
+
+ // aapt resource value: 0x7f0a0003
+ public const int abc_action_bar_up_description = 2131361795;
+
+ // aapt resource value: 0x7f0a0004
+ public const int abc_action_menu_overflow_description = 2131361796;
+
+ // aapt resource value: 0x7f0a0005
+ public const int abc_action_mode_done = 2131361797;
+
+ // aapt resource value: 0x7f0a0006
+ public const int abc_activity_chooser_view_see_all = 2131361798;
+
+ // aapt resource value: 0x7f0a0007
+ public const int abc_activitychooserview_choose_application = 2131361799;
+
+ // aapt resource value: 0x7f0a0008
+ public const int abc_capital_off = 2131361800;
+
+ // aapt resource value: 0x7f0a0009
+ public const int abc_capital_on = 2131361801;
+
+ // aapt resource value: 0x7f0a0015
+ public const int abc_font_family_body_1_material = 2131361813;
+
+ // aapt resource value: 0x7f0a0016
+ public const int abc_font_family_body_2_material = 2131361814;
+
+ // aapt resource value: 0x7f0a0017
+ public const int abc_font_family_button_material = 2131361815;
+
+ // aapt resource value: 0x7f0a0018
+ public const int abc_font_family_caption_material = 2131361816;
+
+ // aapt resource value: 0x7f0a0019
+ public const int abc_font_family_display_1_material = 2131361817;
+
+ // aapt resource value: 0x7f0a001a
+ public const int abc_font_family_display_2_material = 2131361818;
+
+ // aapt resource value: 0x7f0a001b
+ public const int abc_font_family_display_3_material = 2131361819;
+
+ // aapt resource value: 0x7f0a001c
+ public const int abc_font_family_display_4_material = 2131361820;
+
+ // aapt resource value: 0x7f0a001d
+ public const int abc_font_family_headline_material = 2131361821;
+
+ // aapt resource value: 0x7f0a001e
+ public const int abc_font_family_menu_material = 2131361822;
+
+ // aapt resource value: 0x7f0a001f
+ public const int abc_font_family_subhead_material = 2131361823;
+
+ // aapt resource value: 0x7f0a0020
+ public const int abc_font_family_title_material = 2131361824;
+
+ // aapt resource value: 0x7f0a000a
+ public const int abc_search_hint = 2131361802;
+
+ // aapt resource value: 0x7f0a000b
+ public const int abc_searchview_description_clear = 2131361803;
+
+ // aapt resource value: 0x7f0a000c
+ public const int abc_searchview_description_query = 2131361804;
+
+ // aapt resource value: 0x7f0a000d
+ public const int abc_searchview_description_search = 2131361805;
+
+ // aapt resource value: 0x7f0a000e
+ public const int abc_searchview_description_submit = 2131361806;
+
+ // aapt resource value: 0x7f0a000f
+ public const int abc_searchview_description_voice = 2131361807;
+
+ // aapt resource value: 0x7f0a0010
+ public const int abc_shareactionprovider_share_with = 2131361808;
+
+ // aapt resource value: 0x7f0a0011
+ public const int abc_shareactionprovider_share_with_application = 2131361809;
+
+ // aapt resource value: 0x7f0a0012
+ public const int abc_toolbar_collapse_description = 2131361810;
+
+ // aapt resource value: 0x7f0a003c
+ public const int app_name = 2131361852;
+
+ // aapt resource value: 0x7f0a0021
+ public const int appbar_scrolling_view_behavior = 2131361825;
+
+ // aapt resource value: 0x7f0a0022
+ public const int bottom_sheet_behavior = 2131361826;
+
+ // aapt resource value: 0x7f0a0023
+ public const int character_counter_pattern = 2131361827;
+
+ // aapt resource value: 0x7f0a003d
+ public const int gd_activity_title = 2131361853;
+
+ // aapt resource value: 0x7f0a003e
+ public const int gd_cancel = 2131361854;
+
+ // aapt resource value: 0x7f0a003f
+ public const int gd_myhome = 2131361855;
+
+ // aapt resource value: 0x7f0a0040
+ public const int gd_notifyMsg = 2131361856;
+
+ // aapt resource value: 0x7f0a0041
+ public const int gd_notifyTitle = 2131361857;
+
+ // aapt resource value: 0x7f0a0042
+ public const int gd_save = 2131361858;
+
+ // aapt resource value: 0x7f0a0043
+ public const int gd_search_tip = 2131361859;
+
+ // aapt resource value: 0x7f0a0044
+ public const int gd_select_distance = 2131361860;
+
+ // aapt resource value: 0x7f0a0045
+ public const int gd_setting = 2131361861;
+
+ // aapt resource value: 0x7f0a004e
+ public const int hello = 2131361870;
+
+ // aapt resource value: 0x7f0a0029
+ public const int not_recognized_fingerprint_hint = 2131361833;
+
+ // aapt resource value: 0x7f0a0024
+ public const int password_toggle_content_description = 2131361828;
+
+ // aapt resource value: 0x7f0a0025
+ public const int path_password_eye = 2131361829;
+
+ // aapt resource value: 0x7f0a0026
+ public const int path_password_eye_mask_strike_through = 2131361830;
+
+ // aapt resource value: 0x7f0a0027
+ public const int path_password_eye_mask_visible = 2131361831;
+
+ // aapt resource value: 0x7f0a0028
+ public const int path_password_strike_through = 2131361832;
+
+ // aapt resource value: 0x7f0a0046
+ public const int pickerview_cancel = 2131361862;
+
+ // aapt resource value: 0x7f0a0047
+ public const int pickerview_day = 2131361863;
+
+ // aapt resource value: 0x7f0a0048
+ public const int pickerview_hours = 2131361864;
+
+ // aapt resource value: 0x7f0a0049
+ public const int pickerview_minutes = 2131361865;
+
+ // aapt resource value: 0x7f0a004a
+ public const int pickerview_month = 2131361866;
+
+ // aapt resource value: 0x7f0a004b
+ public const int pickerview_seconds = 2131361867;
+
+ // aapt resource value: 0x7f0a004c
+ public const int pickerview_submit = 2131361868;
+
+ // aapt resource value: 0x7f0a004d
+ public const int pickerview_year = 2131361869;
+
+ // aapt resource value: 0x7f0a0013
+ public const int search_menu_title = 2131361811;
+
+ // aapt resource value: 0x7f0a002b
+ public const int srl_component_falsify = 2131361835;
+
+ // aapt resource value: 0x7f0a002c
+ public const int srl_content_empty = 2131361836;
+
+ // aapt resource value: 0x7f0a002d
+ public const int srl_footer_failed = 2131361837;
+
+ // aapt resource value: 0x7f0a002e
+ public const int srl_footer_finish = 2131361838;
+
+ // aapt resource value: 0x7f0a002f
+ public const int srl_footer_loading = 2131361839;
+
+ // aapt resource value: 0x7f0a0030
+ public const int srl_footer_nothing = 2131361840;
+
+ // aapt resource value: 0x7f0a0031
+ public const int srl_footer_pulling = 2131361841;
+
+ // aapt resource value: 0x7f0a0032
+ public const int srl_footer_refreshing = 2131361842;
+
+ // aapt resource value: 0x7f0a0033
+ public const int srl_footer_release = 2131361843;
+
+ // aapt resource value: 0x7f0a0034
+ public const int srl_header_failed = 2131361844;
+
+ // aapt resource value: 0x7f0a0035
+ public const int srl_header_finish = 2131361845;
+
+ // aapt resource value: 0x7f0a0036
+ public const int srl_header_loading = 2131361846;
+
+ // aapt resource value: 0x7f0a0037
+ public const int srl_header_pulling = 2131361847;
+
+ // aapt resource value: 0x7f0a0038
+ public const int srl_header_refreshing = 2131361848;
+
+ // aapt resource value: 0x7f0a0039
+ public const int srl_header_release = 2131361849;
+
+ // aapt resource value: 0x7f0a003a
+ public const int srl_header_secondary = 2131361850;
+
+ // aapt resource value: 0x7f0a003b
+ public const int srl_header_update = 2131361851;
+
+ // aapt resource value: 0x7f0a0014
+ public const int status_bar_notification_info_overflow = 2131361812;
+
+ // aapt resource value: 0x7f0a002a
+ public const int touch_fingerprint_sensor_hint = 2131361834;
+
static String()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private String()
{
}
}
-
+
public partial class Style
{
-
- // aapt resource value: 0x7F0E0000
- public const int AlertDialog_AppCompat = 2131623936;
-
- // aapt resource value: 0x7F0E0001
- public const int AlertDialog_AppCompat_Light = 2131623937;
-
- // aapt resource value: 0x7F0E0002
- public const int Animation_AppCompat_Dialog = 2131623938;
-
- // aapt resource value: 0x7F0E0003
- public const int Animation_AppCompat_DropDownUp = 2131623939;
-
- // aapt resource value: 0x7F0E0004
- public const int Animation_AppCompat_Tooltip = 2131623940;
-
- // aapt resource value: 0x7F0E0005
- public const int Animation_Design_BottomSheetDialog = 2131623941;
-
- // aapt resource value: 0x7F0E0006
- public const int Base_AlertDialog_AppCompat = 2131623942;
-
- // aapt resource value: 0x7F0E0007
- public const int Base_AlertDialog_AppCompat_Light = 2131623943;
-
- // aapt resource value: 0x7F0E0008
- public const int Base_Animation_AppCompat_Dialog = 2131623944;
-
- // aapt resource value: 0x7F0E0009
- public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
-
- // aapt resource value: 0x7F0E000A
- public const int Base_Animation_AppCompat_Tooltip = 2131623946;
-
- // aapt resource value: 0x7F0E000C
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
-
- // aapt resource value: 0x7F0E000B
- public const int Base_DialogWindowTitle_AppCompat = 2131623947;
-
- // aapt resource value: 0x7F0E000D
- public const int Base_TextAppearance_AppCompat = 2131623949;
-
- // aapt resource value: 0x7F0E000E
- public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
-
- // aapt resource value: 0x7F0E000F
- public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
-
- // aapt resource value: 0x7F0E0010
- public const int Base_TextAppearance_AppCompat_Button = 2131623952;
-
- // aapt resource value: 0x7F0E0011
- public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
-
- // aapt resource value: 0x7F0E0012
- public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
-
- // aapt resource value: 0x7F0E0013
- public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
-
- // aapt resource value: 0x7F0E0014
- public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
-
- // aapt resource value: 0x7F0E0015
- public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
-
- // aapt resource value: 0x7F0E0016
- public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
-
- // aapt resource value: 0x7F0E0017
- public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
-
- // aapt resource value: 0x7F0E0018
- public const int Base_TextAppearance_AppCompat_Large = 2131623960;
-
- // aapt resource value: 0x7F0E0019
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
-
- // aapt resource value: 0x7F0E001A
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
-
- // aapt resource value: 0x7F0E001B
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
-
- // aapt resource value: 0x7F0E001C
- public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
-
- // aapt resource value: 0x7F0E001D
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
-
- // aapt resource value: 0x7F0E001E
- public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
-
- // aapt resource value: 0x7F0E001F
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
-
- // aapt resource value: 0x7F0E0020
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
-
- // aapt resource value: 0x7F0E0021
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
-
- // aapt resource value: 0x7F0E0022
- public const int Base_TextAppearance_AppCompat_Small = 2131623970;
-
- // aapt resource value: 0x7F0E0023
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
-
- // aapt resource value: 0x7F0E0024
- public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
-
- // aapt resource value: 0x7F0E0025
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
-
- // aapt resource value: 0x7F0E0026
- public const int Base_TextAppearance_AppCompat_Title = 2131623974;
-
- // aapt resource value: 0x7F0E0027
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
-
- // aapt resource value: 0x7F0E0028
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
-
- // aapt resource value: 0x7F0E0029
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
-
- // aapt resource value: 0x7F0E002A
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
-
- // aapt resource value: 0x7F0E002B
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
-
- // aapt resource value: 0x7F0E002C
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
-
- // aapt resource value: 0x7F0E002D
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
-
- // aapt resource value: 0x7F0E002E
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
-
- // aapt resource value: 0x7F0E002F
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
-
- // aapt resource value: 0x7F0E0030
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
-
- // aapt resource value: 0x7F0E0031
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
-
- // aapt resource value: 0x7F0E0032
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
-
- // aapt resource value: 0x7F0E0033
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
-
- // aapt resource value: 0x7F0E0034
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
-
- // aapt resource value: 0x7F0E0035
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
-
- // aapt resource value: 0x7F0E0036
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
-
- // aapt resource value: 0x7F0E0037
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
-
- // aapt resource value: 0x7F0E0038
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
-
- // aapt resource value: 0x7F0E0039
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
-
- // aapt resource value: 0x7F0E003A
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
-
- // aapt resource value: 0x7F0E003B
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
-
- // aapt resource value: 0x7F0E003C
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
-
- // aapt resource value: 0x7F0E004B
- public const int Base_ThemeOverlay_AppCompat = 2131624011;
-
- // aapt resource value: 0x7F0E004C
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
-
- // aapt resource value: 0x7F0E004D
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
-
- // aapt resource value: 0x7F0E004E
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
-
- // aapt resource value: 0x7F0E004F
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
-
- // aapt resource value: 0x7F0E0050
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
-
- // aapt resource value: 0x7F0E0051
- public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
-
- // aapt resource value: 0x7F0E003D
- public const int Base_Theme_AppCompat = 2131623997;
-
- // aapt resource value: 0x7F0E003E
- public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
-
- // aapt resource value: 0x7F0E003F
- public const int Base_Theme_AppCompat_Dialog = 2131623999;
-
- // aapt resource value: 0x7F0E0043
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
-
- // aapt resource value: 0x7F0E0040
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
-
- // aapt resource value: 0x7F0E0041
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
-
- // aapt resource value: 0x7F0E0042
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
-
- // aapt resource value: 0x7F0E0044
- public const int Base_Theme_AppCompat_Light = 2131624004;
-
- // aapt resource value: 0x7F0E0045
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
-
- // aapt resource value: 0x7F0E0046
- public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
-
- // aapt resource value: 0x7F0E004A
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
-
- // aapt resource value: 0x7F0E0047
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
-
- // aapt resource value: 0x7F0E0048
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
-
- // aapt resource value: 0x7F0E0049
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
-
- // aapt resource value: 0x7F0E0054
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
-
- // aapt resource value: 0x7F0E0052
- public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
-
- // aapt resource value: 0x7F0E0053
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
-
- // aapt resource value: 0x7F0E0055
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
-
- // aapt resource value: 0x7F0E0056
- public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
-
- // aapt resource value: 0x7F0E0057
- public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
-
- // aapt resource value: 0x7F0E005C
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
-
- // aapt resource value: 0x7F0E0058
- public const int Base_V21_Theme_AppCompat = 2131624024;
-
- // aapt resource value: 0x7F0E0059
- public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
-
- // aapt resource value: 0x7F0E005A
- public const int Base_V21_Theme_AppCompat_Light = 2131624026;
-
- // aapt resource value: 0x7F0E005B
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
-
- // aapt resource value: 0x7F0E005D
- public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
-
- // aapt resource value: 0x7F0E005E
- public const int Base_V22_Theme_AppCompat = 2131624030;
-
- // aapt resource value: 0x7F0E005F
- public const int Base_V22_Theme_AppCompat_Light = 2131624031;
-
- // aapt resource value: 0x7F0E0060
- public const int Base_V23_Theme_AppCompat = 2131624032;
-
- // aapt resource value: 0x7F0E0061
- public const int Base_V23_Theme_AppCompat_Light = 2131624033;
-
- // aapt resource value: 0x7F0E0062
- public const int Base_V26_Theme_AppCompat = 2131624034;
-
- // aapt resource value: 0x7F0E0063
- public const int Base_V26_Theme_AppCompat_Light = 2131624035;
-
- // aapt resource value: 0x7F0E0064
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
-
- // aapt resource value: 0x7F0E0065
- public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
-
- // aapt resource value: 0x7F0E006A
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
-
- // aapt resource value: 0x7F0E0066
- public const int Base_V7_Theme_AppCompat = 2131624038;
-
- // aapt resource value: 0x7F0E0067
- public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
-
- // aapt resource value: 0x7F0E0068
- public const int Base_V7_Theme_AppCompat_Light = 2131624040;
-
- // aapt resource value: 0x7F0E0069
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
-
- // aapt resource value: 0x7F0E006B
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
-
- // aapt resource value: 0x7F0E006C
- public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
-
- // aapt resource value: 0x7F0E006D
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
-
- // aapt resource value: 0x7F0E006E
- public const int Base_Widget_AppCompat_ActionBar = 2131624046;
-
- // aapt resource value: 0x7F0E006F
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
-
- // aapt resource value: 0x7F0E0070
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
-
- // aapt resource value: 0x7F0E0071
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
-
- // aapt resource value: 0x7F0E0072
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
-
- // aapt resource value: 0x7F0E0073
- public const int Base_Widget_AppCompat_ActionButton = 2131624051;
-
- // aapt resource value: 0x7F0E0074
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
-
- // aapt resource value: 0x7F0E0075
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
-
- // aapt resource value: 0x7F0E0076
- public const int Base_Widget_AppCompat_ActionMode = 2131624054;
-
- // aapt resource value: 0x7F0E0077
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
-
- // aapt resource value: 0x7F0E0078
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
-
- // aapt resource value: 0x7F0E0079
- public const int Base_Widget_AppCompat_Button = 2131624057;
-
- // aapt resource value: 0x7F0E007F
- public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
-
- // aapt resource value: 0x7F0E0080
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
-
- // aapt resource value: 0x7F0E007A
- public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
-
- // aapt resource value: 0x7F0E007B
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
-
- // aapt resource value: 0x7F0E007C
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
-
- // aapt resource value: 0x7F0E007D
- public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
-
- // aapt resource value: 0x7F0E007E
- public const int Base_Widget_AppCompat_Button_Small = 2131624062;
-
- // aapt resource value: 0x7F0E0081
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
-
- // aapt resource value: 0x7F0E0082
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
-
- // aapt resource value: 0x7F0E0083
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
-
- // aapt resource value: 0x7F0E0084
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
-
- // aapt resource value: 0x7F0E0085
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
-
- // aapt resource value: 0x7F0E0086
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
-
- // aapt resource value: 0x7F0E0087
- public const int Base_Widget_AppCompat_EditText = 2131624071;
-
- // aapt resource value: 0x7F0E0088
- public const int Base_Widget_AppCompat_ImageButton = 2131624072;
-
- // aapt resource value: 0x7F0E0089
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
-
- // aapt resource value: 0x7F0E008A
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
-
- // aapt resource value: 0x7F0E008B
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
-
- // aapt resource value: 0x7F0E008C
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
-
- // aapt resource value: 0x7F0E008D
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
-
- // aapt resource value: 0x7F0E008E
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
-
- // aapt resource value: 0x7F0E008F
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
-
- // aapt resource value: 0x7F0E0090
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
-
- // aapt resource value: 0x7F0E0091
- public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
-
- // aapt resource value: 0x7F0E0092
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
-
- // aapt resource value: 0x7F0E0093
- public const int Base_Widget_AppCompat_ListView = 2131624083;
-
- // aapt resource value: 0x7F0E0094
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
-
- // aapt resource value: 0x7F0E0095
- public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
-
- // aapt resource value: 0x7F0E0096
- public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
-
- // aapt resource value: 0x7F0E0097
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
-
- // aapt resource value: 0x7F0E0098
- public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
-
- // aapt resource value: 0x7F0E0099
- public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
-
- // aapt resource value: 0x7F0E009A
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
-
- // aapt resource value: 0x7F0E009B
- public const int Base_Widget_AppCompat_RatingBar = 2131624091;
-
- // aapt resource value: 0x7F0E009C
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
-
- // aapt resource value: 0x7F0E009D
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
-
- // aapt resource value: 0x7F0E009E
- public const int Base_Widget_AppCompat_SearchView = 2131624094;
-
- // aapt resource value: 0x7F0E009F
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
-
- // aapt resource value: 0x7F0E00A0
- public const int Base_Widget_AppCompat_SeekBar = 2131624096;
-
- // aapt resource value: 0x7F0E00A1
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
-
- // aapt resource value: 0x7F0E00A2
- public const int Base_Widget_AppCompat_Spinner = 2131624098;
-
- // aapt resource value: 0x7F0E00A3
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
-
- // aapt resource value: 0x7F0E00A4
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
-
- // aapt resource value: 0x7F0E00A5
- public const int Base_Widget_AppCompat_Toolbar = 2131624101;
-
- // aapt resource value: 0x7F0E00A6
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
-
- // aapt resource value: 0x7F0E00A7
- public const int Base_Widget_Design_AppBarLayout = 2131624103;
-
- // aapt resource value: 0x7F0E00A8
- public const int Base_Widget_Design_TabLayout = 2131624104;
-
- // aapt resource value: 0x7F0E00A9
- public const int BottomSheetDialogAnimation = 2131624105;
-
- // aapt resource value: 0x7F0E018D
- public const int custom_dialog2 = 2131624333;
-
- // aapt resource value: 0x7F0E00AA
- public const int MyTheme = 2131624106;
-
- // aapt resource value: 0x7F0E018E
- public const int picker_view_scale_anim = 2131624334;
-
- // aapt resource value: 0x7F0E018F
- public const int picker_view_slide_anim = 2131624335;
-
- // aapt resource value: 0x7F0E00AB
- public const int Platform_AppCompat = 2131624107;
-
- // aapt resource value: 0x7F0E00AC
- public const int Platform_AppCompat_Light = 2131624108;
-
- // aapt resource value: 0x7F0E00AD
- public const int Platform_ThemeOverlay_AppCompat = 2131624109;
-
- // aapt resource value: 0x7F0E00AE
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
-
- // aapt resource value: 0x7F0E00AF
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
-
- // aapt resource value: 0x7F0E00B0
- public const int Platform_V11_AppCompat = 2131624112;
-
- // aapt resource value: 0x7F0E00B1
- public const int Platform_V11_AppCompat_Light = 2131624113;
-
- // aapt resource value: 0x7F0E00B2
- public const int Platform_V14_AppCompat = 2131624114;
-
- // aapt resource value: 0x7F0E00B3
- public const int Platform_V14_AppCompat_Light = 2131624115;
-
- // aapt resource value: 0x7F0E00B4
- public const int Platform_V21_AppCompat = 2131624116;
-
- // aapt resource value: 0x7F0E00B5
- public const int Platform_V21_AppCompat_Light = 2131624117;
-
- // aapt resource value: 0x7F0E00B6
- public const int Platform_V25_AppCompat = 2131624118;
-
- // aapt resource value: 0x7F0E00B7
- public const int Platform_V25_AppCompat_Light = 2131624119;
-
- // aapt resource value: 0x7F0E00B8
- public const int Platform_Widget_AppCompat_Spinner = 2131624120;
-
- // aapt resource value: 0x7F0E00B9
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
-
- // aapt resource value: 0x7F0E00BA
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
-
- // aapt resource value: 0x7F0E00BB
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
-
- // aapt resource value: 0x7F0E00BC
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
-
- // aapt resource value: 0x7F0E00BD
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
-
- // aapt resource value: 0x7F0E00BE
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
-
- // aapt resource value: 0x7F0E00C4
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
-
- // aapt resource value: 0x7F0E00BF
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
-
- // aapt resource value: 0x7F0E00C0
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
-
- // aapt resource value: 0x7F0E00C1
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
-
- // aapt resource value: 0x7F0E00C2
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
-
- // aapt resource value: 0x7F0E00C3
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
-
- // aapt resource value: 0x7F0E00C5
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
-
- // aapt resource value: 0x7F0E00C6
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
-
- // aapt resource value: 0x7F0E00C7
- public const int TextAppearance_AppCompat = 2131624135;
-
- // aapt resource value: 0x7F0E00C8
- public const int TextAppearance_AppCompat_Body1 = 2131624136;
-
- // aapt resource value: 0x7F0E00C9
- public const int TextAppearance_AppCompat_Body2 = 2131624137;
-
- // aapt resource value: 0x7F0E00CA
- public const int TextAppearance_AppCompat_Button = 2131624138;
-
- // aapt resource value: 0x7F0E00CB
- public const int TextAppearance_AppCompat_Caption = 2131624139;
-
- // aapt resource value: 0x7F0E00CC
- public const int TextAppearance_AppCompat_Display1 = 2131624140;
-
- // aapt resource value: 0x7F0E00CD
- public const int TextAppearance_AppCompat_Display2 = 2131624141;
-
- // aapt resource value: 0x7F0E00CE
- public const int TextAppearance_AppCompat_Display3 = 2131624142;
-
- // aapt resource value: 0x7F0E00CF
- public const int TextAppearance_AppCompat_Display4 = 2131624143;
-
- // aapt resource value: 0x7F0E00D0
- public const int TextAppearance_AppCompat_Headline = 2131624144;
-
- // aapt resource value: 0x7F0E00D1
- public const int TextAppearance_AppCompat_Inverse = 2131624145;
-
- // aapt resource value: 0x7F0E00D2
- public const int TextAppearance_AppCompat_Large = 2131624146;
-
- // aapt resource value: 0x7F0E00D3
- public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
-
- // aapt resource value: 0x7F0E00D4
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
-
- // aapt resource value: 0x7F0E00D5
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
-
- // aapt resource value: 0x7F0E00D6
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
-
- // aapt resource value: 0x7F0E00D7
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
-
- // aapt resource value: 0x7F0E00D8
- public const int TextAppearance_AppCompat_Medium = 2131624152;
-
- // aapt resource value: 0x7F0E00D9
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
-
- // aapt resource value: 0x7F0E00DA
- public const int TextAppearance_AppCompat_Menu = 2131624154;
-
- // aapt resource value: 0x7F0E00DB
- public const int TextAppearance_AppCompat_Notification = 2131624155;
-
- // aapt resource value: 0x7F0E00DC
- public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
-
- // aapt resource value: 0x7F0E00DD
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
-
- // aapt resource value: 0x7F0E00DE
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
-
- // aapt resource value: 0x7F0E00DF
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
-
- // aapt resource value: 0x7F0E00E0
- public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
-
- // aapt resource value: 0x7F0E00E1
- public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
-
- // aapt resource value: 0x7F0E00E2
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
-
- // aapt resource value: 0x7F0E00E3
- public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
-
- // aapt resource value: 0x7F0E00E4
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
-
- // aapt resource value: 0x7F0E00E5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
-
- // aapt resource value: 0x7F0E00E6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
-
- // aapt resource value: 0x7F0E00E7
- public const int TextAppearance_AppCompat_Small = 2131624167;
-
- // aapt resource value: 0x7F0E00E8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
-
- // aapt resource value: 0x7F0E00E9
- public const int TextAppearance_AppCompat_Subhead = 2131624169;
-
- // aapt resource value: 0x7F0E00EA
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
-
- // aapt resource value: 0x7F0E00EB
- public const int TextAppearance_AppCompat_Title = 2131624171;
-
- // aapt resource value: 0x7F0E00EC
- public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
-
- // aapt resource value: 0x7F0E00ED
- public const int TextAppearance_AppCompat_Tooltip = 2131624173;
-
- // aapt resource value: 0x7F0E00EE
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
-
- // aapt resource value: 0x7F0E00EF
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
-
- // aapt resource value: 0x7F0E00F0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
-
- // aapt resource value: 0x7F0E00F1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
-
- // aapt resource value: 0x7F0E00F2
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
-
- // aapt resource value: 0x7F0E00F3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
-
- // aapt resource value: 0x7F0E00F4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
-
- // aapt resource value: 0x7F0E00F5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
-
- // aapt resource value: 0x7F0E00F6
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
-
- // aapt resource value: 0x7F0E00F7
- public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
-
- // aapt resource value: 0x7F0E00F8
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
-
- // aapt resource value: 0x7F0E00F9
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
-
- // aapt resource value: 0x7F0E00FA
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
-
- // aapt resource value: 0x7F0E00FB
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
-
- // aapt resource value: 0x7F0E00FC
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
-
- // aapt resource value: 0x7F0E00FD
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
-
- // aapt resource value: 0x7F0E00FE
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
-
- // aapt resource value: 0x7F0E00FF
- public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
-
- // aapt resource value: 0x7F0E0100
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
-
- // aapt resource value: 0x7F0E0101
- public const int TextAppearance_Compat_Notification = 2131624193;
-
- // aapt resource value: 0x7F0E0102
- public const int TextAppearance_Compat_Notification_Info = 2131624194;
-
- // aapt resource value: 0x7F0E0103
- public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
-
- // aapt resource value: 0x7F0E0104
- public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
-
- // aapt resource value: 0x7F0E0105
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
-
- // aapt resource value: 0x7F0E0106
- public const int TextAppearance_Compat_Notification_Media = 2131624198;
-
- // aapt resource value: 0x7F0E0107
- public const int TextAppearance_Compat_Notification_Time = 2131624199;
-
- // aapt resource value: 0x7F0E0108
- public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
-
- // aapt resource value: 0x7F0E0109
- public const int TextAppearance_Compat_Notification_Title = 2131624201;
-
- // aapt resource value: 0x7F0E010A
- public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
-
- // aapt resource value: 0x7F0E010B
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
-
- // aapt resource value: 0x7F0E010C
- public const int TextAppearance_Design_Counter = 2131624204;
-
- // aapt resource value: 0x7F0E010D
- public const int TextAppearance_Design_Counter_Overflow = 2131624205;
-
- // aapt resource value: 0x7F0E010E
- public const int TextAppearance_Design_Error = 2131624206;
-
- // aapt resource value: 0x7F0E010F
- public const int TextAppearance_Design_Hint = 2131624207;
-
- // aapt resource value: 0x7F0E0110
- public const int TextAppearance_Design_Snackbar_Message = 2131624208;
-
- // aapt resource value: 0x7F0E0111
- public const int TextAppearance_Design_Tab = 2131624209;
-
- // aapt resource value: 0x7F0E0112
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
-
- // aapt resource value: 0x7F0E0113
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
-
- // aapt resource value: 0x7F0E0114
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
-
- // aapt resource value: 0x7F0E0131
- public const int ThemeOverlay_AppCompat = 2131624241;
-
- // aapt resource value: 0x7F0E0132
- public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
-
- // aapt resource value: 0x7F0E0133
- public const int ThemeOverlay_AppCompat_Dark = 2131624243;
-
- // aapt resource value: 0x7F0E0134
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
-
- // aapt resource value: 0x7F0E0135
- public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
-
- // aapt resource value: 0x7F0E0136
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
-
- // aapt resource value: 0x7F0E0137
- public const int ThemeOverlay_AppCompat_Light = 2131624247;
-
- // aapt resource value: 0x7F0E0115
- public const int Theme_AppCompat = 2131624213;
-
- // aapt resource value: 0x7F0E0116
- public const int Theme_AppCompat_CompactMenu = 2131624214;
-
- // aapt resource value: 0x7F0E0117
- public const int Theme_AppCompat_DayNight = 2131624215;
-
- // aapt resource value: 0x7F0E0118
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
-
- // aapt resource value: 0x7F0E0119
- public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
-
- // aapt resource value: 0x7F0E011C
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
-
- // aapt resource value: 0x7F0E011A
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
-
- // aapt resource value: 0x7F0E011B
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
-
- // aapt resource value: 0x7F0E011D
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
-
- // aapt resource value: 0x7F0E011E
- public const int Theme_AppCompat_Dialog = 2131624222;
-
- // aapt resource value: 0x7F0E0121
- public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
-
- // aapt resource value: 0x7F0E011F
- public const int Theme_AppCompat_Dialog_Alert = 2131624223;
-
- // aapt resource value: 0x7F0E0120
- public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
-
- // aapt resource value: 0x7F0E0122
- public const int Theme_AppCompat_Light = 2131624226;
-
- // aapt resource value: 0x7F0E0123
- public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
-
- // aapt resource value: 0x7F0E0124
- public const int Theme_AppCompat_Light_Dialog = 2131624228;
-
- // aapt resource value: 0x7F0E0127
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
-
- // aapt resource value: 0x7F0E0125
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
-
- // aapt resource value: 0x7F0E0126
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
-
- // aapt resource value: 0x7F0E0128
- public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
-
- // aapt resource value: 0x7F0E0129
- public const int Theme_AppCompat_NoActionBar = 2131624233;
-
- // aapt resource value: 0x7F0E012A
- public const int Theme_BiometricPromptDialog = 2131624234;
-
- // aapt resource value: 0x7F0E012B
- public const int Theme_Design = 2131624235;
-
- // aapt resource value: 0x7F0E012C
- public const int Theme_Design_BottomSheetDialog = 2131624236;
-
- // aapt resource value: 0x7F0E012D
- public const int Theme_Design_Light = 2131624237;
-
- // aapt resource value: 0x7F0E012E
- public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
-
- // aapt resource value: 0x7F0E012F
- public const int Theme_Design_Light_NoActionBar = 2131624239;
-
- // aapt resource value: 0x7F0E0130
- public const int Theme_Design_NoActionBar = 2131624240;
-
- // aapt resource value: 0x7F0E0138
- public const int Widget_AppCompat_ActionBar = 2131624248;
-
- // aapt resource value: 0x7F0E0139
- public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
-
- // aapt resource value: 0x7F0E013A
- public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
-
- // aapt resource value: 0x7F0E013B
- public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
-
- // aapt resource value: 0x7F0E013C
- public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
-
- // aapt resource value: 0x7F0E013D
- public const int Widget_AppCompat_ActionButton = 2131624253;
-
- // aapt resource value: 0x7F0E013E
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
-
- // aapt resource value: 0x7F0E013F
- public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
-
- // aapt resource value: 0x7F0E0140
- public const int Widget_AppCompat_ActionMode = 2131624256;
-
- // aapt resource value: 0x7F0E0141
- public const int Widget_AppCompat_ActivityChooserView = 2131624257;
-
- // aapt resource value: 0x7F0E0142
- public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
-
- // aapt resource value: 0x7F0E0143
- public const int Widget_AppCompat_Button = 2131624259;
-
- // aapt resource value: 0x7F0E0149
- public const int Widget_AppCompat_ButtonBar = 2131624265;
-
- // aapt resource value: 0x7F0E014A
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
-
- // aapt resource value: 0x7F0E0144
- public const int Widget_AppCompat_Button_Borderless = 2131624260;
-
- // aapt resource value: 0x7F0E0145
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
-
- // aapt resource value: 0x7F0E0146
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
-
- // aapt resource value: 0x7F0E0147
- public const int Widget_AppCompat_Button_Colored = 2131624263;
-
- // aapt resource value: 0x7F0E0148
- public const int Widget_AppCompat_Button_Small = 2131624264;
-
- // aapt resource value: 0x7F0E014B
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
-
- // aapt resource value: 0x7F0E014C
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
-
- // aapt resource value: 0x7F0E014D
- public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
-
- // aapt resource value: 0x7F0E014E
- public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
-
- // aapt resource value: 0x7F0E014F
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
-
- // aapt resource value: 0x7F0E0150
- public const int Widget_AppCompat_EditText = 2131624272;
-
- // aapt resource value: 0x7F0E0151
- public const int Widget_AppCompat_ImageButton = 2131624273;
-
- // aapt resource value: 0x7F0E0152
- public const int Widget_AppCompat_Light_ActionBar = 2131624274;
-
- // aapt resource value: 0x7F0E0153
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
-
- // aapt resource value: 0x7F0E0154
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
-
- // aapt resource value: 0x7F0E0155
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
-
- // aapt resource value: 0x7F0E0156
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
-
- // aapt resource value: 0x7F0E0157
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
-
- // aapt resource value: 0x7F0E0158
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
-
- // aapt resource value: 0x7F0E0159
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
-
- // aapt resource value: 0x7F0E015A
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
-
- // aapt resource value: 0x7F0E015B
- public const int Widget_AppCompat_Light_ActionButton = 2131624283;
-
- // aapt resource value: 0x7F0E015C
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
-
- // aapt resource value: 0x7F0E015D
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
-
- // aapt resource value: 0x7F0E015E
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
-
- // aapt resource value: 0x7F0E015F
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
-
- // aapt resource value: 0x7F0E0160
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
-
- // aapt resource value: 0x7F0E0161
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
-
- // aapt resource value: 0x7F0E0162
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
-
- // aapt resource value: 0x7F0E0163
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
-
- // aapt resource value: 0x7F0E0164
- public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
-
- // aapt resource value: 0x7F0E0165
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
-
- // aapt resource value: 0x7F0E0166
- public const int Widget_AppCompat_Light_SearchView = 2131624294;
-
- // aapt resource value: 0x7F0E0167
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
-
- // aapt resource value: 0x7F0E0168
- public const int Widget_AppCompat_ListMenuView = 2131624296;
-
- // aapt resource value: 0x7F0E0169
- public const int Widget_AppCompat_ListPopupWindow = 2131624297;
-
- // aapt resource value: 0x7F0E016A
- public const int Widget_AppCompat_ListView = 2131624298;
-
- // aapt resource value: 0x7F0E016B
- public const int Widget_AppCompat_ListView_DropDown = 2131624299;
-
- // aapt resource value: 0x7F0E016C
- public const int Widget_AppCompat_ListView_Menu = 2131624300;
-
- // aapt resource value: 0x7F0E016D
- public const int Widget_AppCompat_PopupMenu = 2131624301;
-
- // aapt resource value: 0x7F0E016E
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
-
- // aapt resource value: 0x7F0E016F
- public const int Widget_AppCompat_PopupWindow = 2131624303;
-
- // aapt resource value: 0x7F0E0170
- public const int Widget_AppCompat_ProgressBar = 2131624304;
-
- // aapt resource value: 0x7F0E0171
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
-
- // aapt resource value: 0x7F0E0172
- public const int Widget_AppCompat_RatingBar = 2131624306;
-
- // aapt resource value: 0x7F0E0173
- public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
-
- // aapt resource value: 0x7F0E0174
- public const int Widget_AppCompat_RatingBar_Small = 2131624308;
-
- // aapt resource value: 0x7F0E0175
- public const int Widget_AppCompat_SearchView = 2131624309;
-
- // aapt resource value: 0x7F0E0176
- public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
-
- // aapt resource value: 0x7F0E0177
- public const int Widget_AppCompat_SeekBar = 2131624311;
-
- // aapt resource value: 0x7F0E0178
- public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
-
- // aapt resource value: 0x7F0E0179
- public const int Widget_AppCompat_Spinner = 2131624313;
-
- // aapt resource value: 0x7F0E017A
- public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
-
- // aapt resource value: 0x7F0E017B
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
-
- // aapt resource value: 0x7F0E017C
- public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
-
- // aapt resource value: 0x7F0E017D
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
-
- // aapt resource value: 0x7F0E017E
- public const int Widget_AppCompat_Toolbar = 2131624318;
-
- // aapt resource value: 0x7F0E017F
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
-
- // aapt resource value: 0x7F0E0180
- public const int Widget_Compat_NotificationActionContainer = 2131624320;
-
- // aapt resource value: 0x7F0E0181
- public const int Widget_Compat_NotificationActionText = 2131624321;
-
- // aapt resource value: 0x7F0E0182
- public const int Widget_Design_AppBarLayout = 2131624322;
-
- // aapt resource value: 0x7F0E0183
- public const int Widget_Design_BottomNavigationView = 2131624323;
-
- // aapt resource value: 0x7F0E0184
- public const int Widget_Design_BottomSheet_Modal = 2131624324;
-
- // aapt resource value: 0x7F0E0185
- public const int Widget_Design_CollapsingToolbar = 2131624325;
-
- // aapt resource value: 0x7F0E0186
- public const int Widget_Design_CoordinatorLayout = 2131624326;
-
- // aapt resource value: 0x7F0E0187
- public const int Widget_Design_FloatingActionButton = 2131624327;
-
- // aapt resource value: 0x7F0E0188
- public const int Widget_Design_NavigationView = 2131624328;
-
- // aapt resource value: 0x7F0E0189
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
-
- // aapt resource value: 0x7F0E018A
- public const int Widget_Design_Snackbar = 2131624330;
-
- // aapt resource value: 0x7F0E018B
- public const int Widget_Design_TabLayout = 2131624331;
-
- // aapt resource value: 0x7F0E018C
- public const int Widget_Design_TextInputLayout = 2131624332;
-
+
+ // aapt resource value: 0x7f0b009d
+ public const int AlertDialog_AppCompat = 2131427485;
+
+ // aapt resource value: 0x7f0b009e
+ public const int AlertDialog_AppCompat_Light = 2131427486;
+
+ // aapt resource value: 0x7f0b009f
+ public const int Animation_AppCompat_Dialog = 2131427487;
+
+ // aapt resource value: 0x7f0b00a0
+ public const int Animation_AppCompat_DropDownUp = 2131427488;
+
+ // aapt resource value: 0x7f0b00a1
+ public const int Animation_AppCompat_Tooltip = 2131427489;
+
+ // aapt resource value: 0x7f0b0169
+ public const int Animation_Design_BottomSheetDialog = 2131427689;
+
+ // aapt resource value: 0x7f0b00a2
+ public const int Base_AlertDialog_AppCompat = 2131427490;
+
+ // aapt resource value: 0x7f0b00a3
+ public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+
+ // aapt resource value: 0x7f0b00a4
+ public const int Base_Animation_AppCompat_Dialog = 2131427492;
+
+ // aapt resource value: 0x7f0b00a5
+ public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+
+ // aapt resource value: 0x7f0b00a6
+ public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+
+ // aapt resource value: 0x7f0b00a7
+ public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+
+ // aapt resource value: 0x7f0b00a8
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+
+ // aapt resource value: 0x7f0b0039
+ public const int Base_TextAppearance_AppCompat = 2131427385;
+
+ // aapt resource value: 0x7f0b003a
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+
+ // aapt resource value: 0x7f0b003b
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+
+ // aapt resource value: 0x7f0b0027
+ public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+
+ // aapt resource value: 0x7f0b003c
+ public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+
+ // aapt resource value: 0x7f0b003d
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+
+ // aapt resource value: 0x7f0b003e
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+
+ // aapt resource value: 0x7f0b003f
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+
+ // aapt resource value: 0x7f0b0040
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+
+ // aapt resource value: 0x7f0b0041
+ public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+
+ // aapt resource value: 0x7f0b000b
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+
+ // aapt resource value: 0x7f0b0042
+ public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+
+ // aapt resource value: 0x7f0b000c
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+
+ // aapt resource value: 0x7f0b0043
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+
+ // aapt resource value: 0x7f0b0044
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+
+ // aapt resource value: 0x7f0b0045
+ public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+
+ // aapt resource value: 0x7f0b000d
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+
+ // aapt resource value: 0x7f0b0046
+ public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+
+ // aapt resource value: 0x7f0b00a9
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+
+ // aapt resource value: 0x7f0b0047
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+
+ // aapt resource value: 0x7f0b0048
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+
+ // aapt resource value: 0x7f0b0049
+ public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+
+ // aapt resource value: 0x7f0b000e
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+
+ // aapt resource value: 0x7f0b004a
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+
+ // aapt resource value: 0x7f0b000f
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+
+ // aapt resource value: 0x7f0b004b
+ public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+
+ // aapt resource value: 0x7f0b0010
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+
+ // aapt resource value: 0x7f0b00aa
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+
+ // aapt resource value: 0x7f0b008e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+
+ // aapt resource value: 0x7f0b004c
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+
+ // aapt resource value: 0x7f0b004d
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+
+ // aapt resource value: 0x7f0b004e
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+
+ // aapt resource value: 0x7f0b004f
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+
+ // aapt resource value: 0x7f0b0050
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+
+ // aapt resource value: 0x7f0b0051
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+
+ // aapt resource value: 0x7f0b0052
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+
+ // aapt resource value: 0x7f0b0095
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+
+ // aapt resource value: 0x7f0b0096
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+
+ // aapt resource value: 0x7f0b008f
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+
+ // aapt resource value: 0x7f0b00ab
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+
+ // aapt resource value: 0x7f0b0053
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+
+ // aapt resource value: 0x7f0b0054
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+
+ // aapt resource value: 0x7f0b0055
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+
+ // aapt resource value: 0x7f0b0056
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+
+ // aapt resource value: 0x7f0b0057
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+
+ // aapt resource value: 0x7f0b00ac
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+
+ // aapt resource value: 0x7f0b0058
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+
+ // aapt resource value: 0x7f0b0059
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+
+ // aapt resource value: 0x7f0b005a
+ public const int Base_Theme_AppCompat = 2131427418;
+
+ // aapt resource value: 0x7f0b00ad
+ public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+
+ // aapt resource value: 0x7f0b0011
+ public const int Base_Theme_AppCompat_Dialog = 2131427345;
+
+ // aapt resource value: 0x7f0b0012
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+
+ // aapt resource value: 0x7f0b00ae
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+
+ // aapt resource value: 0x7f0b0013
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+
+ // aapt resource value: 0x7f0b0001
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+
+ // aapt resource value: 0x7f0b005b
+ public const int Base_Theme_AppCompat_Light = 2131427419;
+
+ // aapt resource value: 0x7f0b00af
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+
+ // aapt resource value: 0x7f0b0014
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+
+ // aapt resource value: 0x7f0b0015
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+
+ // aapt resource value: 0x7f0b00b0
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+
+ // aapt resource value: 0x7f0b0016
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+
+ // aapt resource value: 0x7f0b0002
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+
+ // aapt resource value: 0x7f0b00b1
+ public const int Base_ThemeOverlay_AppCompat = 2131427505;
+
+ // aapt resource value: 0x7f0b00b2
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+
+ // aapt resource value: 0x7f0b00b3
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+
+ // aapt resource value: 0x7f0b00b4
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+
+ // aapt resource value: 0x7f0b0017
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+
+ // aapt resource value: 0x7f0b0018
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+
+ // aapt resource value: 0x7f0b00b5
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+
+ // aapt resource value: 0x7f0b0019
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+
+ // aapt resource value: 0x7f0b001a
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+
+ // aapt resource value: 0x7f0b001b
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+
+ // aapt resource value: 0x7f0b0023
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+
+ // aapt resource value: 0x7f0b0024
+ public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+
+ // aapt resource value: 0x7f0b016a
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+
+ // aapt resource value: 0x7f0b005c
+ public const int Base_V21_Theme_AppCompat = 2131427420;
+
+ // aapt resource value: 0x7f0b005d
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+
+ // aapt resource value: 0x7f0b005e
+ public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+
+ // aapt resource value: 0x7f0b005f
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+
+ // aapt resource value: 0x7f0b0060
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+
+ // aapt resource value: 0x7f0b0166
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+
+ // aapt resource value: 0x7f0b008c
+ public const int Base_V22_Theme_AppCompat = 2131427468;
+
+ // aapt resource value: 0x7f0b008d
+ public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+
+ // aapt resource value: 0x7f0b0090
+ public const int Base_V23_Theme_AppCompat = 2131427472;
+
+ // aapt resource value: 0x7f0b0091
+ public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+
+ // aapt resource value: 0x7f0b0099
+ public const int Base_V26_Theme_AppCompat = 2131427481;
+
+ // aapt resource value: 0x7f0b009a
+ public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+
+ // aapt resource value: 0x7f0b009b
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+
+ // aapt resource value: 0x7f0b0168
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+
+ // aapt resource value: 0x7f0b00b6
+ public const int Base_V7_Theme_AppCompat = 2131427510;
+
+ // aapt resource value: 0x7f0b00b7
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+
+ // aapt resource value: 0x7f0b00b8
+ public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+
+ // aapt resource value: 0x7f0b00b9
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+
+ // aapt resource value: 0x7f0b00ba
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+
+ // aapt resource value: 0x7f0b00bb
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+
+ // aapt resource value: 0x7f0b00bc
+ public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+
+ // aapt resource value: 0x7f0b00bd
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+
+ // aapt resource value: 0x7f0b00be
+ public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+
+ // aapt resource value: 0x7f0b00bf
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+
+ // aapt resource value: 0x7f0b00c0
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+
+ // aapt resource value: 0x7f0b0061
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+
+ // aapt resource value: 0x7f0b0062
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+
+ // aapt resource value: 0x7f0b0063
+ public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+
+ // aapt resource value: 0x7f0b0064
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+
+ // aapt resource value: 0x7f0b0065
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+
+ // aapt resource value: 0x7f0b00c1
+ public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+
+ // aapt resource value: 0x7f0b00c2
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+
+ // aapt resource value: 0x7f0b0025
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+
+ // aapt resource value: 0x7f0b0066
+ public const int Base_Widget_AppCompat_Button = 2131427430;
+
+ // aapt resource value: 0x7f0b0067
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+
+ // aapt resource value: 0x7f0b0068
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+
+ // aapt resource value: 0x7f0b00c3
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+
+ // aapt resource value: 0x7f0b0092
+ public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+
+ // aapt resource value: 0x7f0b0069
+ public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+
+ // aapt resource value: 0x7f0b006a
+ public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+
+ // aapt resource value: 0x7f0b00c4
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+
+ // aapt resource value: 0x7f0b006b
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+
+ // aapt resource value: 0x7f0b006c
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+
+ // aapt resource value: 0x7f0b00c5
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+
+ // aapt resource value: 0x7f0b0000
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+
+ // aapt resource value: 0x7f0b00c6
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+
+ // aapt resource value: 0x7f0b006d
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+
+ // aapt resource value: 0x7f0b0026
+ public const int Base_Widget_AppCompat_EditText = 2131427366;
+
+ // aapt resource value: 0x7f0b006e
+ public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+
+ // aapt resource value: 0x7f0b00c7
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+
+ // aapt resource value: 0x7f0b00c8
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+
+ // aapt resource value: 0x7f0b00c9
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+
+ // aapt resource value: 0x7f0b006f
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+
+ // aapt resource value: 0x7f0b0070
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+
+ // aapt resource value: 0x7f0b0071
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+
+ // aapt resource value: 0x7f0b0072
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+
+ // aapt resource value: 0x7f0b0073
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+
+ // aapt resource value: 0x7f0b00ca
+ public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+
+ // aapt resource value: 0x7f0b0074
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+
+ // aapt resource value: 0x7f0b0075
+ public const int Base_Widget_AppCompat_ListView = 2131427445;
+
+ // aapt resource value: 0x7f0b0076
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+
+ // aapt resource value: 0x7f0b0077
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+
+ // aapt resource value: 0x7f0b0078
+ public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+
+ // aapt resource value: 0x7f0b0079
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+
+ // aapt resource value: 0x7f0b00cb
+ public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+
+ // aapt resource value: 0x7f0b001c
+ public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+
+ // aapt resource value: 0x7f0b001d
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+
+ // aapt resource value: 0x7f0b007a
+ public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+
+ // aapt resource value: 0x7f0b0093
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+
+ // aapt resource value: 0x7f0b0094
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+
+ // aapt resource value: 0x7f0b00cc
+ public const int Base_Widget_AppCompat_SearchView = 2131427532;
+
+ // aapt resource value: 0x7f0b00cd
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+
+ // aapt resource value: 0x7f0b007b
+ public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+
+ // aapt resource value: 0x7f0b00ce
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+
+ // aapt resource value: 0x7f0b007c
+ public const int Base_Widget_AppCompat_Spinner = 2131427452;
+
+ // aapt resource value: 0x7f0b0003
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+
+ // aapt resource value: 0x7f0b007d
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+
+ // aapt resource value: 0x7f0b009c
+ public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+
+ // aapt resource value: 0x7f0b007e
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+
+ // aapt resource value: 0x7f0b0167
+ public const int Base_Widget_Design_AppBarLayout = 2131427687;
+
+ // aapt resource value: 0x7f0b016b
+ public const int Base_Widget_Design_TabLayout = 2131427691;
+
+ // aapt resource value: 0x7f0b018a
+ public const int BottomSheetDialogAnimation = 2131427722;
+
+ // aapt resource value: 0x7f0b018f
+ public const int MyTheme = 2131427727;
+
+ // aapt resource value: 0x7f0b001e
+ public const int Platform_AppCompat = 2131427358;
+
+ // aapt resource value: 0x7f0b001f
+ public const int Platform_AppCompat_Light = 2131427359;
+
+ // aapt resource value: 0x7f0b007f
+ public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+
+ // aapt resource value: 0x7f0b0080
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+
+ // aapt resource value: 0x7f0b0081
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+
+ // aapt resource value: 0x7f0b0020
+ public const int Platform_V11_AppCompat = 2131427360;
+
+ // aapt resource value: 0x7f0b0021
+ public const int Platform_V11_AppCompat_Light = 2131427361;
+
+ // aapt resource value: 0x7f0b0028
+ public const int Platform_V14_AppCompat = 2131427368;
+
+ // aapt resource value: 0x7f0b0029
+ public const int Platform_V14_AppCompat_Light = 2131427369;
+
+ // aapt resource value: 0x7f0b0082
+ public const int Platform_V21_AppCompat = 2131427458;
+
+ // aapt resource value: 0x7f0b0083
+ public const int Platform_V21_AppCompat_Light = 2131427459;
+
+ // aapt resource value: 0x7f0b0097
+ public const int Platform_V25_AppCompat = 2131427479;
+
+ // aapt resource value: 0x7f0b0098
+ public const int Platform_V25_AppCompat_Light = 2131427480;
+
+ // aapt resource value: 0x7f0b0022
+ public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+
+ // aapt resource value: 0x7f0b002b
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+
+ // aapt resource value: 0x7f0b002c
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+
+ // aapt resource value: 0x7f0b002d
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+
+ // aapt resource value: 0x7f0b002e
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+
+ // aapt resource value: 0x7f0b002f
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+
+ // aapt resource value: 0x7f0b0030
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+
+ // aapt resource value: 0x7f0b0031
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+
+ // aapt resource value: 0x7f0b0032
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+
+ // aapt resource value: 0x7f0b0033
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+
+ // aapt resource value: 0x7f0b0034
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+
+ // aapt resource value: 0x7f0b0035
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+
+ // aapt resource value: 0x7f0b0036
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+
+ // aapt resource value: 0x7f0b0037
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+
+ // aapt resource value: 0x7f0b0038
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+
+ // aapt resource value: 0x7f0b00cf
+ public const int TextAppearance_AppCompat = 2131427535;
+
+ // aapt resource value: 0x7f0b00d0
+ public const int TextAppearance_AppCompat_Body1 = 2131427536;
+
+ // aapt resource value: 0x7f0b00d1
+ public const int TextAppearance_AppCompat_Body2 = 2131427537;
+
+ // aapt resource value: 0x7f0b00d2
+ public const int TextAppearance_AppCompat_Button = 2131427538;
+
+ // aapt resource value: 0x7f0b00d3
+ public const int TextAppearance_AppCompat_Caption = 2131427539;
+
+ // aapt resource value: 0x7f0b00d4
+ public const int TextAppearance_AppCompat_Display1 = 2131427540;
+
+ // aapt resource value: 0x7f0b00d5
+ public const int TextAppearance_AppCompat_Display2 = 2131427541;
+
+ // aapt resource value: 0x7f0b00d6
+ public const int TextAppearance_AppCompat_Display3 = 2131427542;
+
+ // aapt resource value: 0x7f0b00d7
+ public const int TextAppearance_AppCompat_Display4 = 2131427543;
+
+ // aapt resource value: 0x7f0b00d8
+ public const int TextAppearance_AppCompat_Headline = 2131427544;
+
+ // aapt resource value: 0x7f0b00d9
+ public const int TextAppearance_AppCompat_Inverse = 2131427545;
+
+ // aapt resource value: 0x7f0b00da
+ public const int TextAppearance_AppCompat_Large = 2131427546;
+
+ // aapt resource value: 0x7f0b00db
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+
+ // aapt resource value: 0x7f0b00dc
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+
+ // aapt resource value: 0x7f0b00dd
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+
+ // aapt resource value: 0x7f0b00de
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+
+ // aapt resource value: 0x7f0b00df
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+
+ // aapt resource value: 0x7f0b00e0
+ public const int TextAppearance_AppCompat_Medium = 2131427552;
+
+ // aapt resource value: 0x7f0b00e1
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+
+ // aapt resource value: 0x7f0b00e2
+ public const int TextAppearance_AppCompat_Menu = 2131427554;
+
+ // aapt resource value: 0x7f0b0084
+ public const int TextAppearance_AppCompat_Notification = 2131427460;
+
+ // aapt resource value: 0x7f0b0085
+ public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+
+ // aapt resource value: 0x7f0b0086
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+
+ // aapt resource value: 0x7f0b00e3
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+
+ // aapt resource value: 0x7f0b00e4
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+
+ // aapt resource value: 0x7f0b0087
+ public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+
+ // aapt resource value: 0x7f0b0088
+ public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+
+ // aapt resource value: 0x7f0b0089
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+
+ // aapt resource value: 0x7f0b008a
+ public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+
+ // aapt resource value: 0x7f0b008b
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+
+ // aapt resource value: 0x7f0b00e5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+
+ // aapt resource value: 0x7f0b00e6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+
+ // aapt resource value: 0x7f0b00e7
+ public const int TextAppearance_AppCompat_Small = 2131427559;
+
+ // aapt resource value: 0x7f0b00e8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+
+ // aapt resource value: 0x7f0b00e9
+ public const int TextAppearance_AppCompat_Subhead = 2131427561;
+
+ // aapt resource value: 0x7f0b00ea
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+
+ // aapt resource value: 0x7f0b00eb
+ public const int TextAppearance_AppCompat_Title = 2131427563;
+
+ // aapt resource value: 0x7f0b00ec
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+
+ // aapt resource value: 0x7f0b002a
+ public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+
+ // aapt resource value: 0x7f0b00ed
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+
+ // aapt resource value: 0x7f0b00ee
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+
+ // aapt resource value: 0x7f0b00ef
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+
+ // aapt resource value: 0x7f0b00f0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+
+ // aapt resource value: 0x7f0b00f1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+
+ // aapt resource value: 0x7f0b00f2
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+
+ // aapt resource value: 0x7f0b00f3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+
+ // aapt resource value: 0x7f0b00f4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+
+ // aapt resource value: 0x7f0b00f5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+
+ // aapt resource value: 0x7f0b00f6
+ public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+
+ // aapt resource value: 0x7f0b00f7
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+
+ // aapt resource value: 0x7f0b00f8
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+
+ // aapt resource value: 0x7f0b00f9
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+
+ // aapt resource value: 0x7f0b00fa
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+
+ // aapt resource value: 0x7f0b00fb
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+
+ // aapt resource value: 0x7f0b00fc
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+
+ // aapt resource value: 0x7f0b00fd
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+
+ // aapt resource value: 0x7f0b00fe
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+
+ // aapt resource value: 0x7f0b00ff
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+
+ // aapt resource value: 0x7f0b0183
+ public const int TextAppearance_Compat_Notification = 2131427715;
+
+ // aapt resource value: 0x7f0b0184
+ public const int TextAppearance_Compat_Notification_Info = 2131427716;
+
+ // aapt resource value: 0x7f0b0160
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+
+ // aapt resource value: 0x7f0b0189
+ public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+
+ // aapt resource value: 0x7f0b0164
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+
+ // aapt resource value: 0x7f0b0161
+ public const int TextAppearance_Compat_Notification_Media = 2131427681;
+
+ // aapt resource value: 0x7f0b0185
+ public const int TextAppearance_Compat_Notification_Time = 2131427717;
+
+ // aapt resource value: 0x7f0b0162
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+
+ // aapt resource value: 0x7f0b0186
+ public const int TextAppearance_Compat_Notification_Title = 2131427718;
+
+ // aapt resource value: 0x7f0b0163
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+
+ // aapt resource value: 0x7f0b016c
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+
+ // aapt resource value: 0x7f0b016d
+ public const int TextAppearance_Design_Counter = 2131427693;
+
+ // aapt resource value: 0x7f0b016e
+ public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+
+ // aapt resource value: 0x7f0b016f
+ public const int TextAppearance_Design_Error = 2131427695;
+
+ // aapt resource value: 0x7f0b0170
+ public const int TextAppearance_Design_Hint = 2131427696;
+
+ // aapt resource value: 0x7f0b0171
+ public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+
+ // aapt resource value: 0x7f0b0172
+ public const int TextAppearance_Design_Tab = 2131427698;
+
+ // aapt resource value: 0x7f0b0100
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+
+ // aapt resource value: 0x7f0b0101
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+
+ // aapt resource value: 0x7f0b0102
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+
+ // aapt resource value: 0x7f0b0103
+ public const int Theme_AppCompat = 2131427587;
+
+ // aapt resource value: 0x7f0b0104
+ public const int Theme_AppCompat_CompactMenu = 2131427588;
+
+ // aapt resource value: 0x7f0b0004
+ public const int Theme_AppCompat_DayNight = 2131427332;
+
+ // aapt resource value: 0x7f0b0005
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+
+ // aapt resource value: 0x7f0b0006
+ public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+
+ // aapt resource value: 0x7f0b0007
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+
+ // aapt resource value: 0x7f0b0008
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+
+ // aapt resource value: 0x7f0b0009
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+
+ // aapt resource value: 0x7f0b000a
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+
+ // aapt resource value: 0x7f0b0105
+ public const int Theme_AppCompat_Dialog = 2131427589;
+
+ // aapt resource value: 0x7f0b0106
+ public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+
+ // aapt resource value: 0x7f0b0107
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+
+ // aapt resource value: 0x7f0b0108
+ public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+
+ // aapt resource value: 0x7f0b0109
+ public const int Theme_AppCompat_Light = 2131427593;
+
+ // aapt resource value: 0x7f0b010a
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+
+ // aapt resource value: 0x7f0b010b
+ public const int Theme_AppCompat_Light_Dialog = 2131427595;
+
+ // aapt resource value: 0x7f0b010c
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+
+ // aapt resource value: 0x7f0b010d
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+
+ // aapt resource value: 0x7f0b010e
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+
+ // aapt resource value: 0x7f0b010f
+ public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+
+ // aapt resource value: 0x7f0b0110
+ public const int Theme_AppCompat_NoActionBar = 2131427600;
+
+ // aapt resource value: 0x7f0b018b
+ public const int Theme_BiometricPromptDialog = 2131427723;
+
+ // aapt resource value: 0x7f0b0173
+ public const int Theme_Design = 2131427699;
+
+ // aapt resource value: 0x7f0b0174
+ public const int Theme_Design_BottomSheetDialog = 2131427700;
+
+ // aapt resource value: 0x7f0b0175
+ public const int Theme_Design_Light = 2131427701;
+
+ // aapt resource value: 0x7f0b0176
+ public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+
+ // aapt resource value: 0x7f0b0177
+ public const int Theme_Design_Light_NoActionBar = 2131427703;
+
+ // aapt resource value: 0x7f0b0178
+ public const int Theme_Design_NoActionBar = 2131427704;
+
+ // aapt resource value: 0x7f0b0111
+ public const int ThemeOverlay_AppCompat = 2131427601;
+
+ // aapt resource value: 0x7f0b0112
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+
+ // aapt resource value: 0x7f0b0113
+ public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+
+ // aapt resource value: 0x7f0b0114
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+
+ // aapt resource value: 0x7f0b0115
+ public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+
+ // aapt resource value: 0x7f0b0116
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+
+ // aapt resource value: 0x7f0b0117
+ public const int ThemeOverlay_AppCompat_Light = 2131427607;
+
+ // aapt resource value: 0x7f0b0118
+ public const int Widget_AppCompat_ActionBar = 2131427608;
+
+ // aapt resource value: 0x7f0b0119
+ public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+
+ // aapt resource value: 0x7f0b011a
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+
+ // aapt resource value: 0x7f0b011b
+ public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+
+ // aapt resource value: 0x7f0b011c
+ public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+
+ // aapt resource value: 0x7f0b011d
+ public const int Widget_AppCompat_ActionButton = 2131427613;
+
+ // aapt resource value: 0x7f0b011e
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+
+ // aapt resource value: 0x7f0b011f
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+
+ // aapt resource value: 0x7f0b0120
+ public const int Widget_AppCompat_ActionMode = 2131427616;
+
+ // aapt resource value: 0x7f0b0121
+ public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+
+ // aapt resource value: 0x7f0b0122
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+
+ // aapt resource value: 0x7f0b0123
+ public const int Widget_AppCompat_Button = 2131427619;
+
+ // aapt resource value: 0x7f0b0124
+ public const int Widget_AppCompat_Button_Borderless = 2131427620;
+
+ // aapt resource value: 0x7f0b0125
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+
+ // aapt resource value: 0x7f0b0126
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+
+ // aapt resource value: 0x7f0b0127
+ public const int Widget_AppCompat_Button_Colored = 2131427623;
+
+ // aapt resource value: 0x7f0b0128
+ public const int Widget_AppCompat_Button_Small = 2131427624;
+
+ // aapt resource value: 0x7f0b0129
+ public const int Widget_AppCompat_ButtonBar = 2131427625;
+
+ // aapt resource value: 0x7f0b012a
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+
+ // aapt resource value: 0x7f0b012b
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+
+ // aapt resource value: 0x7f0b012c
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+
+ // aapt resource value: 0x7f0b012d
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+
+ // aapt resource value: 0x7f0b012e
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+
+ // aapt resource value: 0x7f0b012f
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+
+ // aapt resource value: 0x7f0b0130
+ public const int Widget_AppCompat_EditText = 2131427632;
+
+ // aapt resource value: 0x7f0b0131
+ public const int Widget_AppCompat_ImageButton = 2131427633;
+
+ // aapt resource value: 0x7f0b0132
+ public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+
+ // aapt resource value: 0x7f0b0133
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+
+ // aapt resource value: 0x7f0b0134
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+
+ // aapt resource value: 0x7f0b0135
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+
+ // aapt resource value: 0x7f0b0136
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+
+ // aapt resource value: 0x7f0b0137
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+
+ // aapt resource value: 0x7f0b0138
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+
+ // aapt resource value: 0x7f0b0139
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+
+ // aapt resource value: 0x7f0b013a
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+
+ // aapt resource value: 0x7f0b013b
+ public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+
+ // aapt resource value: 0x7f0b013c
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+
+ // aapt resource value: 0x7f0b013d
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+
+ // aapt resource value: 0x7f0b013e
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+
+ // aapt resource value: 0x7f0b013f
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+
+ // aapt resource value: 0x7f0b0140
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+
+ // aapt resource value: 0x7f0b0141
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+
+ // aapt resource value: 0x7f0b0142
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+
+ // aapt resource value: 0x7f0b0143
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+
+ // aapt resource value: 0x7f0b0144
+ public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+
+ // aapt resource value: 0x7f0b0145
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+
+ // aapt resource value: 0x7f0b0146
+ public const int Widget_AppCompat_Light_SearchView = 2131427654;
+
+ // aapt resource value: 0x7f0b0147
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+
+ // aapt resource value: 0x7f0b0148
+ public const int Widget_AppCompat_ListMenuView = 2131427656;
+
+ // aapt resource value: 0x7f0b0149
+ public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+
+ // aapt resource value: 0x7f0b014a
+ public const int Widget_AppCompat_ListView = 2131427658;
+
+ // aapt resource value: 0x7f0b014b
+ public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+
+ // aapt resource value: 0x7f0b014c
+ public const int Widget_AppCompat_ListView_Menu = 2131427660;
+
+ // aapt resource value: 0x7f0b014d
+ public const int Widget_AppCompat_PopupMenu = 2131427661;
+
+ // aapt resource value: 0x7f0b014e
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+
+ // aapt resource value: 0x7f0b014f
+ public const int Widget_AppCompat_PopupWindow = 2131427663;
+
+ // aapt resource value: 0x7f0b0150
+ public const int Widget_AppCompat_ProgressBar = 2131427664;
+
+ // aapt resource value: 0x7f0b0151
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+
+ // aapt resource value: 0x7f0b0152
+ public const int Widget_AppCompat_RatingBar = 2131427666;
+
+ // aapt resource value: 0x7f0b0153
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+
+ // aapt resource value: 0x7f0b0154
+ public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+
+ // aapt resource value: 0x7f0b0155
+ public const int Widget_AppCompat_SearchView = 2131427669;
+
+ // aapt resource value: 0x7f0b0156
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+
+ // aapt resource value: 0x7f0b0157
+ public const int Widget_AppCompat_SeekBar = 2131427671;
+
+ // aapt resource value: 0x7f0b0158
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+
+ // aapt resource value: 0x7f0b0159
+ public const int Widget_AppCompat_Spinner = 2131427673;
+
+ // aapt resource value: 0x7f0b015a
+ public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+
+ // aapt resource value: 0x7f0b015b
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+
+ // aapt resource value: 0x7f0b015c
+ public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+
+ // aapt resource value: 0x7f0b015d
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+
+ // aapt resource value: 0x7f0b015e
+ public const int Widget_AppCompat_Toolbar = 2131427678;
+
+ // aapt resource value: 0x7f0b015f
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+
+ // aapt resource value: 0x7f0b0187
+ public const int Widget_Compat_NotificationActionContainer = 2131427719;
+
+ // aapt resource value: 0x7f0b0188
+ public const int Widget_Compat_NotificationActionText = 2131427720;
+
+ // aapt resource value: 0x7f0b0179
+ public const int Widget_Design_AppBarLayout = 2131427705;
+
+ // aapt resource value: 0x7f0b017a
+ public const int Widget_Design_BottomNavigationView = 2131427706;
+
+ // aapt resource value: 0x7f0b017b
+ public const int Widget_Design_BottomSheet_Modal = 2131427707;
+
+ // aapt resource value: 0x7f0b017c
+ public const int Widget_Design_CollapsingToolbar = 2131427708;
+
+ // aapt resource value: 0x7f0b017d
+ public const int Widget_Design_CoordinatorLayout = 2131427709;
+
+ // aapt resource value: 0x7f0b017e
+ public const int Widget_Design_FloatingActionButton = 2131427710;
+
+ // aapt resource value: 0x7f0b017f
+ public const int Widget_Design_NavigationView = 2131427711;
+
+ // aapt resource value: 0x7f0b0180
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+
+ // aapt resource value: 0x7f0b0181
+ public const int Widget_Design_Snackbar = 2131427713;
+
+ // aapt resource value: 0x7f0b0165
+ public const int Widget_Design_TabLayout = 2131427685;
+
+ // aapt resource value: 0x7f0b0182
+ public const int Widget_Design_TextInputLayout = 2131427714;
+
+ // aapt resource value: 0x7f0b018c
+ public const int custom_dialog2 = 2131427724;
+
+ // aapt resource value: 0x7f0b018d
+ public const int picker_view_scale_anim = 2131427725;
+
+ // aapt resource value: 0x7f0b018e
+ public const int picker_view_slide_anim = 2131427726;
+
static Style()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Style()
{
}
}
-
+
+ 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[] {
- 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: { 0x10100B3 }
+ 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};
+
+ // 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;
+
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;
-
- // aapt resource value: { 0xFFFFFFFF }
- public static int[] ActionMenuView = new int[] {
- -1};
-
- // aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
+
+ public static int[] ActionMenuView;
+
public static int[] ActionMode = new int[] {
- 2130968642,
- 2130968643,
- 2130968672,
- 2130968756,
- 2130968939,
- 2130968993};
-
- // aapt resource value: 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_closeItemLayout = 2;
-
+ 2130771978,
+ 2130771984,
+ 2130771985,
+ 2130771989,
+ 2130771991,
+ 2130772007};
+
// aapt resource value: 3
- public const int ActionMode_height = 3;
-
+ public const int ActionMode_background = 3;
+
// aapt resource value: 4
- public const int ActionMode_subtitleTextStyle = 4;
-
+ public const int ActionMode_backgroundSplit = 4;
+
// aapt resource value: 5
- public const int ActionMode_titleTextStyle = 5;
-
- // aapt resource value: { 0x7F040096,0x7F0400C1 }
- public static int[] ActivityChooserView = new int[] {
- 2130968726,
- 2130968769};
-
+ public const int ActionMode_closeItemLayout = 5;
+
// aapt resource value: 0
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
-
+ public const int ActionMode_height = 0;
+
+ // aapt resource value: 2
+ public const int ActionMode_subtitleTextStyle = 2;
+
// aapt resource value: 1
- public const int ActivityChooserView_initialActivityCount = 1;
-
- // aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
+ public const int ActionMode_titleTextStyle = 1;
+
+ public static int[] ActivityChooserView = new int[] {
+ 2130772008,
+ 2130772009};
+
+ // aapt resource value: 1
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+
+ // aapt resource value: 0
+ public const int ActivityChooserView_initialActivityCount = 0;
+
public static int[] AlertDialog = new int[] {
16842994,
- 2130968664,
- 2130968794,
- 2130968795,
- 2130968809,
- 2130968855,
- 2130968856};
-
+ 2130772010,
+ 2130772011,
+ 2130772012,
+ 2130772013,
+ 2130772014,
+ 2130772015};
+
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
-
+
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
-
- // aapt resource value: 2
- public const int AlertDialog_listItemLayout = 2;
-
- // aapt resource value: 3
- public const int AlertDialog_listLayout = 3;
-
- // aapt resource value: 4
- public const int AlertDialog_multiChoiceItemLayout = 4;
-
+
// aapt resource value: 5
- public const int AlertDialog_showTitle = 5;
-
+ public const int AlertDialog_listItemLayout = 5;
+
+ // aapt resource value: 2
+ public const int AlertDialog_listLayout = 2;
+
+ // aapt resource value: 3
+ public const int AlertDialog_multiChoiceItemLayout = 3;
+
// aapt resource value: 6
- public const int AlertDialog_singleChoiceItemLayout = 6;
-
- // aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
+ public const int AlertDialog_showTitle = 6;
+
+ // aapt resource value: 4
+ public const int AlertDialog_singleChoiceItemLayout = 4;
+
public static int[] AppBarLayout = new int[] {
16842964,
16843919,
16844096,
- 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;
-
+ 2130772005,
+ 2130772223};
+
// aapt resource value: 0
public const int AppBarLayout_android_background = 0;
-
+
// aapt resource value: 2
public const int AppBarLayout_android_keyboardNavigationCluster = 2;
-
+
// aapt resource value: 1
public const int AppBarLayout_android_touchscreenBlocksFocus = 1;
-
+
// aapt resource value: 3
public const int AppBarLayout_elevation = 3;
-
+
// aapt resource value: 4
public const int AppBarLayout_expanded = 4;
-
- // aapt resource value: { 0x7F0400D4,0x7F0400D5 }
+
+ 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;
+
public static int[] AppBarLayout_Layout = new int[] {
- 2130968788,
- 2130968789};
-
+ 2130772226,
+ 2130772227};
+
// aapt resource value: 0
public const int AppBarLayout_Layout_layout_scrollFlags = 0;
-
+
// 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,
- 2130968862,
- 2130968981,
- 2130968982};
-
+ 2130772016,
+ 2130772017,
+ 2130772018};
+
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
-
+
// aapt resource value: 1
public const int AppCompatImageView_srcCompat = 1;
-
+
// aapt resource value: 2
public const int AppCompatImageView_tint = 2;
-
+
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
-
- // aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
+
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130968978,
- 2130968979,
- 2130968980};
-
+ 2130772019,
+ 2130772020,
+ 2130772021};
+
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
-
+
// aapt resource value: 1
public const int AppCompatSeekBar_tickMark = 1;
-
+
// aapt resource value: 2
public const int AppCompatSeekBar_tickMarkTint = 2;
-
+
// 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,
@@ -5791,1281 +5790,1252 @@
16843120,
16843666,
16843667};
-
+
// aapt resource value: 2
public const int AppCompatTextHelper_android_drawableBottom = 2;
-
+
// aapt resource value: 6
public const int AppCompatTextHelper_android_drawableEnd = 6;
-
+
// aapt resource value: 3
public const int AppCompatTextHelper_android_drawableLeft = 3;
-
+
// aapt resource value: 4
public const int AppCompatTextHelper_android_drawableRight = 4;
-
+
// aapt resource value: 5
public const int AppCompatTextHelper_android_drawableStart = 5;
-
+
// aapt resource value: 1
public const int AppCompatTextHelper_android_drawableTop = 1;
-
+
// 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,
- 2130968637,
- 2130968638,
- 2130968639,
- 2130968640,
- 2130968641,
- 2130968742,
- 2130968961};
-
+ 2130772022,
+ 2130772023,
+ 2130772024,
+ 2130772025,
+ 2130772026,
+ 2130772027,
+ 2130772028};
+
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
-
- // aapt resource value: 1
- public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-
- // aapt resource value: 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;
-
+ 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: 2
+ public const int AppCompatTextView_autoSizeTextType = 2;
+
// aapt resource value: 7
- public const int AppCompatTextView_textAllCaps = 7;
-
- // 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 const int AppCompatTextView_fontFamily = 7;
+
+ // aapt resource value: 1
+ public const int AppCompatTextView_textAllCaps = 1;
+
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 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: 2
- public const int AppCompatTheme_actionBarDivider = 2;
-
- // aapt resource value: 3
- public const int AppCompatTheme_actionBarItemBackground = 3;
-
- // aapt resource value: 4
- public const int AppCompatTheme_actionBarPopupTheme = 4;
-
- // aapt resource value: 5
- public const int AppCompatTheme_actionBarSize = 5;
-
- // aapt resource value: 6
- public const int AppCompatTheme_actionBarSplitStyle = 6;
-
- // aapt resource value: 7
- public const int AppCompatTheme_actionBarStyle = 7;
-
- // 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_actionBarWidgetTheme = 12;
-
- // aapt resource value: 13
- public const int AppCompatTheme_actionButtonStyle = 13;
-
- // aapt resource value: 14
- public const int AppCompatTheme_actionDropDownStyle = 14;
-
- // aapt resource value: 15
- public const int AppCompatTheme_actionMenuTextAppearance = 15;
-
- // aapt resource value: 16
- public const int AppCompatTheme_actionMenuTextColor = 16;
-
- // aapt resource value: 17
- public const int AppCompatTheme_actionModeBackground = 17;
-
- // aapt resource value: 18
- public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
-
- // aapt resource value: 19
- public const int AppCompatTheme_actionModeCloseDrawable = 19;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionModeCopyDrawable = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionModeCutDrawable = 21;
-
- // aapt resource value: 22
- public const int AppCompatTheme_actionModeFindDrawable = 22;
-
+ 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};
+
// aapt resource value: 23
- public const int AppCompatTheme_actionModePasteDrawable = 23;
-
+ public const int AppCompatTheme_actionBarDivider = 23;
+
// aapt resource value: 24
- public const int AppCompatTheme_actionModePopupWindowStyle = 24;
-
+ public const int AppCompatTheme_actionBarItemBackground = 24;
+
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionBarPopupTheme = 17;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionBarSize = 22;
+
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionBarSplitStyle = 19;
+
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionBarStyle = 18;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionBarTabBarStyle = 13;
+
+ // aapt resource value: 12
+ public const int AppCompatTheme_actionBarTabStyle = 12;
+
+ // 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_actionModeSelectAllDrawable = 25;
-
+ public const int AppCompatTheme_actionMenuTextAppearance = 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;
-
+ public const int AppCompatTheme_actionMenuTextColor = 26;
+
// aapt resource value: 29
- public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
-
- // aapt resource value: 30
- public const int AppCompatTheme_actionOverflowButtonStyle = 30;
-
+ public const int AppCompatTheme_actionModeBackground = 29;
+
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
+
// aapt resource value: 31
- public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-
- // aapt resource value: 32
- public const int AppCompatTheme_activityChooserViewStyle = 32;
-
+ public const int AppCompatTheme_actionModeCloseDrawable = 31;
+
// aapt resource value: 33
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 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_alertDialogCenterButtons = 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_alertDialogStyle = 35;
-
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
+
// aapt resource value: 36
- public const int AppCompatTheme_alertDialogTheme = 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;
+
+ // aapt resource value: 15
+ public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+
+ // aapt resource value: 16
+ public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_activityChooserViewStyle = 58;
+
+ // aapt resource value: 95
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+
+ // aapt resource value: 96
+ public const int AppCompatTheme_alertDialogCenterButtons = 96;
+
+ // aapt resource value: 94
+ public const int AppCompatTheme_alertDialogStyle = 94;
+
+ // aapt resource value: 97
+ public const int AppCompatTheme_alertDialogTheme = 97;
+
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
-
+
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
-
- // aapt resource value: 37
- public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-
- // aapt resource value: 38
- public const int AppCompatTheme_borderlessButtonStyle = 38;
-
- // aapt resource value: 39
- public const int AppCompatTheme_buttonBarButtonStyle = 39;
-
- // aapt resource value: 40
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-
- // aapt resource value: 41
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-
- // aapt resource value: 42
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-
- // aapt resource value: 43
- public const int AppCompatTheme_buttonBarStyle = 43;
-
- // aapt resource value: 44
- public const int AppCompatTheme_buttonStyle = 44;
-
- // aapt resource value: 45
- public const int AppCompatTheme_buttonStyleSmall = 45;
-
- // aapt resource value: 46
- public const int AppCompatTheme_checkboxStyle = 46;
-
- // 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: 102
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+
// aapt resource value: 55
- public const int AppCompatTheme_colorPrimary = 55;
-
- // aapt resource value: 56
- public const int AppCompatTheme_colorPrimaryDark = 56;
-
+ public const int AppCompatTheme_borderlessButtonStyle = 55;
+
+ // aapt resource value: 52
+ public const int AppCompatTheme_buttonBarButtonStyle = 52;
+
+ // aapt resource value: 100
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+
+ // aapt resource value: 101
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+
+ // 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: 43
+ public const int AppCompatTheme_dialogTheme = 43;
+
// 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_listChoiceBackgroundIndicator = 70;
-
- // aapt resource value: 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_listPopupWindowStyle = 73;
-
- // aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemHeight = 74;
-
+ public const int AppCompatTheme_dividerHorizontal = 57;
+
+ // aapt resource value: 56
+ public const int AppCompatTheme_dividerVertical = 56;
+
// aapt resource value: 75
- public const int AppCompatTheme_listPreferredItemHeightLarge = 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: 45
+ public const int AppCompatTheme_listDividerAlertDialog = 45;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_listMenuViewStyle = 115;
+
// 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;
-
+ public const int AppCompatTheme_listPopupWindowStyle = 76;
+
+ // aapt resource value: 70
+ public const int AppCompatTheme_listPreferredItemHeight = 70;
+
+ // aapt resource value: 72
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+
+ // aapt resource value: 71
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+
+ // aapt resource value: 73
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+
+ // aapt resource value: 74
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+
// aapt resource value: 80
- public const int AppCompatTheme_panelMenuListTheme = 80;
-
+ public const int AppCompatTheme_panelBackground = 80;
+
+ // aapt resource value: 82
+ public const int AppCompatTheme_panelMenuListTheme = 82;
+
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
-
- // aapt resource value: 82
- public const int AppCompatTheme_popupMenuStyle = 82;
-
- // aapt resource value: 83
- public const int AppCompatTheme_popupWindowStyle = 83;
-
- // aapt resource value: 84
- public const int AppCompatTheme_radioButtonStyle = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_ratingBarStyle = 85;
-
- // aapt resource value: 86
- public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-
- // aapt resource value: 87
- public const int AppCompatTheme_ratingBarStyleSmall = 87;
-
- // aapt resource value: 88
- public const int AppCompatTheme_searchViewStyle = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_seekBarStyle = 89;
-
- // aapt resource value: 90
- public const int AppCompatTheme_selectableItemBackground = 90;
-
- // aapt resource value: 91
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-
- // aapt resource value: 93
- public const int AppCompatTheme_spinnerStyle = 93;
-
- // aapt resource value: 94
- public const int AppCompatTheme_switchStyle = 94;
-
- // aapt resource value: 95
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-
- // aapt resource value: 96
- public const int AppCompatTheme_textAppearanceListItem = 96;
-
- // aapt resource value: 97
- public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-
- // aapt resource value: 98
- public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-
- // aapt resource value: 99
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-
- // aapt resource value: 100
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-
- // aapt resource value: 101
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-
- // 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: 61
+ public const int AppCompatTheme_popupMenuStyle = 61;
+
+ // aapt resource value: 62
+ public const int AppCompatTheme_popupWindowStyle = 62;
+
// aapt resource value: 108
- public const int AppCompatTheme_tooltipFrameBackground = 108;
-
+ public const int AppCompatTheme_radioButtonStyle = 108;
+
// aapt resource value: 109
- public const int AppCompatTheme_windowActionBar = 109;
-
+ public const int AppCompatTheme_ratingBarStyle = 109;
+
// aapt resource value: 110
- public const int AppCompatTheme_windowActionBarOverlay = 110;
-
+ public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+
// aapt resource value: 111
- public const int AppCompatTheme_windowActionModeOverlay = 111;
-
+ public const int AppCompatTheme_ratingBarStyleSmall = 111;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_searchViewStyle = 69;
+
// aapt resource value: 112
- public const int AppCompatTheme_windowFixedHeightMajor = 112;
-
+ public const int AppCompatTheme_seekBarStyle = 112;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_selectableItemBackground = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+
// aapt resource value: 113
- public const int AppCompatTheme_windowFixedHeightMinor = 113;
-
+ public const int AppCompatTheme_spinnerStyle = 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_windowMinWidthMajor = 116;
-
+ public const int AppCompatTheme_switchStyle = 114;
+
+ // aapt resource value: 40
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+
+ // aapt resource value: 77
+ public const int AppCompatTheme_textAppearanceListItem = 77;
+
+ // 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: 98
+ public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_textColorSearchUrl = 68;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_toolbarStyle = 59;
+
// aapt resource value: 117
- public const int AppCompatTheme_windowMinWidthMinor = 117;
-
- // aapt resource value: 118
- public const int AppCompatTheme_windowNoTitle = 118;
-
- // aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
+ public const int AppCompatTheme_tooltipForegroundColor = 117;
+
+ // aapt resource value: 116
+ public const int AppCompatTheme_tooltipFrameBackground = 116;
+
+ // aapt resource value: 2
+ public const int AppCompatTheme_windowActionBar = 2;
+
+ // aapt resource value: 4
+ public const int AppCompatTheme_windowActionBarOverlay = 4;
+
+ // 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;
+
public static int[] BallPulseFooter = new int[] {
- 2130968864,
- 2130968865,
- 2130968912};
-
- // aapt resource value: 0
- public const int BallPulseFooter_srlAnimatingColor = 0;
-
+ 2130772317,
+ 2130772338,
+ 2130772339};
+
// aapt resource value: 1
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
-
+ public const int BallPulseFooter_srlAnimatingColor = 1;
+
+ // aapt resource value: 0
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
+
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
-
- // aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
+
public static int[] BezierRadarHeader = new int[] {
- 2130968863,
- 2130968882,
- 2130968913};
-
+ 2130772316,
+ 2130772324,
+ 2130772326};
+
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
-
+
// aapt resource value: 1
public const int BezierRadarHeader_srlEnableHorizontalDrag = 1;
-
+
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
-
- // aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
+
public static int[] BottomNavigationView = new int[] {
- 2130968723,
- 2130968772,
- 2130968773,
- 2130968776,
- 2130968808};
-
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269};
+
// aapt resource value: 0
public const int BottomNavigationView_elevation = 0;
-
- // aapt resource value: 1
- public const int BottomNavigationView_itemBackground = 1;
-
+
+ // aapt resource value: 4
+ public const int BottomNavigationView_itemBackground = 4;
+
// aapt resource value: 2
public const int BottomNavigationView_itemIconTint = 2;
-
+
// aapt resource value: 3
public const int BottomNavigationView_itemTextColor = 3;
-
- // aapt resource value: 4
- public const int BottomNavigationView_menu = 4;
-
- // aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
- public static int[] BottomSheetBehavior_Layout = new int[] {
- 2130968649,
- 2130968651,
- 2130968652};
-
- // aapt resource value: 0
- public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
-
+
// aapt resource value: 1
- public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
-
+ public const int BottomNavigationView_menu = 1;
+
+ public static int[] BottomSheetBehavior_Layout = new int[] {
+ 2130772228,
+ 2130772229,
+ 2130772230};
+
+ // aapt resource value: 1
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+
+ // aapt resource value: 0
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+
// aapt resource value: 2
public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
-
- // aapt resource value: { 0x7F040026 }
+
public static int[] ButtonBarLayout = new int[] {
- 2130968614};
-
+ 2130772146};
+
// 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[] {
- 2130968863,
- 2130968865,
- 2130968869,
- 2130968870,
- 2130968871,
- 2130968872,
- 2130968873,
- 2130968874,
- 2130968896,
- 2130968913,
- 2130968916,
- 2130968917,
- 2130968918,
- 2130968919,
- 2130968920,
- 2130968921,
- 2130968922,
- 2130968925};
-
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772330,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772336};
+
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
-
+
// aapt resource value: 1
public const int ClassicsFooter_srlClassicsSpinnerStyle = 1;
-
+
// aapt resource value: 2
public const int ClassicsFooter_srlDrawableArrow = 2;
-
+
// aapt resource value: 3
public const int ClassicsFooter_srlDrawableArrowSize = 3;
-
+
// aapt resource value: 4
public const int ClassicsFooter_srlDrawableMarginRight = 4;
-
+
// aapt resource value: 5
public const int ClassicsFooter_srlDrawableProgress = 5;
-
+
// aapt resource value: 6
public const int ClassicsFooter_srlDrawableProgressSize = 6;
-
+
// aapt resource value: 7
public const int ClassicsFooter_srlDrawableSize = 7;
-
+
// aapt resource value: 8
public const int ClassicsFooter_srlFinishDuration = 8;
-
+
// aapt resource value: 9
public const int ClassicsFooter_srlPrimaryColor = 9;
-
+
// aapt resource value: 10
public const int ClassicsFooter_srlTextFailed = 10;
-
+
// aapt resource value: 11
public const int ClassicsFooter_srlTextFinish = 11;
-
+
// aapt resource value: 12
public const int ClassicsFooter_srlTextLoading = 12;
-
+
// aapt resource value: 13
public const int ClassicsFooter_srlTextNothing = 13;
-
+
// aapt resource value: 14
public const int ClassicsFooter_srlTextPulling = 14;
-
+
// aapt resource value: 15
public const int ClassicsFooter_srlTextRefreshing = 15;
-
+
// aapt resource value: 16
public const int ClassicsFooter_srlTextRelease = 16;
-
+
// 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[] {
- 2130968863,
- 2130968865,
- 2130968869,
- 2130968870,
- 2130968871,
- 2130968872,
- 2130968873,
- 2130968874,
- 2130968883,
- 2130968896,
- 2130968913,
- 2130968916,
- 2130968917,
- 2130968918,
- 2130968920,
- 2130968921,
- 2130968922,
- 2130968923,
- 2130968924,
- 2130968925,
- 2130968926,
- 2130968927};
-
+ 2130772316,
+ 2130772317,
+ 2130772318,
+ 2130772319,
+ 2130772320,
+ 2130772321,
+ 2130772322,
+ 2130772323,
+ 2130772325,
+ 2130772326,
+ 2130772327,
+ 2130772328,
+ 2130772329,
+ 2130772331,
+ 2130772332,
+ 2130772333,
+ 2130772334,
+ 2130772335,
+ 2130772336,
+ 2130772337,
+ 2130772340,
+ 2130772341};
+
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
-
+
// aapt resource value: 1
public const int ClassicsHeader_srlClassicsSpinnerStyle = 1;
-
+
// aapt resource value: 2
public const int ClassicsHeader_srlDrawableArrow = 2;
-
+
// aapt resource value: 3
public const int ClassicsHeader_srlDrawableArrowSize = 3;
-
+
// aapt resource value: 4
public const int ClassicsHeader_srlDrawableMarginRight = 4;
-
+
// aapt resource value: 5
public const int ClassicsHeader_srlDrawableProgress = 5;
-
+
// aapt resource value: 6
public const int ClassicsHeader_srlDrawableProgressSize = 6;
-
+
// 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_srlEnableLastTime = 8;
-
+ public const int ClassicsHeader_srlFinishDuration = 8;
+
// aapt resource value: 9
- public const int ClassicsHeader_srlFinishDuration = 9;
-
+ public const int ClassicsHeader_srlPrimaryColor = 9;
+
// aapt resource value: 10
- public const int ClassicsHeader_srlPrimaryColor = 10;
-
+ public const int ClassicsHeader_srlTextFailed = 10;
+
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFailed = 11;
-
+ public const int ClassicsHeader_srlTextFinish = 11;
+
// aapt resource value: 12
- public const int ClassicsHeader_srlTextFinish = 12;
-
+ public const int ClassicsHeader_srlTextLoading = 12;
+
// aapt resource value: 13
- public const int ClassicsHeader_srlTextLoading = 13;
-
+ public const int ClassicsHeader_srlTextPulling = 13;
+
// aapt resource value: 14
- public const int ClassicsHeader_srlTextPulling = 14;
-
+ public const int ClassicsHeader_srlTextRefreshing = 14;
+
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRefreshing = 15;
-
+ public const int ClassicsHeader_srlTextRelease = 15;
+
// aapt resource value: 16
- public const int ClassicsHeader_srlTextRelease = 16;
-
+ public const int ClassicsHeader_srlTextSecondary = 16;
+
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSecondary = 17;
-
+ public const int ClassicsHeader_srlTextSizeTime = 17;
+
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTime = 18;
-
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextSizeTitle = 19;
-
+ public const int ClassicsHeader_srlTextSizeTitle = 18;
+
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
-
- // 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 }
+
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextUpdate = 19;
+
public static int[] CollapsingToolbarLayout = new int[] {
- 2130968675,
- 2130968676,
- 2130968696,
- 2130968728,
- 2130968729,
- 2130968730,
- 2130968731,
- 2130968732,
- 2130968733,
- 2130968734,
- 2130968842,
- 2130968843,
- 2130968933,
- 2130968983,
- 2130968984,
- 2130968994};
-
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
-
+ 2130771980,
+ 2130772231,
+ 2130772232,
+ 2130772233,
+ 2130772234,
+ 2130772235,
+ 2130772236,
+ 2130772237,
+ 2130772238,
+ 2130772239,
+ 2130772240,
+ 2130772241,
+ 2130772242,
+ 2130772243,
+ 2130772244,
+ 2130772245};
+
+ // 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: 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;
-
+ public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
+
// 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_expandedTitleMarginEnd = 6;
-
- // aapt resource value: 7
- public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
-
- // aapt resource value: 8
- public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
-
- // aapt resource value: 9
- public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
-
- // aapt resource value: { 0x7F0400CF,0x7F0400D0 }
- public static int[] CollapsingToolbarLayout_Layout = new int[] {
- 2130968783,
- 2130968784};
-
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
-
- // aapt resource value: 1
- public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
-
- // aapt resource value: 10
- public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+
+ // aapt resource value: 12
+ public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+
// 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: 9
+ public const int CollapsingToolbarLayout_statusBarScrim = 9;
+
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_title = 0;
+
// aapt resource value: 15
- public const int CollapsingToolbarLayout_toolbarId = 15;
-
- // aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
+ public const int CollapsingToolbarLayout_titleEnabled = 15;
+
+ // aapt resource value: 10
+ public const int CollapsingToolbarLayout_toolbarId = 10;
+
+ public static int[] CollapsingToolbarLayout_Layout = new int[] {
+ 2130772246,
+ 2130772247};
+
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
+
+ // aapt resource value: 1
+ public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130968615};
-
+ 2130772147};
+
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
-
+
// aapt resource value: 1
public const int ColorStateListItem_android_alpha = 1;
-
+
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
-
- // aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
+
public static int[] CompoundButton = new int[] {
16843015,
- 2130968667,
- 2130968668};
-
+ 2130772148,
+ 2130772149};
+
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
-
+
// aapt resource value: 1
public const int CompoundButton_buttonTint = 1;
-
+
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
-
- // aapt resource value: { 0x7F0400C9,0x7F040164 }
+
public static int[] CoordinatorLayout = new int[] {
- 2130968777,
- 2130968932};
-
+ 2130772248,
+ 2130772249};
+
// aapt resource value: 0
public const int CoordinatorLayout_keylines = 0;
-
- // aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
- public static int[] CoordinatorLayout_Layout = new int[] {
- 16842931,
- 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_anchorGravity = 2;
-
- // aapt resource value: 3
- public const int CoordinatorLayout_Layout_layout_behavior = 3;
-
- // aapt resource value: 4
- public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
-
- // aapt resource value: 5
- public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
-
- // 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[] CoordinatorLayout_Layout = new int[] {
+ 16842931,
+ 2130772250,
+ 2130772251,
+ 2130772252,
+ 2130772253,
+ 2130772254,
+ 2130772255};
+
+ // aapt resource value: 0
+ public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
+
+ // aapt resource value: 2
+ public const int CoordinatorLayout_Layout_layout_anchor = 2;
+
+ // 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;
+
+ // aapt resource value: 5
+ public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
+
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_keyline = 3;
+
public static int[] DesignTheme = new int[] {
- 2130968656,
- 2130968657,
- 2130968971};
-
+ 2130772256,
+ 2130772257,
+ 2130772258};
+
// aapt resource value: 0
public const int DesignTheme_bottomSheetDialogTheme = 0;
-
+
// aapt resource value: 1
public const int DesignTheme_bottomSheetStyle = 1;
-
+
// 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[] {
- 2130968634,
- 2130968635,
- 2130968647,
- 2130968677,
- 2130968716,
- 2130968752,
- 2130968858,
- 2130968974};
-
- // aapt resource value: 0
- public const int DrawerArrowToggle_arrowHeadLength = 0;
-
- // aapt resource value: 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;
-
+ 2130772150,
+ 2130772151,
+ 2130772152,
+ 2130772153,
+ 2130772154,
+ 2130772155,
+ 2130772156,
+ 2130772157};
+
// aapt resource value: 4
- public const int DrawerArrowToggle_drawableSize = 4;
-
+ public const int DrawerArrowToggle_arrowHeadLength = 4;
+
// aapt resource value: 5
- public const int DrawerArrowToggle_gapBetweenBars = 5;
-
+ public const int DrawerArrowToggle_arrowShaftLength = 5;
+
// aapt resource value: 6
- public const int DrawerArrowToggle_spinBars = 6;
-
+ public const int DrawerArrowToggle_barLength = 6;
+
+ // 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;
+
+ // aapt resource value: 1
+ public const int DrawerArrowToggle_spinBars = 1;
+
// 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[] {
- 2130968645,
- 2130968646,
- 2130968654,
- 2130968723,
- 2130968735,
- 2130968831,
- 2130968841,
- 2130969003};
-
- // aapt resource value: 0
- public const int FloatingActionButton_backgroundTint = 0;
-
+ 2130772005,
+ 2130772221,
+ 2130772222,
+ 2130772259,
+ 2130772260,
+ 2130772261,
+ 2130772262,
+ 2130772263};
+
// 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;
-
+ public const int FloatingActionButton_backgroundTint = 1;
+
// aapt resource value: 2
- public const int FloatingActionButton_borderWidth = 2;
-
- // aapt resource value: 3
- public const int FloatingActionButton_elevation = 3;
-
+ public const int FloatingActionButton_backgroundTintMode = 2;
+
+ // aapt resource value: 6
+ public const int FloatingActionButton_borderWidth = 6;
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_elevation = 0;
+
// aapt resource value: 4
public const int FloatingActionButton_fabSize = 4;
-
+
// aapt resource value: 5
public const int FloatingActionButton_pressedTranslationZ = 5;
-
- // aapt resource value: 6
- public const int FloatingActionButton_rippleColor = 6;
-
+
+ // aapt resource value: 3
+ public const int FloatingActionButton_rippleColor = 3;
+
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
-
- // aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
- public static int[] FontFamily = new int[] {
- 2130968743,
- 2130968744,
- 2130968745,
- 2130968746,
- 2130968747,
- 2130968748};
-
- // aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
- public static int[] FontFamilyFont = new int[] {
- 2130968741,
- 2130968749,
- 2130968750};
-
+
+ public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+ 2130772264};
+
// aapt resource value: 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;
-
+ public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+
+ public static int[] FontFamily = new int[] {
+ 2130772305,
+ 2130772306,
+ 2130772307,
+ 2130772308,
+ 2130772309,
+ 2130772310};
+
// 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;
-
+ public const int FontFamily_fontProviderCerts = 3;
+
// aapt resource value: 4
- public const int FontFamily_fontProviderPackage = 4;
-
+ public const int FontFamily_fontProviderFetchStrategy = 4;
+
// aapt resource value: 5
- public const int FontFamily_fontProviderQuery = 5;
-
- // aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
+ 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;
+
+ public static int[] FontFamilyFont = new int[] {
+ 2130772311,
+ 2130772312,
+ 2130772313};
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_font = 1;
+
+ // aapt resource value: 0
+ public const int FontFamilyFont_fontStyle = 0;
+
+ // aapt resource value: 2
+ public const int FontFamilyFont_fontWeight = 2;
+
public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
- 2130968751};
-
+ 2130772265};
+
// aapt resource value: 0
public const int ForegroundLinearLayout_android_foreground = 0;
-
+
// aapt resource value: 1
public const int ForegroundLinearLayout_android_foregroundGravity = 1;
-
+
// 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[] {
- 2130968617,
- 2130968618,
- 2130968619,
- 2130968620,
- 2130968621,
- 2130968622,
- 2130968623,
- 2130968624,
- 2130968625,
- 2130968626,
- 2130968627,
- 2130968628,
- 2130968629,
- 2130968630,
- 2130968631,
- 2130968632,
- 2130968633,
- 2130968754};
-
- // aapt resource value: 0
- public const int HDLArcSeekBar_arc_border_color = 0;
-
- // aapt resource value: 1
- public const int HDLArcSeekBar_arc_border_width = 1;
-
- // aapt resource value: 2
- public const int HDLArcSeekBar_arc_colors = 2;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_max = 3;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_min = 4;
-
+ 2130772382,
+ 2130772383,
+ 2130772384,
+ 2130772385,
+ 2130772386,
+ 2130772387,
+ 2130772388,
+ 2130772389,
+ 2130772390,
+ 2130772391,
+ 2130772392,
+ 2130772393,
+ 2130772394,
+ 2130772395,
+ 2130772396,
+ 2130772397,
+ 2130772398,
+ 2130772399};
+
// aapt resource value: 5
- public const int HDLArcSeekBar_arc_open_angle = 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_progress = 6;
-
+ public const int HDLArcSeekBar_arc_max = 6;
+
// aapt resource value: 7
- public const int HDLArcSeekBar_arc_progress_bar_color = 7;
-
+ public const int HDLArcSeekBar_arc_min = 7;
+
+ // aapt resource value: 1
+ public const int HDLArcSeekBar_arc_open_angle = 1;
+
// 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;
-
+ 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;
+
+ // aapt resource value: 2
+ public const int HDLArcSeekBar_arc_rotate_angle = 2;
+
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_shadow_radius = 15;
+
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_shadow_radius = 10;
-
+ public const int HDLArcSeekBar_arc_thumb_color = 10;
+
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_color = 11;
-
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_radius = 12;
-
+ public const int HDLArcSeekBar_arc_thumb_radius = 11;
+
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
-
- // aapt resource value: 14
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
-
- // 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: 12
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_thumb_width = 9;
+
// aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
-
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
-
+ public const int HDLArcSeekBar_arc_width = 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: 2
- public const int HDLCurtainSeekBar_curtain_bar_color = 2;
-
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_height = 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;
+
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
-
- // 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[] {
- 2130968848,
- 2130969005,
- 2130969006,
- 2130969007,
- 2130969008,
- 2130969009};
-
- // aapt resource value: 0
- public const int HDLWaveSeekBar_second_wave_color = 0;
-
+
// aapt resource value: 1
- public const int HDLWaveSeekBar_wave_bg_color = 1;
-
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+
+ 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_border_color = 2;
-
+ public const int HDLWaveSeekBar_wave_bg_color = 2;
+
// aapt resource value: 3
- public const int HDLWaveSeekBar_wave_color = 3;
-
- // aapt resource value: 4
- public const int HDLWaveSeekBar_wave_height = 4;
-
+ public const int HDLWaveSeekBar_wave_border_color = 3;
+
+ // aapt resource value: 0
+ public const int HDLWaveSeekBar_wave_color = 0;
+
// aapt resource value: 5
- public const int HDLWaveSeekBar_wave_width = 5;
-
- // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
+ public const int HDLWaveSeekBar_wave_height = 5;
+
+ // aapt resource value: 4
+ public const int HDLWaveSeekBar_wave_width = 4;
+
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130968712,
- 2130968714,
- 2130968807,
- 2130968853};
-
+ 2130771988,
+ 2130772158,
+ 2130772159,
+ 2130772160};
+
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
-
+
// aapt resource value: 3
public const int LinearLayoutCompat_android_baselineAlignedChildIndex = 3;
-
+
// aapt resource value: 0
public const int LinearLayoutCompat_android_gravity = 0;
-
+
// aapt resource value: 1
public const int LinearLayoutCompat_android_orientation = 1;
-
+
// aapt resource value: 4
public const int LinearLayoutCompat_android_weightSum = 4;
-
+
// 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_dividerPadding = 6;
-
- // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
+ public const int LinearLayoutCompat_measureWithLargestChild = 6;
+
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_showDividers = 7;
+
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
16842997,
16843137};
-
+
// aapt resource value: 0
public const int LinearLayoutCompat_Layout_android_layout_gravity = 0;
-
+
// aapt resource value: 2
public const int LinearLayoutCompat_Layout_android_layout_height = 2;
-
+
// aapt resource value: 3
public const int LinearLayoutCompat_Layout_android_layout_weight = 3;
-
+
// 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};
-
+
// aapt resource value: 0
public const int ListPopupWindow_android_dropDownHorizontalOffset = 0;
-
+
// 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,
@@ -7073,26 +7043,25 @@
16843230,
16843231,
16843232};
-
+
// aapt resource value: 5
public const int MenuGroup_android_checkableBehavior = 5;
-
+
// aapt resource value: 0
public const int MenuGroup_android_enabled = 0;
-
+
// aapt resource value: 1
public const int MenuGroup_android_id = 1;
-
+
// aapt resource value: 3
public const int MenuGroup_android_menuCategory = 3;
-
+
// aapt resource value: 4
public const int MenuGroup_android_orderInCategory = 4;
-
+
// 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,
@@ -7107,87 +7076,86 @@
16843236,
16843237,
16843375,
- 2130968589,
- 2130968607,
- 2130968608,
- 2130968616,
- 2130968689,
- 2130968764,
- 2130968765,
- 2130968813,
- 2130968852,
- 2130968999};
-
- // aapt resource value: 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;
-
+ 2130772161,
+ 2130772162,
+ 2130772163,
+ 2130772164,
+ 2130772165,
+ 2130772166,
+ 2130772167,
+ 2130772168,
+ 2130772169,
+ 2130772170};
+
// aapt resource value: 16
- public const int MenuItem_alphabeticModifiers = 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;
+
+ // aapt resource value: 13
+ public const int MenuItem_alphabeticModifiers = 13;
+
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
-
+
// aapt resource value: 11
public const int MenuItem_android_checkable = 11;
-
+
// aapt resource value: 3
public const int MenuItem_android_checked = 3;
-
+
// aapt resource value: 1
public const int MenuItem_android_enabled = 1;
-
+
// aapt resource value: 0
public const int MenuItem_android_icon = 0;
-
+
// aapt resource value: 2
public const int MenuItem_android_id = 2;
-
+
// aapt resource value: 5
public const int MenuItem_android_menuCategory = 5;
-
+
// aapt resource value: 10
public const int MenuItem_android_numericShortcut = 10;
-
+
// aapt resource value: 12
public const int MenuItem_android_onClick = 12;
-
+
// aapt resource value: 6
public const int MenuItem_android_orderInCategory = 6;
-
+
// aapt resource value: 7
public const int MenuItem_android_title = 7;
-
+
// aapt resource value: 8
public const int MenuItem_android_titleCondensed = 8;
-
+
// 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_iconTintMode = 19;
-
- // aapt resource value: 20
- public const int MenuItem_numericModifiers = 20;
-
+ public const int MenuItem_contentDescription = 19;
+
// aapt resource value: 21
- public const int MenuItem_showAsAction = 21;
-
+ public const int MenuItem_iconTint = 21;
+
// aapt resource value: 22
- public const int MenuItem_tooltipText = 22;
-
- // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
+ 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;
+
+ // aapt resource value: 20
+ public const int MenuItem_tooltipText = 20;
+
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -7196,613 +7164,570 @@
16843055,
16843056,
16843057,
- 2130968830,
- 2130968934};
-
+ 2130772171,
+ 2130772172};
+
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
-
+
// aapt resource value: 2
public const int MenuView_android_horizontalDivider = 2;
-
+
// aapt resource value: 5
public const int MenuView_android_itemBackground = 5;
-
+
// aapt resource value: 6
public const int MenuView_android_itemIconDisabledAlpha = 6;
-
+
// aapt resource value: 1
public const int MenuView_android_itemTextAppearance = 1;
-
+
// aapt resource value: 3
public const int MenuView_android_verticalDivider = 3;
-
+
// aapt resource value: 0
public const int MenuView_android_windowAnimationStyle = 0;
-
+
// aapt resource value: 7
public const int MenuView_preserveIconSpacing = 7;
-
+
// 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,
- 2130968723,
- 2130968755,
- 2130968772,
- 2130968773,
- 2130968775,
- 2130968776,
- 2130968808};
-
+ 2130772005,
+ 2130772266,
+ 2130772267,
+ 2130772268,
+ 2130772269,
+ 2130772270,
+ 2130772271};
+
// aapt resource value: 0
public const int NavigationView_android_background = 0;
-
+
// aapt resource value: 1
public const int NavigationView_android_fitsSystemWindows = 1;
-
+
// aapt resource value: 2
public const int NavigationView_android_maxWidth = 2;
-
+
// aapt resource value: 3
public const int NavigationView_elevation = 3;
-
- // aapt resource value: 4
- public const int NavigationView_headerLayout = 4;
-
- // aapt resource value: 5
- public const int NavigationView_itemBackground = 5;
-
- // aapt resource value: 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 pickerview_wheelview_textColorOut = 4;
-
+ public const int NavigationView_headerLayout = 9;
+
+ // aapt resource value: 7
+ public const int NavigationView_itemBackground = 7;
+
// aapt resource value: 5
- public const int pickerview_wheelview_textSize = 5;
-
- // aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
+ public const int NavigationView_itemIconTint = 5;
+
+ // aapt resource value: 8
+ public const int NavigationView_itemTextAppearance = 8;
+
+ // aapt resource value: 6
+ public const int NavigationView_itemTextColor = 6;
+
+ // aapt resource value: 4
+ public const int NavigationView_menu = 4;
+
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130968814};
-
- // aapt resource value: { 0x7F040161 }
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130968929};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
-
+ 2130772173};
+
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
-
+
// aapt resource value: 0
public const int PopupWindow_android_popupBackground = 0;
-
+
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
-
- // aapt resource value: { 0x7F0400EF,0x7F0400F2 }
+
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130772174};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
+
public static int[] RecycleListView = new int[] {
- 2130968815,
- 2130968818};
-
+ 2130772175,
+ 2130772176};
+
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
-
+
// 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,
- 2130968736,
- 2130968737,
- 2130968738,
- 2130968739,
- 2130968740,
- 2130968779,
- 2130968840,
- 2130968857,
- 2130968928};
-
+ 2130771968,
+ 2130771969,
+ 2130771970,
+ 2130771971,
+ 2130771972,
+ 2130771973,
+ 2130771974,
+ 2130771975,
+ 2130771976};
+
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
-
+
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
-
- // aapt resource value: 2
- public const int RecyclerView_fastScrollEnabled = 2;
-
- // aapt resource value: 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_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;
-
+ public const int RecyclerView_fastScrollEnabled = 6;
+
// aapt resource value: 9
- public const int RecyclerView_spanCount = 9;
-
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
+
// aapt resource value: 10
- public const int RecyclerView_stackFromEnd = 10;
-
- // aapt resource value: { 0x7F0400C2 }
+ 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;
+
+ // aapt resource value: 3
+ public const int RecyclerView_spanCount = 3;
+
+ // aapt resource value: 5
+ public const int RecyclerView_stackFromEnd = 5;
+
public static int[] ScrimInsetsFrameLayout = new int[] {
- 2130968770};
-
+ 2130772272};
+
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
-
- // aapt resource value: { 0x7F04004A }
+
public static int[] ScrollingViewBehavior_Layout = new int[] {
- 2130968650};
-
+ 2130772273};
+
// 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,
- 2130968671,
- 2130968688,
- 2130968708,
- 2130968753,
- 2130968766,
- 2130968778,
- 2130968834,
- 2130968835,
- 2130968844,
- 2130968845,
- 2130968935,
- 2130968940,
- 2130969004};
-
+ 2130772177,
+ 2130772178,
+ 2130772179,
+ 2130772180,
+ 2130772181,
+ 2130772182,
+ 2130772183,
+ 2130772184,
+ 2130772185,
+ 2130772186,
+ 2130772187,
+ 2130772188,
+ 2130772189};
+
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
-
+
// aapt resource value: 3
public const int SearchView_android_imeOptions = 3;
-
+
// aapt resource value: 2
public const int SearchView_android_inputType = 2;
-
+
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
-
- // aapt resource value: 4
- public const int SearchView_closeIcon = 4;
-
- // aapt resource value: 5
- public const int SearchView_commitIcon = 5;
-
- // aapt resource value: 6
- public const int SearchView_defaultQueryHint = 6;
-
- // 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_queryBackground = 10;
-
- // aapt resource value: 11
- public const int SearchView_queryHint = 11;
-
- // aapt resource value: 12
- public const int SearchView_searchHintIcon = 12;
-
+ public const int SearchView_closeIcon = 8;
+
// aapt resource value: 13
- public const int SearchView_searchIcon = 13;
-
- // aapt resource value: 14
- public const int SearchView_submitBackground = 14;
-
+ 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: 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_suggestionRowLayout = 15;
-
+ public const int SearchView_queryBackground = 15;
+
+ // aapt resource value: 6
+ public const int SearchView_queryHint = 6;
+
+ // aapt resource value: 11
+ public const int SearchView_searchHintIcon = 11;
+
+ // aapt resource value: 10
+ public const int SearchView_searchIcon = 10;
+
// 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 const int SearchView_submitBackground = 16;
+
+ // aapt resource value: 14
+ public const int SearchView_suggestionRowLayout = 14;
+
+ // aapt resource value: 12
+ public const int SearchView_voiceIcon = 12;
+
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 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};
-
+ 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};
+
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
-
+
// 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: 3
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-
- // aapt resource value: 4
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlDragRate = 5;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-
- // 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;
-
+ 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_srlReboundDuration = 36;
-
- // aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
+ 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;
+
+ // aapt resource value: 4
+ public const int SmartRefreshLayout_srlReboundDuration = 4;
+
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130772315,
+ 2130772375};
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+
public static int[] SnackbarLayout = new int[] {
16843039,
- 2130968723,
- 2130968805};
-
+ 2130772005,
+ 2130772274};
+
// aapt resource value: 0
public const int SnackbarLayout_android_maxWidth = 0;
-
+
// aapt resource value: 1
public const int SnackbarLayout_elevation = 1;
-
+
// 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,
- 2130968828};
-
+ 2130772006};
+
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
-
+
// aapt resource value: 0
public const int Spinner_android_entries = 0;
-
+
// aapt resource value: 1
public const int Spinner_android_popupBackground = 1;
-
+
// aapt resource value: 2
public const int Spinner_android_prompt = 2;
-
+
// 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,
- 2130968854,
- 2130968861,
- 2130968941,
- 2130968942,
- 2130968944,
- 2130968975,
- 2130968976,
- 2130968977,
- 2130969000,
- 2130969001,
- 2130969002};
-
+ 2130772190,
+ 2130772191,
+ 2130772192,
+ 2130772193,
+ 2130772194,
+ 2130772195,
+ 2130772196,
+ 2130772197,
+ 2130772198,
+ 2130772199,
+ 2130772200};
+
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
-
+
// aapt resource value: 0
public const int SwitchCompat_android_textOn = 0;
-
+
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
-
- // aapt resource value: 3
- public const int SwitchCompat_showText = 3;
-
- // aapt resource value: 4
- public const int SwitchCompat_splitTrack = 4;
-
- // aapt resource value: 5
- public const int SwitchCompat_switchMinWidth = 5;
-
- // aapt resource value: 6
- public const int SwitchCompat_switchPadding = 6;
-
- // aapt resource value: 7
- public const int SwitchCompat_switchTextAppearance = 7;
-
+
+ // aapt resource value: 13
+ public const int SwitchCompat_showText = 13;
+
+ // aapt resource value: 12
+ public const int SwitchCompat_splitTrack = 12;
+
+ // aapt resource value: 10
+ public const int SwitchCompat_switchMinWidth = 10;
+
+ // aapt resource value: 11
+ public const int SwitchCompat_switchPadding = 11;
+
+ // aapt resource value: 9
+ public const int SwitchCompat_switchTextAppearance = 9;
+
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
-
- // aapt resource value: 9
- public const int SwitchCompat_thumbTint = 9;
-
- // aapt resource value: 10
- public const int SwitchCompat_thumbTintMode = 10;
-
- // aapt resource value: 11
- public const int SwitchCompat_track = 11;
-
- // aapt resource value: 12
- public const int SwitchCompat_trackTint = 12;
-
- // aapt resource value: 13
- public const int SwitchCompat_trackTintMode = 13;
-
- // aapt resource value: { 0x1010002,0x10100F2,0x101014F }
+
+ // aapt resource value: 3
+ public const int SwitchCompat_thumbTint = 3;
+
+ // aapt resource value: 4
+ public const int SwitchCompat_thumbTintMode = 4;
+
+ // aapt resource value: 5
+ public const int SwitchCompat_track = 5;
+
+ // aapt resource value: 6
+ public const int SwitchCompat_trackTint = 6;
+
+ // aapt resource value: 7
+ public const int SwitchCompat_trackTintMode = 7;
+
public static int[] TabItem = new int[] {
16842754,
16842994,
16843087};
-
+
// aapt resource value: 0
public const int TabItem_android_icon = 0;
-
+
// aapt resource value: 1
public const int TabItem_android_layout = 1;
-
+
// 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[] {
- 2130968945,
- 2130968946,
- 2130968947,
- 2130968948,
- 2130968949,
- 2130968950,
- 2130968951,
- 2130968952,
- 2130968953,
- 2130968954,
- 2130968955,
- 2130968956,
- 2130968957,
- 2130968958,
- 2130968959,
- 2130968960};
-
- // aapt resource value: 0
- public const int TabLayout_tabBackground = 0;
-
- // aapt resource value: 1
- public const int TabLayout_tabContentStart = 1;
-
- // aapt resource value: 2
- public const int TabLayout_tabGravity = 2;
-
+ 2130772275,
+ 2130772276,
+ 2130772277,
+ 2130772278,
+ 2130772279,
+ 2130772280,
+ 2130772281,
+ 2130772282,
+ 2130772283,
+ 2130772284,
+ 2130772285,
+ 2130772286,
+ 2130772287,
+ 2130772288,
+ 2130772289,
+ 2130772290};
+
// aapt resource value: 3
- public const int TabLayout_tabIndicatorColor = 3;
-
- // aapt resource value: 4
- public const int TabLayout_tabIndicatorHeight = 4;
-
+ public const int TabLayout_tabBackground = 3;
+
+ // aapt resource value: 2
+ public const int TabLayout_tabContentStart = 2;
+
// aapt resource value: 5
- public const int TabLayout_tabMaxWidth = 5;
-
+ public const int TabLayout_tabGravity = 5;
+
+ // aapt resource value: 0
+ public const int TabLayout_tabIndicatorColor = 0;
+
+ // aapt resource value: 1
+ public const int TabLayout_tabIndicatorHeight = 1;
+
+ // aapt resource value: 7
+ public const int TabLayout_tabMaxWidth = 7;
+
// aapt resource value: 6
public const int TabLayout_tabMinWidth = 6;
-
- // aapt resource value: 7
- public const int TabLayout_tabMode = 7;
-
- // aapt resource value: 8
- public const int TabLayout_tabPadding = 8;
-
- // aapt resource value: 9
- public const int TabLayout_tabPaddingBottom = 9;
-
- // aapt resource value: 10
- public const int TabLayout_tabPaddingEnd = 10;
-
+
+ // aapt resource value: 4
+ public const int TabLayout_tabMode = 4;
+
+ // aapt resource value: 15
+ public const int TabLayout_tabPadding = 15;
+
+ // aapt resource value: 14
+ public const int TabLayout_tabPaddingBottom = 14;
+
+ // aapt resource value: 13
+ public const int TabLayout_tabPaddingEnd = 13;
+
// aapt resource value: 11
public const int TabLayout_tabPaddingStart = 11;
-
+
// aapt resource value: 12
public const int TabLayout_tabPaddingTop = 12;
-
- // aapt resource value: 13
- public const int TabLayout_tabSelectedTextColor = 13;
-
- // aapt resource value: 14
- public const int TabLayout_tabTextAppearance = 14;
-
- // 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 }
+
+ // aapt resource value: 10
+ public const int TabLayout_tabSelectedTextColor = 10;
+
+ // aapt resource value: 8
+ public const int TabLayout_tabTextAppearance = 8;
+
+ // aapt resource value: 9
+ public const int TabLayout_tabTextColor = 9;
+
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -7815,339 +7740,340 @@
16843107,
16843108,
16843692,
- 2130968742,
- 2130968961};
-
+ 2130772022,
+ 2130772028};
+
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
-
+
// aapt resource value: 6
public const int TextAppearance_android_shadowColor = 6;
-
+
// aapt resource value: 7
public const int TextAppearance_android_shadowDx = 7;
-
+
// aapt resource value: 8
public const int TextAppearance_android_shadowDy = 8;
-
+
// aapt resource value: 9
public const int TextAppearance_android_shadowRadius = 9;
-
+
// aapt resource value: 3
public const int TextAppearance_android_textColor = 3;
-
+
// aapt resource value: 4
public const int TextAppearance_android_textColorHint = 4;
-
+
// aapt resource value: 5
public const int TextAppearance_android_textColorLink = 5;
-
+
// aapt resource value: 0
public const int TextAppearance_android_textSize = 0;
-
+
// aapt resource value: 2
public const int TextAppearance_android_textStyle = 2;
-
+
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
-
- // aapt resource value: 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 const int TextAppearance_fontFamily = 12;
+
+ // aapt resource value: 11
+ public const int TextAppearance_textAllCaps = 11;
+
public static int[] TextInputLayout = new int[] {
16842906,
16843088,
- 2130968698,
- 2130968699,
- 2130968700,
- 2130968701,
- 2130968724,
- 2130968725,
- 2130968758,
- 2130968759,
- 2130968760,
- 2130968822,
- 2130968823,
- 2130968824,
- 2130968825,
- 2130968826};
-
+ 2130772291,
+ 2130772292,
+ 2130772293,
+ 2130772294,
+ 2130772295,
+ 2130772296,
+ 2130772297,
+ 2130772298,
+ 2130772299,
+ 2130772300,
+ 2130772301,
+ 2130772302,
+ 2130772303,
+ 2130772304};
+
// aapt resource value: 1
public const int TextInputLayout_android_hint = 1;
-
+
// aapt resource value: 0
public const int TextInputLayout_android_textColorHint = 0;
-
- // aapt resource value: 2
- public const int TextInputLayout_counterEnabled = 2;
-
- // aapt resource value: 3
- public const int TextInputLayout_counterMaxLength = 3;
-
- // aapt resource value: 4
- public const int TextInputLayout_counterOverflowTextAppearance = 4;
-
- // aapt resource value: 5
- public const int TextInputLayout_counterTextAppearance = 5;
-
+
// aapt resource value: 6
- public const int TextInputLayout_errorEnabled = 6;
-
+ public const int TextInputLayout_counterEnabled = 6;
+
// aapt resource value: 7
- public const int TextInputLayout_errorTextAppearance = 7;
-
- // aapt resource value: 8
- public const int TextInputLayout_hintAnimationEnabled = 8;
-
+ public const int TextInputLayout_counterMaxLength = 7;
+
// aapt resource value: 9
- public const int TextInputLayout_hintEnabled = 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_hintTextAppearance = 10;
-
- // aapt resource value: 11
- public const int TextInputLayout_passwordToggleContentDescription = 11;
-
+ public const int TextInputLayout_hintAnimationEnabled = 10;
+
+ // aapt resource value: 3
+ public const int TextInputLayout_hintEnabled = 3;
+
+ // aapt resource value: 2
+ public const int TextInputLayout_hintTextAppearance = 2;
+
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleContentDescription = 13;
+
// aapt resource value: 12
public const int TextInputLayout_passwordToggleDrawable = 12;
-
- // aapt resource value: 13
- public const int TextInputLayout_passwordToggleEnabled = 13;
-
+
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleEnabled = 11;
+
// aapt resource value: 14
public const int TextInputLayout_passwordToggleTint = 14;
-
+
// 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,
- 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};
-
+ 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};
+
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
-
+
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
-
- // aapt resource value: 2
- public const int Toolbar_buttonGravity = 2;
-
- // aapt resource value: 3
- public const int Toolbar_collapseContentDescription = 3;
-
- // aapt resource value: 4
- public const int Toolbar_collapseIcon = 4;
-
- // aapt resource value: 5
- public const int Toolbar_contentInsetEnd = 5;
-
+
+ // aapt resource value: 21
+ public const int Toolbar_buttonGravity = 21;
+
+ // aapt resource value: 23
+ public const int Toolbar_collapseContentDescription = 23;
+
+ // aapt resource value: 22
+ public const int Toolbar_collapseIcon = 22;
+
// aapt resource value: 6
- public const int Toolbar_contentInsetEndWithActions = 6;
-
+ public const int Toolbar_contentInsetEnd = 6;
+
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetEndWithActions = 10;
+
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
-
+
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
-
- // aapt resource value: 9
- public const int Toolbar_contentInsetStart = 9;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetStartWithNavigation = 10;
-
- // aapt resource value: 11
- public const int Toolbar_logo = 11;
-
- // aapt resource value: 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_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[] {
- 2130968890,
- 2130968895,
- 2130968899,
- 2130968900,
- 2130968911,
- 2130968915};
-
- // aapt resource value: 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_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 const int Toolbar_contentInsetStart = 5;
+
+ // aapt resource value: 9
+ public const int Toolbar_contentInsetStartWithNavigation = 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: 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;
+
+ // aapt resource value: 12
+ public const int Toolbar_titleTextAppearance = 12;
+
+ // aapt resource value: 27
+ public const int Toolbar_titleTextColor = 27;
+
+ 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;
+
+ // aapt resource value: 0
+ public const int TwoLevelHeader_srlMaxRage = 0;
+
+ // aapt resource value: 2
+ public const int TwoLevelHeader_srlRefreshRage = 2;
+
public static int[] View = new int[] {
16842752,
16842970,
- 2130968816,
- 2130968817,
- 2130968973};
-
- // aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
+ 2130772218,
+ 2130772219,
+ 2130772220};
+
+ // 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;
+
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130968645,
- 2130968646};
-
+ 2130772221,
+ 2130772222};
+
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
-
+
// aapt resource value: 1
public const int ViewBackgroundHelper_backgroundTint = 1;
-
+
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
-
- // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
+
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
16842995};
-
+
// aapt resource value: 0
public const int ViewStubCompat_android_id = 0;
-
+
// aapt resource value: 2
public const int ViewStubCompat_android_inflatedId = 2;
-
+
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
-
- // 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: 2
- public const int View_paddingEnd = 2;
-
- // aapt resource value: 3
- public const int View_paddingStart = 3;
-
+
+ public static int[] pickerview = new int[] {
+ 2130772412,
+ 2130772413,
+ 2130772414,
+ 2130772415,
+ 2130772416,
+ 2130772417};
+
// aapt resource value: 4
- public const int View_theme = 4;
-
+ public const int pickerview_wheelview_dividerColor = 4;
+
+ // 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;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_textColorOut = 2;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_textSize = 1;
+
static Styleable()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
}
-
+
private Styleable()
- {
- }
- }
-
- 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()
{
}
}
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
old mode 100644
new mode 100755
index 0498c00..5f7c60e
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -53,26 +53,42 @@
NSString key_hiddenJson = new NSString("HiddenJson");
if (userInfo.ContainsKey(key_hiddenJson))
{
- NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
- if (hiddenJsonDic != null)
- {
- NSString key_Offline = new NSString("Offline");
- if (hiddenJsonDic.ContainsKey(key_Offline))
- {
- string signOut = hiddenJsonDic["Offline"].ToString();
-
- if (signOut == "0")
+ var hiddenJson = userInfo["HiddenJson"].ToString();
+ if (!string.IsNullOrEmpty(hiddenJson))
+ {
+ if (hiddenJson.Contains("cmtID"))
+ {
+
+ ///鐩墠鏍规嵁杩欎釜鍒ゆ柇鏄惁鏄彲瑙嗗璁叉暟鎹�
+ // VideoMethod(hiddenJson);
+ }
+ else
+ {
+
+ NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
+ if (hiddenJsonDic != null)
{
- //涓嶄笅绾�
- }
- else
- {
- //鏍囪涓嬬嚎
- haveToSignOut = true;
- }
- }
+ NSString key_Offline = new NSString("Offline");
+ if (hiddenJsonDic.ContainsKey(key_Offline))
+ {
+ string signOut = hiddenJsonDic["Offline"].ToString();
+ if (signOut == "0")
+ {
+ //涓嶄笅绾�
+ }
+ else
+ {
+ //鏍囪涓嬬嚎
+ haveToSignOut = true;
+ }
+ }
+
+ }
+ }
}
+
+
}
}
@@ -100,25 +116,41 @@
NSString key_hiddenJson = new NSString("HiddenJson");
if (userInfo.ContainsKey(key_hiddenJson))
{
- NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
- if (hiddenJsonDic == null)
- {
- return;
- }
- NSString key_Offline = new NSString("Offline");
- if (hiddenJsonDic.ContainsKey(key_Offline))
- {
- string signOut = hiddenJsonDic["Offline"].ToString();
-
- if (signOut == "0")
+ var hiddenJson = userInfo["HiddenJson"].ToString();
+ if (string.IsNullOrEmpty(hiddenJson))
+ {
+ return;
+ }
+
+ if (hiddenJson.Contains("cmtID"))
+ {
+
+ ///鐩墠鏍规嵁杩欎釜鍒ゆ柇鏄惁鏄彲瑙嗗璁叉暟鎹�
+ VideoMethod(hiddenJson);
+ }
+ else
+ {
+
+ NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
+ if (hiddenJsonDic == null)
{
- //涓嶄笅绾�
+ return;
}
- else
+ NSString key_Offline = new NSString("Offline");
+ if (hiddenJsonDic.ContainsKey(key_Offline))
{
- //寮哄埗涓嬬嚎
- CommonPage.Instance.SingOut();
- CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
+ string signOut = hiddenJsonDic["Offline"].ToString();
+
+ if (signOut == "0")
+ {
+ //涓嶄笅绾�
+ }
+ else
+ {
+ //寮哄埗涓嬬嚎
+ CommonPage.Instance.SingOut();
+ CommonPage.Instance.ShowErrorInfoAlert(Shared.R.MyInternationalizationString.uHadBeenLoginAndOffLine);
+ }
}
}
}
@@ -128,30 +160,82 @@
NSString key_hiddenJson = new NSString("HiddenJson");
if (userInfo.ContainsKey(key_hiddenJson))
{
- NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
- if (hiddenJsonDic == null)
- {
- return;
- }
- NSString key_Offline = new NSString("Offline");
- if (hiddenJsonDic.ContainsKey(key_Offline))
- {
- string signOut = hiddenJsonDic["Offline"].ToString();
-
- if (signOut == "0")
+
+ var hiddenJson = userInfo["HiddenJson"].ToString();
+ if (string.IsNullOrEmpty(hiddenJson)) {
+ return;
+ }
+
+ if (hiddenJson.Contains("cmtID"))
+ {
+ ///鐩墠鏍规嵁杩欎釜鍒ゆ柇鏄惁鏄彲瑙嗗璁叉暟鎹�
+ VideoMethod(hiddenJson);
+ }
+ else
+ {
+
+ NSDictionary hiddenJsonDic = userInfo["HiddenJson"] as NSDictionary;
+ if (hiddenJsonDic == null)
{
- //涓嶄笅绾�
+ return;
}
- else
+ NSString key_Offline = new NSString("Offline");
+ if (hiddenJsonDic.ContainsKey(key_Offline))
{
- //鏍囪涓嬬嚎
- haveToSignOut = true;
+ string signOut = hiddenJsonDic["Offline"].ToString();
+
+ if (signOut == "0")
+ {
+ //涓嶄笅绾�
+ }
+ else
+ {
+ //鏍囪涓嬬嚎
+ haveToSignOut = true;
+ }
}
}
}
}
completionHandler(UIBackgroundFetchResult.NewData);
+ }
+ /// <summary>
+ /// ios閫氱煡鏍忕偣鍑绘墦寮�鍙瀵硅鐨勬柟娉�
+ /// </summary>
+ /// <param name="hiddenJson">浜戠鎺ㄨ繃鏉ョ殑鏁版嵁</param>
+ private void VideoMethod(string hiddenJson)
+ {
+
+ var json = Newtonsoft.Json.Linq.JObject.Parse(hiddenJson);
+ if (json == null)
+ {
+ return;
+ }
+ GateWay.Ios.ESVideoInfo eSVideoInfo = new GateWay.Ios.ESVideoInfo();
+ if (json["uuid"].ToString().Contains(","))
+ {
+ var uuid = json["uuid"].ToString().Split(',');
+ eSVideoInfo.ESVideoUUID = uuid[0];
+ }
+ else
+ {
+ eSVideoInfo.ESVideoUUID = json["uuid"].ToString();
+ }
+
+ eSVideoInfo.DeviceName = Language.StringByID(Shared.R.MyInternationalizationString.theOutdoorUnit);
+ eSVideoInfo.ESRoomID = int.Parse(json["roomno"].ToString());
+ if (!string.IsNullOrEmpty(json["unitno"].ToString()))
+ {
+ string str = json["unitno"].ToString();
+ string str1 = str.Substring(0, 2).TrimStart('0');
+ string str2 = str.Substring(2, 2).TrimStart('0');
+ eSVideoInfo.RoomName = str1 + Language.StringByID(Shared.R.MyInternationalizationString.dong) + str2 + Language.StringByID(Shared.R.MyInternationalizationString.unit);
+ }
+ GateWay.Ios.ESVideo.ShowESvideoVideoIntercom(eSVideoInfo);
+
+ //var url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/VideoIntercom/Answer";
+ //var dd=await Shared.Phone.Device.Logic.Send.HttpWebRequest(url, json.ToString(), "POST", 3, true);
}
public override void ReceivedRemoteNotification(UIApplication application, NSDictionary userInfo)
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024_1024.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/1024*1024.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-3.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-4.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120_120-4.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/120*120.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152_152-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/152*152.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167_167-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/167*167.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180-1.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-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180_180-2.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/180*180.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20_20-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/20*20.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29_29-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/29*29.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-2-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-2-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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-2.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-3.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-4.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40_40-4.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/40*40.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-3.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-4.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58_58-4.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/58*58.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60_60-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/60*60.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76_76-1.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/76*76.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-3.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-4.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80_80-4.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/80*80.png
rename to 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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87-1.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-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87_87-2.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/87*87.png
rename to 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 9b94864..6e65bd0 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,119 +1,121 @@
{
"images": [
{
- "filename": "40*40.png",
+ "filename": "40_40-3.png",
"size": "20x20",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "60*60.png",
+ "filename": "60_60-1.png",
"size": "20x20",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "58*58.png",
+ "filename": "58_58-2.png",
"size": "29x29",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "87*87.png",
+ "filename": "87_87-1.png",
"size": "29x29",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "80*80-1.png",
+ "filename": "80_80-2.png",
"size": "40x40",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "120*120.png",
+ "filename": "120_120-2.png",
"size": "40x40",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "120*120-1.png",
+ "filename": "120_120-3.png",
"size": "60x60",
"scale": "2x",
"idiom": "iphone"
},
{
- "filename": "180*180.png",
+ "filename": "180_180-1.png",
"size": "60x60",
"scale": "3x",
"idiom": "iphone"
},
{
- "filename": "20*20.png",
+ "filename": "20_20-1.png",
"size": "20x20",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "40*40-1.png",
+ "filename": "40_40-4.png",
"size": "20x20",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "29*29.png",
+ "filename": "29_29-1.png",
"size": "29x29",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "58*58-1.png",
+ "filename": "58_58-3.png",
"size": "29x29",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "40*40-2.png",
+ "filename": "40_40-2-1.png",
"size": "40x40",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "80*80.png",
+ "filename": "80_80-3.png",
"size": "40x40",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "167*167.png",
+ "filename": "167_167-1.png",
"size": "83.5x83.5",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "76*76.png",
+ "filename": "76_76-1.png",
"size": "76x76",
"scale": "1x",
"idiom": "ipad"
},
{
- "filename": "152*152.png",
+ "filename": "152_152-1.png",
"size": "76x76",
"scale": "2x",
"idiom": "ipad"
},
{
- "filename": "1024*1024.png",
+ "filename": "1024_1024-1.png",
"size": "1024x1024",
"scale": "1x",
"idiom": "ios-marketing"
},
{
+ "filename": "120_120-4.png",
"size": "60x60",
"scale": "2x",
"idiom": "car"
},
{
+ "filename": "180_180-2.png",
"size": "60x60",
"scale": "3x",
"idiom": "car"
@@ -134,18 +136,21 @@
},
{
"role": "companionSettings",
+ "filename": "58_58-4.png",
"size": "29x29",
"scale": "2x",
"idiom": "watch"
},
{
"role": "companionSettings",
+ "filename": "87_87-2.png",
"size": "29x29",
"scale": "3x",
"idiom": "watch"
},
{
"role": "appLauncher",
+ "filename": "80_80-4.png",
"size": "40x40",
"subtype": "38mm",
"scale": "2x",
@@ -187,6 +192,7 @@
"idiom": "watch"
},
{
+ "filename": "1024_1024-2.png",
"size": "1024x1024",
"scale": "1x",
"idiom": "watch-marketing"
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*748.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*748.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*748.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*768-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*768-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*768-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024*768.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125*2436.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125*2436.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125*2436.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125*2436.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2208-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208-1.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2208-1.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2208-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2208-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2688_XS Max.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2688_XS Max.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2688_XS Max.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242*2688_XS Max.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2008.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2008.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2048-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2048-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2048-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536*2048.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792*828.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792*828.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080-1.png
new file mode 100755
index 0000000..c62ca74
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1920_1080-1.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1496.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1496.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1536-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1536-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1536-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*1536.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732-1.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*2732-1.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*2732-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048*2732-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208*1242.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208*1242.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436*1125.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436*1125.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688*1242.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688*1242.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320*480.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320*480.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160-1.png
new file mode 100755
index 0000000..ef7fbd9
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/3840_2160-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*1136-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*1136-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png
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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*1136-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*1136.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*960-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*960-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*960-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640*960.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750*1334.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750*1334.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334.png
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-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1004.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png
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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1004.png
rename to 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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1024-1.png
rename to 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-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1024-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.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-3.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1024-1.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.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
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768*1024.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828*1792_XR.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png
old mode 100644
new mode 100755
similarity index 100%
copy from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828*1792_XR.png
copy to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828*1792_XR.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR.png
old mode 100644
new mode 100755
similarity index 100%
rename from ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828*1792_XR.png
rename to ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR.png
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 ce96303..89d8507 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,6 +3,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "1920_1080-1.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -11,6 +12,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "3840_2160-1.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -20,7 +22,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242*2688_XS Max.png",
+ "filename": "1242_2688_XS Max-1.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -30,7 +32,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "828*1792_XR.png",
+ "filename": "828_1792_XR-1.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -40,7 +42,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2688*1242.png",
+ "filename": "2688_1242-1.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -50,7 +52,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1792*828.png",
+ "filename": "1792_828-1.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -60,7 +62,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1125*2436.png",
+ "filename": "1125_2436-1.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -70,7 +72,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2436*1125.png",
+ "filename": "2436_1125-1.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -80,7 +82,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1242*2208-1.png",
+ "filename": "1242_2208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -90,7 +92,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "750*1334.png",
+ "filename": "750_1334-1.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -100,7 +102,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2208*1242.png",
+ "filename": "2208_1242-1.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -110,7 +112,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "2048*2732-1.png",
+ "filename": "2048_2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -119,7 +121,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640*960.png",
+ "filename": "640_960-2.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -128,7 +130,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640*1136.png",
+ "filename": "640_1136-2.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -138,7 +140,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768*1024.png",
+ "filename": "768_1024-2.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -147,7 +149,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536*2048.png",
+ "filename": "1536_2048-2.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -156,7 +158,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024*768.png",
+ "filename": "1024_768-2.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -165,7 +167,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048*1536.png",
+ "filename": "2048_1536-2.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -173,7 +175,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "320*480.png",
+ "filename": "320_480-1.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -181,7 +183,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640*960-1.png",
+ "filename": "640_960-3.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -189,7 +191,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "640*1136-1.png",
+ "filename": "640_1136-3.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -198,7 +200,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "768*1004.png",
+ "filename": "768_1004-1.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -206,7 +208,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "1536*2008.png",
+ "filename": "1536_2008-1.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -214,7 +216,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "768*1024-1.png",
+ "filename": "768_1024-3.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -222,7 +224,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "1536*2048-1.png",
+ "filename": "1536_2048-3.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -230,7 +232,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "1024*748.png",
+ "filename": "1024_748-1.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -238,7 +240,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "2048*1496.png",
+ "filename": "2048_1496-1.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -246,7 +248,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "1024*768-1.png",
+ "filename": "1024_768-3.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -254,7 +256,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "2048*1536-1.png",
+ "filename": "2048_1536-3.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
diff --git a/ZigbeeApp/Home.Ios/ESVideo.cs b/ZigbeeApp/Home.Ios/ESVideo.cs
new file mode 100755
index 0000000..9045787
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/ESVideo.cs
@@ -0,0 +1,84 @@
+锘縰sing System;
+using Shared.IOS.ESVideoPhoneSDK;
+
+namespace GateWay.Ios
+{
+ public static class ESVideo
+ {
+ //public ESVideo()
+ //{
+
+ //}
+
+ public static void InitESVideoSDK()
+ {
+ ESVideo.InitESVideoSDK();
+ }
+
+ /// <summary>
+ /// 鐩戞帶椤甸潰
+ /// </summary>
+ /// <param name="mESVideoInfo"></param>
+ public static void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
+ {
+ ESVideoMonitorViewController mESVideoMonitorViewController = new ESVideoMonitorViewController();
+
+ mESVideoMonitorViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
+ mESVideoMonitorViewController.MESRoomID = mESVideoInfo.ESRoomID;
+ mESVideoMonitorViewController.DeviceName = mESVideoInfo.DeviceName;
+ mESVideoMonitorViewController.RoomName = mESVideoInfo.RoomName;
+ mESVideoMonitorViewController.IsCollect = mESVideoInfo.IsCollect;
+
+ Shared.Application.currentVC.NavigationController.PushViewController(mESVideoMonitorViewController, true);
+ }
+
+
+
+ /// <summary>
+ /// 琚懠鍙〉闈�
+ /// </summary>
+ /// <param name="mESVideoInfo"></param>
+ public static void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
+ {
+ ESvideoVideoIntercomViewController mESvideoVideoIntercomViewController = new ESvideoVideoIntercomViewController();
+ mESvideoVideoIntercomViewController.MESVideoID = mESVideoInfo.ESVideoUUID;
+ mESvideoVideoIntercomViewController.MESRoomID = mESVideoInfo.ESRoomID;
+ mESvideoVideoIntercomViewController.DeviceName = mESVideoInfo.DeviceName;
+ mESvideoVideoIntercomViewController.RoomName = mESVideoInfo.RoomName;
+ mESvideoVideoIntercomViewController.IsCollect = mESVideoInfo.IsCollect;
+
+ Shared.Application.currentVC.NavigationController.PushViewController(mESvideoVideoIntercomViewController, true);
+ }
+ }
+
+ public class ESVideoInfo
+ {
+ /// <summary>
+ /// 瀹ゅ鏈虹殑UUID
+ /// 渚嬶細JJY000007FSEYX
+ /// </summary>
+ public string ESVideoUUID=string.Empty;
+ /// <summary>
+ /// 褰撳墠鐢ㄦ埛鐨勬埧闂碔D
+ /// 渚嬶細0801
+ /// </summary>
+ public int ESRoomID;
+ /// <summary>
+ /// 瀹ゅ鏈虹殑鍚嶇О
+ /// 渚嬶細瀹ゅ鏈�
+ /// </summary>
+ public string DeviceName = string.Empty;
+ /// <summary>
+ /// 鎴块棿鍛藉悕
+ /// 渚嬶細8鏍�1鍗曞厓0801
+ /// </summary>
+ public string RoomName = string.Empty;
+ /// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool IsCollect;
+
+ }
+
+
+}
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 5777f00..3611ec5 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -87,6 +87,9 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
+ <Reference Include="Shared.IOS.ESVideoPhoneSDK">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.ESVideoPhoneSDK.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
@@ -132,6 +135,7 @@
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
<Compile Include="ZXingOverlayView.cs" />
+ <Compile Include="ESVideo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
@@ -193,6 +197,59 @@
<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\LaunchImage.launchimage\1920_1080-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688_XS Max-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792_XR-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20_20-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29_29-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-2-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-3.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\76_76-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\152_152-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\167_167-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120_120-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180_180-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-4.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
@@ -230,6 +287,7 @@
<BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueFourButton.png" />
+ <BundleResource Include="Resources\Phone\Instruct\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorCeilingGas.png" />
@@ -493,6 +551,7 @@
<BundleResource Include="Resources\Phone\Item\Check.png" />
<BundleResource Include="Resources\Phone\Item\MessageManagement.png" />
<BundleResource Include="Resources\Phone\Item\Add_GW.png" />
+ <BundleResource Include="Resources\Phone\Item\Battery.png" />
<BundleResource Include="Resources\Phone\Item\Switch2.png" />
<BundleResource Include="Resources\Phone\Item\MessageSelected.png" />
<BundleResource Include="Resources\Phone\Item\PhoneBook.png" />
@@ -560,8 +619,10 @@
<BundleResource Include="Resources\Phone\Item\ShardMenu.png" />
<BundleResource Include="Resources\Phone\Item\UnLockFail.png" />
<BundleResource Include="Resources\Phone\Item\ProgressMsg.png" />
+ <BundleResource Include="Resources\Phone\Item\SynchronizationSelected.png" />
<BundleResource Include="Resources\Phone\Item\BottomButtonGround.png" />
<BundleResource Include="Resources\Phone\Item\AutoBackup.png" />
+ <BundleResource Include="Resources\Phone\Item\BatterySelected.png" />
<BundleResource Include="Resources\Phone\Item\Category_FunctionBGSelected.png" />
<BundleResource Include="Resources\Phone\Item\NoFunction.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon2.png" />
@@ -578,7 +639,9 @@
<BundleResource Include="Resources\Phone\Item\GwSwitchIcon.png" />
<BundleResource Include="Resources\Phone\Item\DeleteIcon1.png" />
<BundleResource Include="Resources\Phone\Item\HouseSelected.png" />
+ <BundleResource Include="Resources\Phone\Item\videoIntercomNext.png" />
<BundleResource Include="Resources\Phone\Item\Floor.png" />
+ <BundleResource Include="Resources\Phone\Item\videoIntercom.png" />
<BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
@@ -614,6 +677,7 @@
<BundleResource Include="Resources\Phone\PM2.5Sensor\TemperaturePic.png" />
<BundleResource Include="Resources\Phone\PM2.5Sensor\HumidityPic.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\deviceselectedbackgroundcolor.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\sensor541.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\add.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor13.png" />
@@ -624,6 +688,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\function1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selecteddoorlock.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicbj2.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\lesLuminositys.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nosecurity.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\time.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsenor.png" />
@@ -636,6 +701,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\doorlock.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nodelay.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\addLuminosity.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
@@ -689,6 +755,7 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\timepoint.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor40.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\humidity.png" />
+ <BundleResource Include="Resources\Phone\ZigeeLogic\tipIcon.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\2.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedac.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\openMode.png" />
@@ -719,6 +786,7 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPir.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSphericalMotionSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" />
<BundleResource Include="Resources\Phone\Device\LightSelected.png" />
@@ -790,6 +858,7 @@
<BundleResource Include="Resources\Phone\Device\ThirdPartyDevice.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerZbGatewaySelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected.png" />
@@ -850,6 +919,7 @@
<BundleResource Include="Resources\Phone\Device\RepeaterZigbeeSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorCarbonMonoxide.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFourSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorSphericalMotionSelected.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
@@ -1038,6 +1108,7 @@
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\SensorSphericalMotion.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCeilingGas.png" />
@@ -1073,4 +1144,4 @@
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index 27dce87..c802e92 100755
--- a/ZigbeeApp/Home.Ios/Info.plist
+++ b/ZigbeeApp/Home.Ios/Info.plist
@@ -54,9 +54,9 @@
<key>aps-environment</key>
<string>development</string>
<key>CFBundleShortVersionString</key>
- <string>1.1.012006042</string>
+ <string>1.1.012007061</string>
<key>CFBundleVersion</key>
- <string>202006042</string>
+ <string>202007061</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -85,5 +85,7 @@
<string>location</string>
<string>remote-notification</string>
</array>
+ <key>NSMicrophoneUsageDescription</key>
+ <string>闇�瑕佷娇鐢ㄩ害鍏嬮锛岀敤浜庡彲瑙嗗璁�</string>
</dict>
</plist>
diff --git a/ZigbeeApp/Home.Ios/MainViewController.cs b/ZigbeeApp/Home.Ios/MainViewController.cs
index 8304520..902e55c 100644
--- a/ZigbeeApp/Home.Ios/MainViewController.cs
+++ b/ZigbeeApp/Home.Ios/MainViewController.cs
@@ -83,15 +83,15 @@
internetStatus = Reachability.InternetConnectionStatus();
if (internetStatus == NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
{
- Shared.Common.CommonPage.nowNetworkMode = 0;
+ //Shared.Common.CommonPage.nowNetworkMode = 0;
}
else if (internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
{
- Shared.Common.CommonPage.nowNetworkMode = 1;
+ //Shared.Common.CommonPage.nowNetworkMode = 1;
}
else if (internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
{ //wifi鐨勭綉缁滆繛鎺� 2
- Shared.Common.CommonPage.nowNetworkMode = 2;
+ //Shared.Common.CommonPage.nowNetworkMode = 2;
}
}
}
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 1b5344e..9984587 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -237,12 +237,12 @@
231=鎺ヨ繎鎰熷簲
232=鎺ヨ繎鎰熷簲鍔熻兘璁剧疆缃け璐�
233=鑾峰彇鎺ヨ繎鎰熷簲鍔熻兘澶辫触
-235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
+235=鎸変綇闈㈡澘妯″紡鎸夐敭5绉掞紝缁胯壊鎸囩ず鐏棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紱闂儊鍋滄{0}鎸囩ず鐏彉鐧借壊琛ㄧず閰嶇綉鎴愬姛
236=缁胯壊鎸囩ず鐏棯鐑�
237=鎸囩ず鐏�
238=闀挎寜5绉掞紙鎸夐敭锛�
239=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+241=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
242=鐢甸噺
243=甯稿紑妯″紡宸插紑鍚�
244=澶辨晥璁剧疆
@@ -263,10 +263,10 @@
259=澶辨晥鏃堕棿涓嶅悎娉曪紝璇烽噸鍐欒缃�
260=闊抽噺璁剧疆澶辫触
261=闊抽噺璁剧疆鎴愬姛
-262=褰撳墠鏃跺尯
+262=褰撳墠鏃跺尯
263=鍖�
264=涓�
-265=瑗�
+265=瑗�
266=褰撳墠璁惧涓嶅湪绾�
267=鑾峰彇闊抽噺澶辫触
268=纭畾鍙栨秷璇ユ垚鍛樼殑杩滅▼寮�閿佹潈闄�
@@ -322,7 +322,7 @@
319=杞诲害姹℃煋
320=涓害姹℃煋
321=閲嶅害姹℃煋
-322=涓ラ噸姹℃煋
+322=涓ラ噸姹℃煋
323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
324=鍏ョ綉
;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
@@ -606,7 +606,7 @@
5390=澶辨晥璁剧疆
5391=灏忔椂
5392=闂ㄩ攣濮嬬粓鎵撳紑
-5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
+5393=璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
5394=涓嶈兘灏忎簬1灏忔椂
5395=澶т簬12灏忔椂
5396=鎴�
@@ -622,6 +622,16 @@
5406=澶滅伅寮�鍏�
5407=鑹叉俯
5408=铚傞福鍣�
+5409=鐜鍏夌収搴�
+5410=鐓у害鍊�<
+5411=鏆梴\r\n} 0lux
+5412=浜畕\r\n} 100lux
+5413=鍦ㄥ鍐呮潯浠朵笅,榛戞殫鐓у害鍊肩害涓�0.02lux,榛勬槒鐓у害鍊納\r\n}绾︿负10lux,闃村ぉ鐓у害鍊肩害涓�5~50lux,璇锋牴鎹疄闄厈\r\n}闇�瑕佽繘琛岃皟鑺�
+5414=鍙瀵硅
+5415=鏍�
+5416=鍗曞厓
+5417=瀹ゅ鏈�
+
10000=HDL Home
@@ -1606,7 +1616,7 @@
15873=鎷嶇収
15874=浠庣浉鍐屼腑閫夋嫨
15875=鎶辨瓑锛岀▼搴忓嚭鐜伴敊璇�
-15876=璇疯緭鍏ユ墜鍔縜
+15876=璇疯緭鍏ユ墜鍔�
15877=璇峰啀娆¤緭鍏ユ墜鍔�
15878=鏇存敼鎵嬪娍锛岃杈撳叆鎵嬪娍
15879=纭鎵嬪娍閿欒锛岃閲嶆柊璁剧疆
@@ -1861,96 +1871,100 @@
16132=铚傞福鍣ㄥ紑鍏�
16133=灏忓鐏紑鍏�
16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+16135=鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+16136=闇�閲嶆柊缁戝畾
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
-18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
-18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
-18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
-18009=鎿嶄綔鏉冮檺涓嶈冻
-18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
-18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18012=瑙ｉ櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18013=楠岃瘉鐮佸彂閫佸け璐�
-18015=璐﹀彿宸茬粡瀛樺湪
-18016=楠岃瘉鐮侀敊璇�
-18017=楠岃瘉鐮佸凡澶辨晥
-18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
-18019=鎸囧畾璐﹀彿宸插瓨鍦�
-18022=楠岃瘉鐮佸彂閫佸け璐�
-18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
-18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
-18026=鍘熷瘑鐮侀敊璇�
-18034=璐﹀彿鏈敞鍐�
-18035=璇锋眰鍙傛暟閿欒
-18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
-18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
-18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
-18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
-18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
-18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
-18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
-18047=鍏变韩鏁版嵁涓嶅瓨鍦�
-18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
-18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
-18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
-18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
-
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
-;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
-21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
-;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
-21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
-21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;Zigbee鏅鸿兘绠＄姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
-21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
-;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
-21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
-;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
-;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
-21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
-;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
-21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
-21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
-21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-30000=绱ф�ユ寜閽�
-30001=鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
+18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
+18009=鎿嶄綔鏉冮檺涓嶈冻
+18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
+18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18012=瑙ｉ櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18013=楠岃瘉鐮佸彂閫佸け璐�
+18015=璐﹀彿宸茬粡瀛樺湪
+18016=楠岃瘉鐮侀敊璇�
+18017=楠岃瘉鐮佸凡澶辨晥
+18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
+18019=鎸囧畾璐﹀彿宸插瓨鍦�
+18022=楠岃瘉鐮佸彂閫佸け璐�
+18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
+18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+18026=鍘熷瘑鐮侀敊璇�
+18034=璐﹀彿鏈敞鍐�
+18035=璇锋眰鍙傛暟閿欒
+18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
+18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
+18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
+18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
+18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
+18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
+18047=鍏变韩鏁版嵁涓嶅瓨鍦�
+18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
+18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
+18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
+;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
+21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
+;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
+21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
+21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;Zigbee鏅鸿兘绠＄姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
+21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
+21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
+21015=闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
+;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
+21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
+21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
+21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐞冨瀷绉诲姩浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21024=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+30000=绱ф�ユ寜閽�
+30001=鐕冩皵浼犳劅鍣�
30002=鐑熼浘浼犳劅鍣�
30003=姘翠镜浼犳劅鍣�
30004=閽ュ寵鎵�
@@ -1994,6 +2008,7 @@
30042=绠�绾︾幆澧冮潰鏉�
30043=Mini缃戝叧
30044=鑹叉俯鐏�
+30045=ZigBee鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2063,6 +2078,7 @@
50042=绠�绾︾幆澧冮潰鏉�
50043=Mini缃戝叧
50044=鑹叉俯鐏�
+50045=鐞冨瀷绉诲姩浼犳劅鍣�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2107,4 +2123,5 @@
70025=鍚搁《鐕冩皵浼犳劅鍣�
70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
70027=绠�绾﹀鍔熻兘闈㈡澘
-70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
+70028=绠�绾︾幆澧冮潰鏉�
+70029=鐞冨瀷绉诲姩浼犳劅鍣�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotion.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotion.png
new file mode 100755
index 0000000..b62423c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected.png
new file mode 100755
index 0000000..65d2ef8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected2.png
new file mode 100755
index 0000000..57765bb
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/SensorSphericalMotionSelected2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorSphericalMotion.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorSphericalMotion.png
new file mode 100755
index 0000000..3fb3998
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/Battery.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/Battery.png
new file mode 100755
index 0000000..33d07e8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/Battery.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/BatterySelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/BatterySelected.png
new file mode 100755
index 0000000..d03b0af
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/BatterySelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercom.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercom.png
new file mode 100755
index 0000000..5adf153
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercom.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercomNext.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercomNext.png
new file mode 100755
index 0000000..df52c60
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/videoIntercomNext.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/SensorSphericalMotion.png b/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/SensorSphericalMotion.png
new file mode 100755
index 0000000..e2a9827
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/SensorSphericalMotion.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/addLuminosity.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/addLuminosity.png
new file mode 100755
index 0000000..2c013d1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/addLuminosity.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/lesLuminositys.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/lesLuminositys.png
new file mode 100755
index 0000000..ee4c220
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/lesLuminositys.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor541.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor541.png
new file mode 100755
index 0000000..d979f13
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/selectedsensor541.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor541.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor541.png
new file mode 100755
index 0000000..1ee843a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/sensor541.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/tipIcon.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/tipIcon.png
new file mode 100755
index 0000000..57307cd
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/tipIcon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
index 759f137..11af46f 100644
--- a/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
+++ b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
@@ -15,13 +15,13 @@
"suspend" : "hybrid"
},
"memory" : {
- "Resident Size" : "156639232",
- "Virtual Size" : "4818821120",
- "minor_gc_time" : "3344349",
- "major_gc_time" : "1878887",
- "minor_gc_count" : "4",
- "major_gc_count" : "8",
- "major_gc_time_concurrent" : "0"
+ "Resident Size" : "181604352",
+ "Virtual Size" : "4929044480",
+ "minor_gc_time" : "2036527",
+ "major_gc_time" : "156293362",
+ "minor_gc_count" : "13",
+ "major_gc_count" : "873",
+ "major_gc_time_concurrent" : "3505547"
},
"threads" : [
{
@@ -29,72 +29,72 @@
"offset_free_hash" : "0x0",
"offset_rich_hash" : "0x0",
"crashed" : false,
- "native_thread_id" : "0x70000685a000",
- "thread_info_addr" : "0x7fea5c83bc00",
+ "native_thread_id" : "0x700003271000",
+ "thread_info_addr" : "0x7f98c903a000",
"thread_name" : "Finalizer",
"ctx" : {
- "IP" : "0x7fff61571266",
- "SP" : "0x700006859da8",
- "BP" : "0x700006859e50"
+ "IP" : "0x7fff77af4266",
+ "SP" : "0x700003270da8",
+ "BP" : "0x700003270e50"
},
"unmanaged_frames" : [
{
"is_managed" : "false",
- "native_address" : "0x10ff50156",
+ "native_address" : "0x10c9d2156",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f6775",
+ "native_address" : "0x10cb78775",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f64a7",
+ "native_address" : "0x10cb784a7",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ffbaf3c",
+ "native_address" : "0x10ca3cf3c",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff61627b5d",
+ "native_address" : "0x7fff77baab5d",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fea5be0c040",
+ "native_address" : "0x30",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f7373",
+ "native_address" : "0x10cb79373",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff616302eb",
+ "native_address" : "0x7fff77bb32eb",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff61633249",
+ "native_address" : "0x7fff77bb6249",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff6162f40d",
+ "native_address" : "0x7fff77bb240d",
"native_offset" : "0x00000"
}
@@ -105,90 +105,90 @@
"offset_free_hash" : "0x0",
"offset_rich_hash" : "0x0",
"crashed" : false,
- "native_thread_id" : "0x11281b5c0",
- "thread_info_addr" : "0x7fea5c801800",
+ "native_thread_id" : "0x110e995c0",
+ "thread_info_addr" : "0x7f98c9006000",
"thread_name" : "tid_307",
"ctx" : {
- "IP" : "0x7fff6157486a",
- "SP" : "0x7ffedfd62c98",
- "BP" : "0x7ffedfd62d20"
+ "IP" : "0x7fff77af786a",
+ "SP" : "0x7ffee32e0c98",
+ "BP" : "0x7ffee32e0d20"
},
"unmanaged_frames" : [
{
"is_managed" : "false",
- "native_address" : "0x10ff50156",
+ "native_address" : "0x10c9d2156",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f6775",
+ "native_address" : "0x10cb78775",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f64a7",
+ "native_address" : "0x10cb784a7",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ffbaf3c",
+ "native_address" : "0x10ca3cf3c",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff61627b5d",
+ "native_address" : "0x7fff77baab5d",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ff525b6",
+ "native_address" : "0x10c9d45b6",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101a07c0",
+ "native_address" : "0x10cc227c0",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101bb2e1",
+ "native_address" : "0x10cc3d2e1",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f3774",
+ "native_address" : "0x10cb75774",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f358a",
+ "native_address" : "0x10cb7558a",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ff156c2",
+ "native_address" : "0x10c9976c2",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10fe9f848",
+ "native_address" : "0x10c921848",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff6143c3d5",
+ "native_address" : "0x7fff779bf3d5",
"native_offset" : "0x00000"
}
@@ -199,13 +199,13 @@
"offset_free_hash" : "0x115869ea88",
"offset_rich_hash" : "0x115869ee42",
"crashed" : true,
- "native_thread_id" : "0x700006fec000",
- "thread_info_addr" : "0x7fea5c45ac00",
+ "native_thread_id" : "0x700003980000",
+ "thread_info_addr" : "0x7f98c94d5600",
"thread_name" : "Thread Pool Worker",
"ctx" : {
- "IP" : "0x7fff615772c6",
- "SP" : "0x700006fea548",
- "BP" : "0x700006fea580"
+ "IP" : "0x7fff77afa2c6",
+ "SP" : "0x70000397e548",
+ "BP" : "0x70000397e580"
},
"managed_frames" : [
{
@@ -486,115 +486,115 @@
"unmanaged_frames" : [
{
"is_managed" : "false",
- "native_address" : "0x10ff50156",
+ "native_address" : "0x10c9d2156",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f6775",
+ "native_address" : "0x10cb78775",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f6dfa",
+ "native_address" : "0x10cb78dfa",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ffbbf46",
+ "native_address" : "0x10ca3df46",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ff54c65",
+ "native_address" : "0x10c9d6c65",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x10ffbb2db",
+ "native_address" : "0x10ca3d2db",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff61627b5d",
+ "native_address" : "0x7fff77baab5d",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x110221439",
+ "native_address" : "0x10cca3439",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff614e16a6",
+ "native_address" : "0x7fff77a646a6",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101c5cb7",
+ "native_address" : "0x10cc47cb7",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101a6b2f",
+ "native_address" : "0x10cc28b2f",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101c603e",
+ "native_address" : "0x10cc4803e",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101c61bf",
+ "native_address" : "0x10cc481bf",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x110060e76",
+ "native_address" : "0x10cae2e76",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x110061478",
+ "native_address" : "0x10cae3478",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101b419f",
+ "native_address" : "0x10cc3619f",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1101b44b0",
+ "native_address" : "0x10cc364b0",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100637ab",
+ "native_address" : "0x10cae57ab",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x110086675",
+ "native_address" : "0x10cb08675",
"native_offset" : "0x00000"
}
,
@@ -644,25 +644,25 @@
,
{
"is_managed" : "false",
- "native_address" : "0x10feb062d",
+ "native_address" : "0x10c93262d",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100cffa4",
+ "native_address" : "0x10cb51fa4",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100d43a6",
+ "native_address" : "0x10cb563a6",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x11006b6f4",
+ "native_address" : "0x10caed6f4",
"native_offset" : "0x00000"
}
,
@@ -723,49 +723,49 @@
,
{
"is_managed" : "false",
- "native_address" : "0x10feb062d",
+ "native_address" : "0x10c93262d",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100cffa4",
+ "native_address" : "0x10cb51fa4",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f9ec0",
+ "native_address" : "0x10cb7bec0",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x11002c28c",
+ "native_address" : "0x10caae28c",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x1100f7373",
+ "native_address" : "0x10cb79373",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff616302eb",
+ "native_address" : "0x7fff77bb32eb",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff61633249",
+ "native_address" : "0x7fff77bb6249",
"native_offset" : "0x00000"
}
,
{
"is_managed" : "false",
- "native_address" : "0x7fff6162f40d",
+ "native_address" : "0x7fff77bb240d",
"native_offset" : "0x00000"
}
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 4f40ce6..6acd388 100644
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -4,7 +4,7 @@
using System.Linq;
using System.Net;
using System.Text;
-using Shared.Phone.UserCenter.Abount;
+
namespace Shared.Common
{
public class CommonPage : UIDrawerLayout
@@ -28,20 +28,12 @@
public static Loading Loading = new Loading();
public void Show()
{
- //if (Application.IsPad)
- //{
- // Application.DesignWidth = 2048;
- // Application.DesignHeight = 1536;
- // Pad.MainPage.Instance .Show();
- // }
- //else
- //{
Application.DesignWidth = 1080;
Application.DesignHeight = 1920;
Application.MainPage.AddChidren(this);
AddChidren(Phone.UserView.HomePage.Instance);
Application.MainPage.AddChidren(Loading);
- //}
+
Phone.UserView.HomePage.Instance.InitPage();
}
@@ -50,7 +42,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.012071301";
+ public static string CodeIDString = "1.1.0120071301";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -87,17 +79,9 @@
/// </summary>
public static string PhoneZoneStr = "86";
/// <summary>
- /// 鎵嬫満鍖哄悕绉�
- /// </summary>
- public static string ZoneNameStr = "涓浗澶ч檰";
- /// <summary>
/// APP瀹藉害 -- 1080
/// </summary>
public static int AppRealWidth = 1080;
- /// <summary>
- /// 璇诲彇澶氬皯椤�--999
- /// </summary>
- public static int PageSize = 999;
/// <summary>
/// 鐢ㄤ簬涓浗澶ч檰楠岃瘉鎵嬫満鍙锋鍒欒〃杈惧紡
@@ -111,10 +95,6 @@
/// 鐢ㄤ簬楠岃瘉閭姝ｅ垯琛ㄨ揪寮�
/// </summary>
public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
- /// <summary>
- /// 褰撳墠缃戠粶杩炴帴鐨勬ā寮� 0:娌℃湁缃戠粶 1锛氳繙绋嬭繛鎺ワ紝涔熷彨3G,4G 2锛歐IFI
- /// </summary>
- public static int nowNetworkMode = 0;
/// <summary>
/// 瀹夊崜鐨勭郴缁熻繑鍥炴寜閿兘鍚︽寜涓�(姣斿鍦ㄥ浠借繕鍘熸椂,涓嶈兘鎸変笅杩斿洖閿�)
/// </summary>
@@ -126,10 +106,11 @@
/// </summary>
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
+ /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
+ public ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData, int timeout = 10)
{
- string result = await this.RequestHttpsZigbeeResultAsync(requestUrl, byteData);
+ string result = this.RequestHttpsZigbeeResultAsync(requestUrl, byteData, timeout);
if (result != null)
{
try
@@ -151,10 +132,11 @@
/// </summary>
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
+ /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<string> RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
+ public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData, int timeout = 10)
{
- var result = await RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
+ var result = RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData, "POST", timeout);
if (result != null)
{
return Encoding.UTF8.GetString(result);
@@ -169,12 +151,13 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
+ /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
+ public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10)
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var fullUrl = $"{RequestHttpsHost}/{requestUrl}";
- return await this.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
+ return this.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod, timeout);
}
/// <summary>
@@ -184,13 +167,14 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
+ /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST")
+ public byte[] RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10)
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var fullUrl = $"{Config.Instance.AdminRequestBaseUrl}/{requestUrl}";
- return await this.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.AdminRequestToken, requestMethod);
- }
+ return this.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.AdminRequestToken, requestMethod, timeout);
+ }
/// <summary>
/// 璇锋眰鏈嶅姟鍣ㄦ柟娉�
@@ -200,8 +184,9 @@
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="token">token</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
+ /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST")
+ public byte[] DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST", int timeout = 10)
{
try
{
@@ -211,7 +196,9 @@
//2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
webRequest.Method = requestMethod;
- webRequest.Timeout = 10 * 1000;
+ webRequest.Timeout = timeout * 1000;
+ //鍙栨秷浣跨敤浠ｇ悊璁块棶
+ webRequest.Proxy = null;
if (token != null)
{
//瀵瑰簲寰俊缃戝潃
@@ -253,11 +240,18 @@
return ms.ToArray();
}
}
- catch (Exception e)
+ catch (WebException e)
{
-#if DEBUG
- System.Console.WriteLine(e.Message);
-#endif
+ if (e.Status == WebExceptionStatus.ConnectFailure//鐢辨湁缃戠粶鍒囨崲鍒版棤缃戠粶鏃惰Е鍙�
+ || e.Status == WebExceptionStatus.Timeout//瓒呮椂
+ || e.Status == WebExceptionStatus.NameResolutionFailure)//鏈韩灏辨槸鏃犵綉缁滄椂鍚姩鏃惰Е鍙�
+ {
+ Phone.UserCenter.HdlWifiLogic.Current.CanAccessHttp = false;
+ }
+ return null;
+ }
+ catch (Exception e)
+ {
return null;
}
}
@@ -359,7 +353,7 @@
/// 鐧诲綍鎴愬姛鍚庝笂鎶ヨ澶噄d绛夌浉鍏充俊鎭粰鍚庣
/// </summary>
/// <returns>杩斿洖鐘舵�佺爜</returns>
- public async System.Threading.Tasks.Task<string> PushRegID()
+ public string PushRegID()
{
try
{
@@ -379,7 +373,7 @@
DeviceType = deviceType
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
- var reverObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (reverObj == null)
{
return null;
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index b35be85..ccb39ce 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -260,7 +260,7 @@
//娣诲姞缂撳瓨
this.AddDeviceToMemory(ref device);
- //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
+ //绉婚櫎瀛樺湪鐨勮澶囧唴瀛�
string maikey = this.GetDeviceMainKeys(device);
if (dicExist.ContainsKey(maikey) == true)
{
@@ -434,7 +434,7 @@
if (Common.Config.Instance.Home.IsVirtually == true)
{
//淇敼璁惧鍚嶅瓧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- Phone.UserView.UserPage.Instance.RefreshForm = true;
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
return true;
}
@@ -458,7 +458,7 @@
}
}
//淇敼璁惧鍚嶅瓧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- Phone.UserView.UserPage.Instance.RefreshForm = true;
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
return true;
}
@@ -551,7 +551,7 @@
//鑾峰彇缂栬緫璁惧Mac鍚嶅瓧鐨勫懡浠ゅ瓧绗�
var sendData = this.GetReDeviceMacNameCommandText(device.DeviceAddr, device.DeviceEpoint, macName);
- var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon");
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "MacRename", sendData, "MacRename_Respon", 8);
if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
return null;
@@ -578,7 +578,7 @@
}
//鑾峰彇缂栬緫璁惧绔偣鍚嶅瓧鐨勫懡浠ゅ瓧绗�
var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
- var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon");
+ var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "DeviceRename", sendData, "DeviceRenameRespon", 8);
if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
{
return null;
@@ -719,7 +719,7 @@
public void DeleteMemmoryDevice(CommonDevice device, bool deleteRoom = true)
{
//鍒犻櫎缂撳瓨璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- Phone.UserView.UserPage.Instance.RefreshForm = true;
+ Phone.UserView.UserPage.Instance.RefreshAllForm = true;
if (deleteRoom == true)
{
@@ -860,6 +860,11 @@
//浼犳劅鍣ㄩ櫎浜哖ir閮芥病鏈夊畾浣嶅姛鑳�
return true;
}
+ else if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_SphericalMotion)
+ {
+ //鐞冨瀷绉诲姩浼犳劅鍣ㄨ櫧鐒舵槸鐢垫睜璁惧,浣嗘槸瀹冩湁瀹氫綅鍔熻兘
+ return true;
+ }
return false;
}
@@ -887,6 +892,22 @@
{
return true;
}
+ return false;
+ }
+
+ /// <summary>
+ /// 妫�娴嬭澶囨槸鍚︽嫢鏈変竴閿悓姝ュ姛鑳�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public bool DeviceIsCanSynchronization(CommonDevice device)
+ {
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ return true;
+ }
return false;
}
@@ -1156,7 +1177,7 @@
public List<string> GetAllDeviceFile()
{
List<string> listDeviceFile = new List<string>();
- List<string> listAllFile = Global.FileListByHomeId();
+ List<string> listAllFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string file in listAllFile)
{
@@ -2207,6 +2228,12 @@
info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1301;
}
+ else if (iasZone.IasDeviceType == 541)
+ {
+ //鐞冨瀷绉诲姩浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_SphericalMotion;
+ info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId1205;
+ }
}
#endregion
@@ -2219,12 +2246,21 @@
private void InitRealDeviceRoomId()
{
this.dicDeviceRoomId = new Dictionary<string, string>();
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
+ string fullName = DirNameResourse.DeviceRoomIdFile;
+ var strData = HdlFileLogic.Current.ReadFileTextContent(fullName);
if (strData != null)
{
this.dicDeviceRoomId = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(strData);
}
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
+ /// </summary>
+ /// <returns></returns>
+ public Dictionary<string, string> GetAllRealDeviceRoomData()
+ {
+ return this.dicDeviceRoomId;
}
/// <summary>
@@ -2278,8 +2314,7 @@
if (save == true)
{
//淇濆瓨璁板綍
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
- UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
//娣诲姞鑷姩澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
@@ -2299,7 +2334,7 @@
return Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
}
var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[device.DeviceAddr]);
- return HdlRoomLogic.Current.GetFloorRoomName(room);
+ return HdlRoomLogic.Current.GetRoomName(room);
}
/// <summary>
@@ -2347,8 +2382,7 @@
return;
}
//淇濆瓨璁板綍
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
- UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceRoomIdFile, this.dicDeviceRoomId);
//娣诲姞鑷姩澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
@@ -2450,39 +2484,6 @@
#endregion
- #region 鈻� 鑾峰彇璁惧鍦ㄧ嚎鐘舵�佸垪琛╛______________
-
- /// <summary>
- /// 鑾峰彇璁惧鍦ㄧ嚎鐘舵�佸垪琛�(娉ㄦ剰,涓�涓澶囧彧杩斿洖涓�涓洖璺�)
- /// </summary>
- /// <param name="gwId">缃戝叧id</param>
- /// <returns></returns>
- public List<CommonDevice> GetDeviceOnlineList(string gwId)
- {
- var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
- int statu = 0;
- var listDevice = this.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
- if (statu == -1)
- {
- //褰撳嚭鐜板紓甯告椂,浣跨敤鍚庡鎿嶄綔,鐩存帴鑾峰彇鏈湴鐨勮澶囧垪琛�
- listDevice = this.GetDeviceByGatewayID(gwId);
- }
-
- var listCheck = new HashSet<string>();
- var listReturn = new List<CommonDevice>();
- foreach (var device in listDevice)
- {
- if (listCheck.Contains(device.DeviceAddr) == false)
- {
- listCheck.Add(device.DeviceAddr);
- listReturn.Add(device);
- }
- }
- return listReturn;
- }
-
- #endregion
-
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
@@ -2495,7 +2496,7 @@
var listDevice = this.GetDevicesByMac(i_device.DeviceAddr, false);
foreach (var device in listDevice)
{
- //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
+ //0:绂荤嚎 1:鍦ㄧ嚎 2:姝ｅ湪鍒锋柊鐘舵��
bool statu = i_device.IsOnline == 1 || i_device.IsOnline == 2;
if (statu == true)
{
@@ -2554,6 +2555,20 @@
{
return false;
}
+ }
+
+ //濡傛灉鏄柊椋庨潰鏉挎垨鐜闈㈡澘,鍒欓兘涓嶆樉绀轰换浣曞洖璺�
+ var myInfoTypeTemp = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { i_device });
+ if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir || myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ return false;
+ }
+ else if (myInfoTypeTemp.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (i_device.Type != DeviceType.OnOffOutput)
+ {
+ return false;
+ }
}
return true;
}
@@ -2913,6 +2928,8 @@
mainDevice.ModelIdentifier = device.DeviceInfo.ModelIdentifier;
//搴忓垪鍙�
mainDevice.SerialNumber = device.DeviceInfo.ProductCode;
+ //璁惧鍔熻兘绫诲瀷
+ mainDevice.DfunctionType = (DeviceFunctionType)device.DeviceInfo.FunctionType;
mainDevice.InClusterList.Clear();
mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
@@ -2939,6 +2956,11 @@
else if (mainDevice.Type == DeviceType.DimmableLight)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //璋冨厜鍣ㄥ浐瀹氱伅鍏�
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
if (mainDevice.IsCustomizeImage == false)
{
mainDevice.IconPath = "Device/Light.png";
@@ -2948,6 +2970,11 @@
else if (mainDevice.Type == DeviceType.ColorTemperatureLight)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //鑹叉俯鐏浐瀹氱伅鍏�
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
if (mainDevice.IsCustomizeImage == false)
{
mainDevice.IconPath = "Device/ColorLightTemperature.png";
@@ -2957,18 +2984,17 @@
else if (mainDevice.Type == DeviceType.OnOffOutput)
{
//2020.05.13鍙樻洿:缁х數鍣ㄩ兘榛樿涓虹伅鍏�
- //var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
- //if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
+ if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
- if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
+ mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
- mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- }
- if (mainDevice.IsCustomizeImage == false)
- {
- mainDevice.IconPath = "Device/Light.png";
+ //缁х數鍣ㄩ粯璁や负鐏厜
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
}
}
+ //鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ this.ResetIconPathByDeviceFunctionType(mainDevice);
}
//濡傛灉鏄┖姘斿紑鍏崇殑璇�
else if (mainDevice.Type == DeviceType.AirSwitch)
@@ -2977,20 +3003,52 @@
if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
mainDevice.DfunctionType = DeviceFunctionType.A寮�鍏�;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
+ {
+ //绌烘皵寮�鍏抽粯璁や负寮�鍏�
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A寮�鍏�);
+ }
}
- if (mainDevice.IsCustomizeImage == false)
- {
- mainDevice.IconPath = "Device/Switch.png";
- }
+ //鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ this.ResetIconPathByDeviceFunctionType(mainDevice);
}
//濡傛灉鏄僵鐏殑璇�
else if (mainDevice.Type == DeviceType.ColorDimmableLight)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
+ if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ {
+ //褰╃伅榛樿涓哄紑鍏�
+ this.SendDeviceFunctionTypeToGateway(mainDevice, DeviceFunctionType.A鐏厜);
+ }
if (mainDevice.IsCustomizeImage == false)
{
mainDevice.IconPath = "Device/ColorLight.png";
}
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍔熻兘绫诲瀷,閲嶆柊璁剧疆璁惧鍥炶矾鍥炬爣
+ /// </summary>
+ /// <param name="device"></param>
+ private void ResetIconPathByDeviceFunctionType(CommonDevice device)
+ {
+ if (device.IsCustomizeImage == true)
+ {
+ return;
+ }
+ if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ device.IconPath = "Device/Switch.png";
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ device.IconPath = "Device/Socket1.png";
+ }
+ else
+ {
+ device.IconPath = "Device/Light.png";
}
}
@@ -3111,6 +3169,7 @@
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir浼犳劅鍣�220
+ this.dicDeviceModelIdEnum["MSPIRB-ZB.10"] = "1205-1200-60000";//鐞冨瀷绉诲姩浼犳劅鍣�
//=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
//杩欓噷鏄害涔愬厠鐨�
@@ -3130,7 +3189,7 @@
this.dicDeviceModelIdEnum["MGCD01/M-ZB.10"] = "1306-1200-60000";//鍚搁《鐕冩皵浼犳劅鍣�
//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 銆愯璁惧灞炰簬绗笁鏂硅澶囷紝娌℃湁闀滃儚ID銆�
- this.dicDeviceModelIdEnum["MSPM25/M-ZB.10"] = "1307-1200-60000";//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+ this.dicDeviceModelIdEnum["MSPM25/M-ZB.10"] = "1307-1200-60000";//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
//=========鈽呪槄缁х數鍣ㄧ被(2300-2499)鈽呪槄=========
this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3璺户鐢靛櫒灏忔ā鍧�
@@ -3300,6 +3359,10 @@
/// pir浼犳劅鍣�220 闀滃儚id锛�1200
/// </summary>
Sensor_Pir = 1200,
+ /// <summary>
+ /// 鐞冨舰绉诲姩浼犳劅鍣� 闀滃儚id锛�1205
+ /// </summary>
+ Sensor_SphericalMotion = 1205,
//=========鈽呪槄瀹夐槻绫讳紶鎰熷櫒绫�(1300-2299)鈽呪槄=========
/// <summary>
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index d368109..e726972 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -60,19 +60,11 @@
/// </summary>
public string ResidenceAddressName = string.Empty;
/// <summary>
- /// 鎴块棿鍒楄〃(鎴块棿鐨処D)
- /// </summary>
- public List<string> ListRooms = new List<string>();
- /// <summary>
/// 妤煎眰瀛楀吀
/// key:FloorId
/// value:FloorName
/// </summary>
public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
- /// <summary>
- /// 褰撳墠妤煎眰Id
- /// </summary>
- public string CurrentFloorId = string.Empty;
#endregion
@@ -86,62 +78,15 @@
public string GetCurrentFloorName
{
get
- {
+ {
return HdlResidenceLogic.Current.GetFloorNameById(CurrentFloorId);
}
- }
-
- /// <summary>
- /// 璁剧疆褰撳墠妤煎眰鐨処D
+ }
+ /// <summary>
+ /// 褰撳墠妤煎眰ID
/// </summary>
- public void SetCurrentFloorId()
- {
- if (Config.Instance.Home.FloorDics.Count > 0 && string.IsNullOrEmpty(CurrentFloorId))
- {
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- CurrentFloorId = floor.Key;
- Save(false);
- return;
- }
- }
- }
-
- #endregion
-
- #region 鈼� 娣诲姞鎴块棿璺緞_________________________
-
- /// <summary>
- /// 娣诲姞鎴块棿ID
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public void AddRoomId(string roomId)
- {
- if (ListRooms.Contains(roomId) == false)
- {
- ListRooms.Add(roomId);
- this.Save();
- }
- }
-
- #endregion
-
- #region 鈼� 鍒犻櫎鎴块棿璺緞_________________________
-
- /// <summary>
- /// 绉婚櫎鎴块棿Id
- /// </summary>
- /// <returns><c>true</c>, if room list file path was added, <c>false</c> otherwise.</returns>
- /// <param name="roomFilePath">Room file path.</param>
- public void RemoveRoomId(string roomId)
- {
- if (ListRooms.Contains(roomId)==true)
- {
- ListRooms.Remove(roomId);
- Save();
- }
- }
+ [Newtonsoft.Json.JsonIgnore]
+ public string CurrentFloorId = string.Empty;
#endregion
@@ -160,7 +105,8 @@
System.IO.Directory.CreateDirectory(path);
}
path = System.IO.Path.Combine(path, FileName);
- Shared.IO.FileUtils.WriteFileByBytes(path, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ HdlFileLogic.Current.SaveFileContent(path, this);
+
if (autoBackup == true && Id == Config.Instance.HomeId)
{
HdlAutoBackupLogic.AddOrEditorFile(FileName);
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.ESVideoPhoneSDK.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.ESVideoPhoneSDK.dll
new file mode 100755
index 0000000..270a453
--- /dev/null
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.ESVideoPhoneSDK.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index a51a0e1..9655afe 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -823,7 +823,7 @@
this.editorScene.Save();
//鏂板缓鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
HdlThreadLogic.Current.RunMain(() =>
{
@@ -902,7 +902,7 @@
this.editorScene.Save();
//缂栬緫鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
HdlThreadLogic.Current.RunMain(() =>
{
diff --git a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
index 9e3167a..540e15e 100755
--- a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
@@ -42,6 +42,10 @@
/// 璁惧鍒楄〃鎺т欢
/// </summary>
private VerticalListControl listDeviceView = null;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+ /// </summary>
+ private string nowSelectFloorId = string.Empty;
#endregion
@@ -57,6 +61,8 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.AddFunction));
+ //鍒濆鍖栧彸涓婅鐨勬帶浠�
+ this.InitTopRightMenuControl();
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
}
@@ -66,8 +72,58 @@
/// </summary>
private void InitMiddleFrame()
{
+ //娓呯┖body
+ this.ClearBodyFrame();
//鍒濆鍖栨埧闂磋彍鍗曟帶浠�
this.InitRoomMenuControl();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栧彸涓婅鐨勬帶浠�
+ /// </summary>
+ private void InitTopRightMenuControl()
+ {
+ //鑾峰彇妤煎眰
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ if (dicFloor.Count == 0)
+ {
+ return;
+ }
+ var btnIconContr = new MostRightIconControl(69, 69);
+ btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
+ topFrameLayout.AddChidren(btnIconContr);
+ btnIconContr.InitControl();
+
+ var btnFloor = new NormalViewControl(300, 69, true);
+ btnFloor.Gravity = Gravity.CenterVertical;
+ btnFloor.X = btnIconContr.X + btnIconContr.btnIcon.X - Application.GetRealWidth(300);
+ btnFloor.TextAlignment = TextAlignment.CenterRight;
+ topFrameLayout.AddChidren(btnFloor);
+
+ foreach (var floorId in dicFloor.Keys)
+ {
+ //绗竴涓ゼ灞�
+ this.nowSelectFloorId = floorId;
+ btnFloor.Text = dicFloor[floorId];
+ break;
+ }
+
+ btnIconContr.ButtonClickEvent += (sender, e) =>
+ {
+ //妤煎眰鑿滃崟
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ foreach (var floorId in dicFloor.Keys)
+ {
+ contr.AddRowMenu(floorId, () =>
+ {
+ //璁板綍璧烽�夋嫨鐨処D
+ this.nowSelectFloorId = floorId;
+ btnFloor.Text = dicFloor[this.nowSelectFloorId];
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ });
+ }
+ };
}
#endregion
@@ -98,7 +154,10 @@
roomSwitchContr.SelectRoomEvent += (selectRoom) =>
{
//鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
- this.deviceFunctionMenuContr?.RemoveAll();
+ if (this.deviceFunctionMenuContr != null && this.deviceFunctionMenuContr.Parent != null)
+ {
+ this.deviceFunctionMenuContr.RemoveAll();
+ }
this.listDeviceView?.RemoveAll();
HdlThreadLogic.Current.RunMainInThread(() =>
@@ -116,7 +175,10 @@
this.btnFinishControl = new BottomClickButton();
btnFinishControl.TextID = R.MyInternationalizationString.uFinish;
bodyFrameLayout.AddChidren(btnFinishControl);
- btnFinishControl.Visible = false;
+ if (this.dicNewListTask == null || this.dicNewListTask.Count == 0)
+ {
+ btnFinishControl.Visible = false;
+ }
btnFinishControl.ButtonClickEvent += (sender, e) =>
{
//鍥炶皟鍑芥暟
@@ -136,20 +198,24 @@
/// <returns></returns>
private List<Room> GetCanShowRoomList()
{
- //鍏堝皢鍒楄〃Dictionary鍖�
- this.dicNewListTask = new Dictionary<string, List<Safeguard.TaskListInfo>>();
- this.dicOldListTask = new Dictionary<string, List<Safeguard.TaskListInfo>>();
- foreach (var data in this.listAdjustTarget)
+ if (this.dicNewListTask == null)
{
- if (data.Type == 0)
+ //鍏堝皢鍒楄〃Dictionary鍖�
+ this.dicNewListTask = new Dictionary<string, List<Safeguard.TaskListInfo>>();
+ this.dicOldListTask = new Dictionary<string, List<Safeguard.TaskListInfo>>();
+ foreach (var data in this.listAdjustTarget)
{
- //鍙璁惧
- string mainkey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
- dicOldListTask[mainkey] = data.TaskList;
+ if (data.Type == 0)
+ {
+ //鍙璁惧
+ string mainkey = LocalDevice.Current.GetDeviceMainKeys(data.DeviceAddr, data.Epoint);
+ dicOldListTask[mainkey] = data.TaskList;
+ }
}
}
+
//褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
- var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ var lisrRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(this.nowSelectFloorId);
var listShowRoom = new List<Room>();
foreach (var room in lisrRoom)
{
@@ -181,7 +247,7 @@
var dicGroupDevice = this.GetAllGroupDevice(room);
//鍙垵濮嬪寲涓�娆�
- if (this.deviceFunctionMenuContr == null)
+ if (this.deviceFunctionMenuContr == null || this.deviceFunctionMenuContr.Parent == null)
{
//璁惧鑿滃崟鐨勭櫧鑹茶儗鏅�
var functionBack1 = new FrameLayout();
@@ -256,7 +322,7 @@
HdlThreadLogic.Current.RunMainInThread(() =>
{
//鍒濆鍖栬澶囧垪琛ㄦ帶浠�
- this.InitListDeviceControls(listDeviceView, rowInfo, room);
+ this.InitListDeviceControls(listDeviceView, rowInfo);
});
}
};
@@ -273,7 +339,7 @@
if (nowSelectDeviceInfo != null)
{
//鍒濆鍖栭粯璁ょ殑璁惧鍒楄〃鎺т欢
- this.InitListDeviceControls(listDeviceView, nowSelectDeviceInfo, room);
+ this.InitListDeviceControls(listDeviceView, nowSelectDeviceInfo);
}
}
@@ -286,7 +352,7 @@
/// </summary>
/// <param name="listView"></param>
/// <param name="rowInfo"></param>
- private void InitListDeviceControls(VerticalListControl listView, DeviceRowInfo rowInfo, Room i_room)
+ private void InitListDeviceControls(VerticalListControl listView, DeviceRowInfo rowInfo)
{
//鍏堟竻绌�
listView.RemoveAll();
diff --git a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddSceneForm.cs
index 3aef76a..211ea4e 100755
--- a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddSceneForm.cs
@@ -38,6 +38,10 @@
/// 鍦烘櫙鍒楄〃鎺т欢
/// </summary>
private VerticalListControl listSceneView = null;
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勬ゼ灞�
+ /// </summary>
+ private string nowSelectFloorId = string.Empty;
#endregion
@@ -53,6 +57,9 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.AddScence));
+
+ //鍒濆鍖栧彸涓婅鐨勬帶浠�
+ this.InitTopRightMenuControl();
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
}
@@ -62,6 +69,9 @@
/// </summary>
private void InitMiddleFrame()
{
+ //娓呯┖body
+ this.ClearBodyFrame();
+
//鑾峰彇鑳藉鏄剧ず鐨勬埧闂村垪琛�
var listRoom = this.GetCanShowRoomList();
if (listRoom.Count == 0)
@@ -96,7 +106,10 @@
this.btnFinishControl = new BottomClickButton();
btnFinishControl.TextID = R.MyInternationalizationString.uFinish;
bodyFrameLayout.AddChidren(btnFinishControl);
- btnFinishControl.Visible = false;
+ if (this.listNewScene == null || this.listNewScene.Count == 0)
+ {
+ btnFinishControl.Visible = false;
+ }
btnFinishControl.ButtonClickEvent += (sender, e) =>
{
//鍥炶皟鍑芥暟
@@ -106,6 +119,54 @@
//鎵ц鍒濆鍖�(浼氳嚜鍔ㄨЕ鍙慡electRoomEvent浜嬩欢)
roomSwitchContr.InitControl();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栧彸涓婅鐨勬帶浠�
+ /// </summary>
+ private void InitTopRightMenuControl()
+ {
+ //鑾峰彇妤煎眰
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ if (dicFloor.Count == 0)
+ {
+ return;
+ }
+ var btnIconContr = new MostRightIconControl(69, 69);
+ btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
+ topFrameLayout.AddChidren(btnIconContr);
+ btnIconContr.InitControl();
+
+ var btnFloor = new NormalViewControl(300, 69, true);
+ btnFloor.Gravity = Gravity.CenterVertical;
+ btnFloor.X = btnIconContr.X + btnIconContr.btnIcon.X - Application.GetRealWidth(300);
+ btnFloor.TextAlignment = TextAlignment.CenterRight;
+ topFrameLayout.AddChidren(btnFloor);
+
+ foreach (var floorId in dicFloor.Keys)
+ {
+ //绗竴涓ゼ灞�
+ this.nowSelectFloorId = floorId;
+ btnFloor.Text = dicFloor[floorId];
+ break;
+ }
+
+ btnIconContr.ButtonClickEvent += (sender, e) =>
+ {
+ //妤煎眰鑿滃崟
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ foreach (var floorId in dicFloor.Keys)
+ {
+ contr.AddRowMenu(floorId, () =>
+ {
+ //璁板綍璧烽�夋嫨鐨処D
+ this.nowSelectFloorId = floorId;
+ btnFloor.Text = dicFloor[this.nowSelectFloorId];
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ });
+ }
+ };
}
#endregion
@@ -209,19 +270,23 @@
/// <returns></returns>
private List<Room> GetCanShowRoomList()
{
- //鍏堝垪琛ㄥ寲
- this.listOldSceneId = new List<int>();
- this.listNewScene = new List<int>();
- foreach (var data in this.listAdjustTarget)
+ if (this.listNewScene == null)
{
- if (data.Type == 1)
+ //鍏堝垪琛ㄥ寲
+ this.listOldSceneId = new List<int>();
+ this.listNewScene = new List<int>();
+ foreach (var data in this.listAdjustTarget)
{
- //鍙鍦烘櫙
- listOldSceneId.Add(data.ElseScenesId);
+ if (data.Type == 1)
+ {
+ //鍙鍦烘櫙
+ listOldSceneId.Add(data.ElseScenesId);
+ }
}
}
+
//褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
- var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ var lisrRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(this.nowSelectFloorId);
var listShowRoom = new List<Room>();
foreach (var room in lisrRoom)
{
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index bf17018..7451d5d 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -152,18 +152,21 @@
btnFloorName.Y = Application.GetRealHeight(17);
btnFloorName.TextAlignment = TextAlignment.CenterRight;
btnFloorName.IsBold = true;
- btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
+ btnFloorName.Text = Common.Config.Instance.Home.GetCurrentFloorName;
frameSwitchBack.AddChidren(btnFloorName);
btnFloorName.ButtonClickEvent += (sender, e) =>
{
var floors = new SelectFloorForm();
+ floors.CurFloorId = Config.Instance.Home.CurrentFloorId;
AddChidren(floors);
floors.Init(580, 330, Direction.Right);
- floors.changeFloor = true;
floors.FloorAction += (floorId) =>
{
btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
+ Config.Instance.Home.CurrentFloorId = floorId;
HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
+ //杩欎釜鏃跺�欓渶瑕佸埛鏂颁富椤�
+ UserPage.Instance.RefreshMainPageForm = true;
//鍒锋柊bodyView
this.RefreshBodyView();
};
@@ -188,6 +191,7 @@
//鍦烘櫙,鍔熻兘,鑷姩鍖栫殑鍒囨崲鎺т欢
var switchContr = new SceneFunctionSwitchControl();
+ switchContr.Y = Application.GetRealHeight(40);
switchContr.Width = Application.GetRealWidth(650);
switchContr.Gravity = Gravity.CenterVertical;
frameSwitchBack.AddChidren(switchContr);
@@ -276,7 +280,7 @@
private void InitRoomMenuControl()
{
//褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
- var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ var lisrRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
if (HdlRoomLogic.Current.NowCategoryRoom == null)
{
//璁剧疆绗竴涓负鍒濆鎴块棿
@@ -632,10 +636,14 @@
HdlThreadLogic.Current.RunMain(() =>
{
listview1.EndHeaderRefreshing();
- if (result == true)
+ //listview1.Parent涓簄ull浠ｈ〃瀹冨垏鎹㈡埧闂翠簡
+ if (result == true && listview1.Parent != null)
{
+ //鍒锋柊鍦烘櫙鐨勬椂鍊�,鍏抽棴宸﹀垝鑿滃崟鐨勬湭鍒嗛厤鐣岄潰
+ MainPage.LeftListRoomViewFrom.Instance?.CloseUnallocatedRoomForm();
//鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
this.functionSceneBodyView.RemoveAll();
+
HdlThreadLogic.Current.RunMainInThread(() =>
{
//鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
@@ -816,7 +824,11 @@
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚
this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();
//鍒锋柊鎺т欢
- this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
+ if (locadevice.Type != DeviceType.IASZone)
+ {
+ //浼犳劅鍣ㄤ笉闇�瑕佸睘鎬т笂鎶�(浣嗘槸閭ｄ釜鐞冨瀷浼犳劅鍣ㄥ眳鐒朵細灞炴�т笂鎶�)
+ this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
+ }
}
}, ShowErrorMode.NO);
});
@@ -857,10 +869,8 @@
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
{
- //鏈湴璁惧瀵硅薄
- var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- //鍒锋柊鍗＄墖淇℃伅
- this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);
+ //寮�鍚闂儊鐗规晥
+ this.dicDeviceRowControl[mainKeys].StartRowLightAppeal();
}
}, ShowErrorMode.NO);
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 8a72cc1..38c1f5b 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -263,31 +263,13 @@
{
this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
}
-
- if (this.btnDeviceName.IsSelected == isOpen)
- {
- //鐘舵�佷竴鏍�,鍒欎笉闇�瑕佸鐞�
- return;
- }
- //璁惧鍚嶇О鎺т欢
- this.btnDeviceName.IsSelected = isOpen;
- this.btnDeviceName.IsBold = isOpen;
- //璁惧鐨勮儗鏅渾鍦堝浘
- if (isOpen == true)
- {
- this.frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCSelectedBackgroundColor;
- }
- else
- {
- this.frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
- }
- //璁惧鍥炬爣鎺т欢
- this.btnDeviceIcon.IsSelected = isOpen;
//寮�鍏虫帶浠�
- if (this.btnSwitch != null)
+ if (this.btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
{
this.btnSwitch.IsSelected = isOpen;
}
+ //鍒囨崲鍗＄墖鐘舵�佺壒鏁�
+ this.SwitchRowStatuAppeal(isOpen);
}
/// <summary>
@@ -464,6 +446,80 @@
#endregion
+ #region 鈻� 琛岄棯鐑佺壒鏁坃________________________
+
+ /// <summary>
+ /// 鏄惁澶勪簬鐗规晥涓�
+ /// </summary>
+ private bool isAppeal = false;
+ /// <summary>
+ /// 寮�鍚闂儊鐗规晥
+ /// </summary>
+ public void StartRowLightAppeal()
+ {
+ //璁惧鐘舵�佸繀椤诲埛鏂�
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+
+ if (this.isAppeal == true) { return; }
+ this.isAppeal = true;
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //闂儊5绉�,闂撮殧400姣
+ int count = 5000 / 400;
+ bool isOpen = false;
+ while (this.Parent != null && count >= 0)
+ {
+ //闂儊鐗规晥
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ isOpen = !isOpen;
+ this.SwitchRowStatuAppeal(isOpen);
+ });
+ System.Threading.Thread.Sleep(400);
+ count--;
+ }
+ if (this.Parent != null && isOpen == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //缁撴潫鏃�,榛樿涓烘墦寮�鐗规晥
+ this.SwitchRowStatuAppeal(true);
+ }, ShowErrorMode.NO);
+ }
+ this.isAppeal = false;
+
+ }, ShowErrorMode.NO);
+ }
+
+ /// <summary>
+ /// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
+ /// </summary>
+ private void SwitchRowStatuAppeal(bool isOpen)
+ {
+ if (this.btnDeviceName.IsSelected == isOpen)
+ {
+ //鐘舵�佷竴鏍�,鍒欎笉闇�瑕佸鐞�
+ return;
+ }
+ //璁惧鍚嶇О鎺т欢
+ this.btnDeviceName.IsSelected = isOpen;
+ this.btnDeviceName.IsBold = isOpen;
+ //璁惧鐨勮儗鏅渾鍦堝浘
+ if (isOpen == true)
+ {
+ this.frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCSelectedBackgroundColor;
+ }
+ else
+ {
+ this.frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
+ }
+ //璁惧鍥炬爣鎺т欢
+ this.btnDeviceIcon.IsSelected = isOpen;
+ }
+
+ #endregion
+
#region 鈻� 鎺т欢鎽ф瘉___________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
index 29e69c7..f72f1cb 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
@@ -9,10 +9,6 @@
public Action<string> FloorAction;
/// <summary>
- /// 鏄惁鍒囨崲涓哄綋鍓嶆ゼ灞�
- /// </summary>
- public bool changeFloor = true;
- /// <summary>
/// 褰撳墠浼犺繃鏉ョ殑floorid
/// </summary>
public string CurFloorId = string.Empty;
@@ -80,7 +76,8 @@
};
backgroundFL.AddChidren(floorLayout);
- var floorCount = Config.Instance.Home.FloorDics.Count;
+ var dicFloor = UserCenter.HdlRoomLogic.Current.GetFloorSortList();
+ int floorCount = dicFloor.Count;
if (floorCount > 0)
{
@@ -109,9 +106,9 @@
floorLayout.Height = this.GetPictrueRealSize(150 * floorCount);
}
- foreach (var floor in Config.Instance.Home.FloorDics)
+ foreach (var floor in dicFloor.Keys)
{
- AddFloor(floorLayout, floor);
+ AddFloor(floorLayout, floor, dicFloor[floor]);
}
}
}
@@ -120,50 +117,20 @@
/// AddFloor
/// </summary>
/// <param name="verticalScrolView"></param>
- private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
+ private void AddFloor(VerticalScrolViewLayout verticalScrolView, string floorId, string floorName)
{
var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
frow.Width = this.GetPictrueRealSize(449);
frow.Height = this.GetPictrueRealSize(150);
- frow.Tag = floor.Key;
- frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value);
- verticalScrolView.AddChidren(frow);
+ frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floorName);
+ verticalScrolView.AddChidren(frow);
+ frow.IsSelected = floorId == this.CurFloorId;
- if (string.IsNullOrEmpty(CurFloorId))
+ frow.ButtonClickEvent += (sender, e) =>
{
- if (Config.Instance.Home.CurrentFloorId == floor.Key)
- {
- frow.IsSelected = true;
- }
- }
- else
- {
- if (CurFloorId == floor.Key)
- {
- frow.IsSelected = true;
- }
- }
-
- frow.ButtonClickEvent += SelectFloor_MouseUpEvent;
- }
-
- /// <summary>
- /// SelectFloor_MouseUpEvent
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="mouseEventArgs"></param>
- private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
- {
- (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
- if (changeFloor)
- {
- Config.Instance.Home.CurrentFloorId = (sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString();
- Config.Instance.Home.Save(false);
- UserCenter.HdlRoomLogic.Current.RefreshRoomListView();
- }
- RemoveView();
- FloorAction?.Invoke((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
-
+ RemoveView();
+ FloorAction?.Invoke(floorId);
+ };
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
index 7c70c74..5d2d1bc 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
@@ -117,20 +117,11 @@
frow.IsSelected = true;
}
- frow.ButtonClickEvent += SelectFloor_MouseUpEvent;
- }
-
- /// <summary>
- /// SelectFloor_MouseUpEvent
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="mouseEventArgs"></param>
- private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
- {
- (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
- var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
- RemoveView();
- HouseAction?.Invoke(home.Id);
+ frow.ButtonClickEvent += (sender, e) =>
+ {
+ RemoveView();
+ HouseAction?.Invoke(house.Id);
+ };
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
index c24d305..346da1c 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
@@ -306,7 +306,7 @@
/// 妫�娴嬬晫闈㈢殑閿欒
/// </summary>
/// <returns></returns>
- public bool CheckForm()
+ public virtual bool CheckForm()
{
//妫�娴嬫帶浠�
return this.CheckControl(this);
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index ff1b7c6..b384af6 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -292,6 +292,9 @@
frame.AddChidren(btnReLoad);
btnReLoad.ButtonClickEvent += (sender, e) =>
{
+ //鐐瑰嚮閲嶆柊鍔犺浇鏃�,鍏佽鍐嶆鑱旂綉
+ HdlWifiLogic.Current.CanAccessHttp = true;
+
//娓呴櫎鍏ㄩ儴鎺т欢
this.ClearBodyFrame();
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
index 2addb77..8dc456c 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/CommonFormResouce.cs
@@ -76,11 +76,11 @@
/// </summary>
/// <param name="loginSendVerCodeObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
+ public static Shared.Common.ResponseEntity.ResponsePack LoginSendVerCode(SendDataToServer.LoginSendVerCodeObj loginSendVerCodeObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginSendVerCodeObj)));
return requestRevertObj;
}
catch
@@ -94,11 +94,11 @@
/// </summary>
/// <param name="loginValidCodeOBJ"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
+ public static Shared.Common.ResponseEntity.ResponsePack LoginByCode(SendDataToServer.LoginValidCodeOBJ loginValidCodeOBJ)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/LoginValidCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(loginValidCodeOBJ)));
return requestRevertObj;
}
catch
@@ -112,11 +112,11 @@
/// </summary>
/// <param name="registerAccountObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
+ public static Shared.Common.ResponseEntity.ResponsePack RegisterSendVerCode(SendDataToServer.RegisterSendVerCodeObj registerAccountObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/RegisterSendVerCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
return requestRevertObj;
}
catch
@@ -130,11 +130,11 @@
/// </summary>
/// <param name="registerAccountObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> Register(SendDataToServer.RegisterAccountObj registerAccountObj)
+ public static Shared.Common.ResponseEntity.ResponsePack Register(SendDataToServer.RegisterAccountObj registerAccountObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidataCodeAndRegisterAccount", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(registerAccountObj)));
return requestRevertObj;
}
catch
@@ -148,11 +148,11 @@
/// </summary>
/// <param name="resetPasswordObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
+ public static Shared.Common.ResponseEntity.ResponsePack ResetPassword(SendDataToServer.ResetPasswordObj resetPasswordObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ResetPassword", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(resetPasswordObj)));
return requestRevertObj;
}
catch
@@ -166,11 +166,11 @@
/// </summary>
/// <param name="validatorCodeObj"></param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
+ public static Shared.Common.ResponseEntity.ResponsePack ValidatorCode(SendDataToServer.ValidatorCodeObj validatorCodeObj)
{
try
{
- var requestRevertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
+ var requestRevertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/ValidatorCode", System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(validatorCodeObj)));
return requestRevertObj;
}
catch
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
index 045ed5d..6c053c7 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneCategoryView.cs
@@ -70,7 +70,9 @@
//鍦烘櫙鐐瑰嚮
sceneContr.ButtonClickEvent += (sender, e) =>
{
- this.SceneUpHandler();
+ //涓嶈兘鍙嶅鐐瑰嚮
+ sceneContr.CanClick = false;
+ this.SceneUpHandler(sceneContr);
};
//鏀惰棌
@@ -243,8 +245,13 @@
{
//闅愯棌鍙冲垝鑿滃崟
this.HideMenu();
- scene.SceneDelayTime = t;
- btnDelayTime.Text = CommonFormResouce.GetTimeString(t);
+ if (t != 0)
+ {
+ scene.SceneDelayTime = t;
+ btnDelayTime.Text = CommonFormResouce.GetTimeString(t);
+ //缂栬緫寤舵椂鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+ }
};
};
}
@@ -254,9 +261,8 @@
/// <summary>
///
/// </summary>
- /// <param name="btnScenePic"></param>
- /// <param name="btnSceneName"></param>
- private async void SceneUpHandler()
+ /// <param name="sceneContr"></param>
+ private async void SceneUpHandler(ScenePictrueControl sceneContr)
{
if (scene.SceneDelayTime <= 0 && scene.RemainTime <= 0)
{
@@ -267,6 +273,7 @@
var result = await HdlSceneLogic.Current.ControlScene(scene);
if (result == false)
{
+ sceneContr.CanClick = true;
return;
}
@@ -274,8 +281,12 @@
scene.SceneDelayTime = 0;
if (scene.RemainTime <= 0)
{
+ sceneContr.CanClick = true;
return;
}
+ //璋冪敤鏈夊欢鏃剁殑鍦烘櫙,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
int myRemainTime = scene.RemainTime;
//寮�鍚唴閮ㄥ欢鏃舵椂闂寸嚎绋�(鏃ㄥ湪鍏ㄩ儴鍦版柟鐨勫悓涓�鍦烘櫙鏃堕棿鍚屾)
HdlSceneLogic.Current.StartDelayTimeThread(scene);
@@ -298,6 +309,7 @@
SetTimeImage();
//鐩存帴寮�鍚疞oading鐗规晥
this.StartLoadingApreal();
+ sceneContr.CanClick = true;
}
});
})
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
deleted file mode 100755
index f83aec4..0000000
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using Shared.Common;
-
-namespace Shared.Phone.Device.CommonForm
-{
- public class SelectZone
- {
- public Action<Common.Room> ZoneAction;
- /// <summary>
- /// curRoom
- /// </summary>
- private Common.Room curRoom;
- /// <summary>
- /// 鏍囬
- /// </summary>
- public string title = Language.StringByID(R.MyInternationalizationString.BelongZone);
- /// <summary>
- /// Init
- /// </summary>
- public void Init()
- {
- List<string> floorIds = new List<string> { };
- List<string> floorNames = new List<string> { };
- List<List<string>> roomNames = new List<List<string>> { };
- List<List<Common.Room>> rooms = new List<List<Common.Room>> { };
- List<Common.Room> rs = new List<Common.Room> { };
- List<string> rNames = new List<string> { };
- if (Config.Instance.Home.FloorDics.Count > 0)
- {
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- if (UserCenter.HdlRoomLogic.Current.GetRoomsByFloorId(floor.Key).Count > 0)
- {
- floorIds.Add(floor.Key);
- floorNames.Add(floor.Value);
-
- roomNames.Add(UserCenter.HdlRoomLogic.Current.GetRoomNamesByFloorId(floor.Key));
- rooms.Add(UserCenter.HdlRoomLogic.Current.GetRoomsByFloorId(floor.Key));
- }
- }
- PickerView.ShowSecondary(floorNames, roomNames, (index1, index2) =>
- {
- curRoom = rooms[index1][index2];
- ZoneAction?.Invoke(curRoom);
- }, 0, 0, title,
- Language.StringByID(R.MyInternationalizationString.Confrim),
- Language.StringByID(R.MyInternationalizationString.Cancel));
- }
- else
- {
- var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
- for (int i = 0; i < listAllRoom.Count; i++)
- {
- var r = listAllRoom[i];
- if (r.IsLove)
- {
- continue;
- }
- rs.Add(r);
- rNames.Add(r.Name);
- }
- PickerView.Show(rNames, (index1) =>
- {
- curRoom = rs[index1];
- ZoneAction?.Invoke(curRoom);
- }, 0, title,
- Language.StringByID(R.MyInternationalizationString.Confrim),
- Language.StringByID(R.MyInternationalizationString.Cancel));
- }
- }
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 6f80b9b..713626c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -12,7 +12,7 @@
/// 閫変腑璇ヨ澶囧姛鑳戒綔涓烘潯浠舵垨鑰呯洰鏍囩殑瑙嗗浘鏂规硶
/// </summary>
/// <param name="common">Common.</param>
- public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str)
+ public static void CurrentDeviceView(FrameLayout flMain, CommonDevice common, bool edit, string str,int intValue)
{
#region -------鐣岄潰甯冨眬閮ㄥ垎
//涓嶈褰撳墠鐣岄潰婊戝姩
@@ -59,10 +59,10 @@
};
var horizontalSeekBarVol = new DiyImageSeekBar
{
- //Y = openView.frameLayout.Bottom,
- X = Application.GetRealWidth(80),
- Width = Application.GetRealWidth(915),
- Height = Application.GetRealHeight(160),//婊戝姩鏉＄埗鎺т欢楂樺害
+ //Y = openView.frameLayout.Bottom,//杩涘害鏉＄埗鎺т欢Y鍧愭爣
+ X = Application.GetRealWidth(80),//杩涘害鏉鍧愭爣
+ Width = Application.GetRealWidth(915),//杩涘害鏉＄殑闀垮害
+ Height = Application.GetRealHeight(160),//杩涘害鏉＄埗鎺т欢楂樺害
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
@@ -99,33 +99,49 @@
{
if (_if[0]== "condition")
{
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
+ var deviceinfo = Common.Logic.CurrentLogic.Conditions[intValue];
+ if (deviceinfo["Type"] == "1")
{
- if (deviceinfo["Type"] == "1")
+ if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
{
- if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
- {
- devices = deviceinfo;
- break;
+ devices = deviceinfo;
- }
}
}
+ //foreach (var deviceinfo in Common.Logic.CurrentLogic.Conditions)
+ //{
+ // if (deviceinfo["Type"] == "1")
+ // {
+ // if (common.DeviceAddr == deviceinfo["MacAddr"] && common.DeviceEpoint.ToString() == deviceinfo["Epoint"])
+ // {
+ // devices = deviceinfo;
+ // break;
+ // }
+ // }
+ //}
}
else
{
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ var deviceinfo = Common.Logic.CurrentLogic.Actions[intValue];
+ if (deviceinfo["LinkType"].ToString() == "0")
{
- if (deviceinfo["LinkType"].ToString() == "0")
- {
- if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
- {
- TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
- break;
- }
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ {
+ TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
}
}
+ //foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+ //{
+ // if (deviceinfo["LinkType"].ToString() == "0")
+ // {
+ // if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ // {
+ // TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
+ // break;
+ // }
+ // }
+ //}
}
}
#endregion
@@ -298,7 +314,7 @@
Send.dictionary(deviceConditionsInfo, "AttriButeId", "1281");
Send.dictionary(deviceConditionsInfo, "AttriButeData2", "0");
- int timevalue = 0;
+ int timeValue = 0;
///鐐瑰嚮纭浜嬩欢
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -307,7 +323,7 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openView.selectedIconBtn.Visible = true;
closeView.selectedIconBtn.Visible = false;
- if (iASZonedevice.IasDeviceType == 13)
+ if (iASZonedevice.IasDeviceType == 13||iASZonedevice.IasDeviceType == 541)
{
closeView.selectedIconBtn.Visible = true;
}
@@ -324,20 +340,15 @@
closeView.selectedIconBtn.Visible = true;
Send.dictionary(deviceConditionsInfo, "Range", "1");
Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
- if (iASZonedevice.IasDeviceType == 13)
+ if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- openView.selectedIconBtn.Visible = false;
- closeView.selectedIconBtn.Visible = true;
var ignoreTime = new IgnoreTime();
UserView.HomePage.Instance.AddChidren(ignoreTime);
UserView.HomePage.Instance.PageIndex += 1;
- ignoreTime.Show(common, closeView.titleBtn.Text, edit, timevalue, _if[1]);
+ ignoreTime.Show(common, closeView.titleBtn.Text, edit, timeValue, _if[1]);
}
-
-
};
switch (iASZonedevice.IasDeviceType)
@@ -357,18 +368,18 @@
case 22:
{
#region
+ var view = completeView.Show(3);
openView.titleBtn.TextID = MyInternationalizationString.logicopen;
closeView.titleBtn.TextID = MyInternationalizationString.logicclose;
- completeView.Show(3).AddChidren(openView.Show());
- completeView.Show(3).AddChidren(closeView.Show());
+ view.AddChidren(openView.Show());
+ view.AddChidren(closeView.Show());
- mFunView timeoutView = new mFunView();
- timeoutView.frameLayout.Y = closeView.frameLayout.Bottom;
- timeoutView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- completeView.Show(3).AddChidren(timeoutView.Show());
- timeoutView.titleBtn.TextID = MyInternationalizationString.closetimeout;
- timeoutView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- timeoutView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ takebackView.selectedIconBtn.Visible = true;
+ takebackView.titleBtn.TextID = MyInternationalizationString.closetimeout;
+ takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ view.AddChidren(takebackView.Show());
+ takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
SelectedDeviceStatus = "";
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -378,7 +389,7 @@
var ignoreTime = new IgnoreTime();
UserView.HomePage.Instance.AddChidren(ignoreTime);
UserView.HomePage.Instance.PageIndex += 1;
- ignoreTime.Show(common, timeoutView.titleBtn.Text, edit, timevalue, _if[1]);
+ ignoreTime.Show(common, takebackView.titleBtn.Text, edit, timeValue, _if[1]);
};
@@ -424,6 +435,61 @@
completeView.Show(1).AddChidren(openView.Show());
}
break;
+ case 541:
+ {
+ int _height = 3;
+ if (edit)
+ {
+ _height = 2;
+ }
+ var view = completeView.Show(_height);
+ openView.titleBtn.TextID = MyInternationalizationString.someone;
+ closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
+ closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ closeView.selectedIconBtn.Visible = true;
+ view.AddChidren(openView.Show());
+ view.AddChidren(closeView.Show());
+
+ takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ takebackView.selectedIconBtn.Visible = true;
+ takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
+ takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ if (edit)
+ {
+
+ if (devices["Cluster_ID"] == "1024")
+ {
+ flMain.RemoveFromParent();
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
+ }
+ else
+ {
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ }
+ }
+ else
+ {
+ view.AddChidren(takebackView.Show());
+
+ }
+
+
+ takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ SelectedDeviceStatus = "";
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ openView.selectedIconBtn.Visible = false;
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common,takebackView.titleBtn.Text, 0, false);
+
+ };
+ }
+ break;
default:
{
openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
@@ -439,7 +505,7 @@
{
if (devices.ContainsKey("IgnoreTime"))
{
- timevalue = int.Parse(devices["IgnoreTime"]);
+ timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
@@ -462,7 +528,6 @@
}
-
}
@@ -647,7 +712,7 @@
taskListInfo.Add(switchdictionary);
completeView.Show(l).AddChidren(openView.Show());
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
-
+
horizontalSeekBarRowLien.Y = openView.frameLayout.Bottom;
horizontalSeekBarVol.Y = openView.frameLayout.Bottom;
completeView.Show(l).AddChidren(horizontalSeekBarRowLien);
@@ -1206,15 +1271,19 @@
}
break;
case DeviceType.ColorTemperatureLight: {
-
-
-
-
flMain.RemoveFromParent();
var nightlight = new Nightlight();
UserView.HomePage.Instance.AddChidren(nightlight);
UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show(common, false, _if[1]);
+ if (edit)
+ {
+ nightlight.Show(common, edit, _if[1], Common.Logic.CurrentLogic.Actions[intValue]);
+ }
+ else
+ {
+ nightlight.Show(common, edit, _if[1]);
+ }
+
}
break;
}
@@ -1282,7 +1351,7 @@
}
break;
}
-
+
};
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 7778c60..e697150 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -240,7 +240,7 @@
string state = "";
switch (linkType)
{
-
+
case 0:
case 8:
{
@@ -638,6 +638,7 @@
actiondevice.selecetddevicestateBtn.Text = state;
///缂栬緫
+ actiondevice.edit.Tag = i.ToString();
actiondevice.edit.MouseUpEventHandler += (sender, e) =>
{
switch (linkType)
@@ -646,21 +647,9 @@
case 8:
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- if (deviceinof.Type != DeviceType.ColorTemperatureLight)
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
- }
- else
- {
- var nightlight = new Nightlight();
- UserView.HomePage.Instance.AddChidren(nightlight);
- UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show(deviceinof, true, "lockaction",actions);
- }
-
-
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction", int.Parse(actiondevice.edit.Tag.ToString()));
}
break;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Illumination.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Illumination.cs
new file mode 100755
index 0000000..77a0925
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Illumination.cs
@@ -0,0 +1,202 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.R;
+
+namespace Shared.Phone.Device.Logic
+{
+ public class Illumination : FrameLayout
+ {
+ public Illumination()
+ {
+ Tag = "Logic";
+ }
+
+ public void Show(ZigBee.Device.CommonDevice common,string name,int progresValue,bool _bool)
+ {
+ this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.Text = name;
+ view.clickBtn.MouseDownEventHandler += (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+ FrameLayout middle = new FrameLayout
+ {
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(Method.H - 184),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ this.AddChidren(middle);
+ //鐧借壊蹇埗鎺т欢
+ FrameLayout blankFraLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(616),
+ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ };
+ middle.AddChidren(blankFraLayout);
+ //鐓у害鍊兼帶浠�
+ Button illuminationBtn = new Button
+ {
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(259 - 184),
+ Height = Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(300),
+ Text =Language.StringByID(MyInternationalizationString.illuminanceValue)+ progresValue+"lux",
+ //TextID = MyInternationalizationString.Save,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 12,
+ };
+ middle.AddChidren(illuminationBtn);
+ //-鍥炬爣鎺т欢
+ Button lessBtn = new Button
+ {
+ X = Application.GetRealWidth(847),
+ Y = Application.GetRealHeight(46),
+ Height = Application.GetMinRealAverage(104),
+ Width = Application.GetMinRealAverage(104),
+ UnSelectedImagePath = "ZigeeLogic/lesLuminositys.png",
+ };
+ middle.AddChidren(lessBtn);
+ //+鍥炬爣鎺т欢
+ Button addBtn = new Button
+ {
+ X = lessBtn.Right,
+ Y = Application.GetRealHeight(46),
+ Height = Application.GetMinRealAverage(104),
+ Width = Application.GetMinRealAverage(104),
+ UnSelectedImagePath = "ZigeeLogic/addLuminosity.png",
+ };
+ middle.AddChidren(addBtn);
+ //杩涘害鏉℃帶浠�
+ var horizontalSeekBarVol = new DiyImageSeekBar
+ {
+ Y = Application.GetRealHeight(173),//杩涘害鏉＄埗鎺т欢Y鍧愭爣
+ X = Application.GetRealWidth(104),//杩涘害鏉鍧愭爣
+ Width = Application.GetRealWidth(873),//杩涘害鏉＄殑闀垮害
+ Height = Application.GetRealHeight(56),//杩涘害鏉＄埗鎺т欢楂樺害
+ IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
+ IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
+ ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
+ SeekBarBackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,//杩涘害鏉￠鑹�
+ ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+ ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+ ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ //ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(7),//杩涘害鏉＄殑楂樺害10
+ MaxValue = 100,
+ MinValue = 0,
+ Progress = progresValue,
+ };
+ middle.AddChidren(horizontalSeekBarVol);
+ lessBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ horizontalSeekBarVol.Progress = horizontalSeekBarVol.Progress - 1;
+ illuminationBtn.Text = Language.StringByID(MyInternationalizationString.illuminanceValue) + horizontalSeekBarVol.Progress.ToString() + "lux";
+ };
+ addBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ horizontalSeekBarVol.Progress = horizontalSeekBarVol.Progress + 1;
+ illuminationBtn.Text = Language.StringByID(MyInternationalizationString.illuminanceValue) + horizontalSeekBarVol.Progress.ToString() + "lux";
+ };
+ EventHandler<int> progressclick = (sender, e) =>
+ {
+ illuminationBtn.Text = Language.StringByID(MyInternationalizationString.illuminanceValue) + horizontalSeekBarVol.Progress.ToString() + "lux";
+ };
+ horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+ horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
+
+ Button text1Btn = new Button()
+ {
+ X = Application.GetRealWidth(81),
+ Y = Application.GetRealHeight(426 - 184),
+ Height = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(63+15),
+ Text = Language.StringByID(MyInternationalizationString.dark).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 12,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true,
+ };
+ middle.AddChidren(text1Btn);
+
+ Button text2Btn = new Button()
+ {
+ X = Application.GetRealWidth(913-20),
+ Y = Application.GetRealHeight(426 - 184),
+ Height = Application.GetRealHeight(100),
+ Width = Application.GetRealWidth(109+20),
+ Text = Language.StringByID(MyInternationalizationString.bright).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
+ TextSize = 12,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true,
+
+ };
+ middle.AddChidren(text2Btn);
+ //鎻愮ず鍥炬爣
+ Button tipIconBtn = new Button
+ {
+ X = Application.GetRealWidth(109),
+ Y = Application.GetRealHeight(616 - 184),
+ Height = Application.GetMinRealAverage(58),
+ Width = Application.GetMinRealAverage(58),
+ UnSelectedImagePath = "ZigeeLogic/tipIcon.png",
+ };
+ middle.AddChidren(tipIconBtn);
+
+ //鎻愮ず鏂囧瓧
+ Button tipTextBtn = new Button()
+ {
+ X = Application.GetRealWidth(173),
+ Y = Application.GetRealHeight(616 - 184),
+ Height = Application.GetRealHeight(138),
+ Width = Application.GetRealWidth(818),
+ Text = Language.StringByID(MyInternationalizationString.tipIlluminanceValue).Replace("{\\r\\n}", "\r\n"),
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 12,
+ TextAlignment = TextAlignment.Center,
+ IsMoreLines = true,
+
+ };
+ middle.AddChidren(tipTextBtn);
+
+ //淇濆瓨鎺т欢
+ LogicView.SaveView saveView = new LogicView.SaveView();
+ saveView.frameLayout.Y = middle.Height - Application.GetRealHeight(260);
+ middle.AddChidren(saveView.Show());
+ saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var deviceConditionsInfo = new Dictionary<string, string>();
+ deviceConditionsInfo.Add("Type", "1");
+ deviceConditionsInfo.Add("IsValid", "1");
+ deviceConditionsInfo.Add("MacAddr", common.DeviceAddr);
+ deviceConditionsInfo.Add("Epoint", common.DeviceEpoint.ToString());
+ deviceConditionsInfo.Add("Cluster_ID", "1024");
+ deviceConditionsInfo.Add("AttriButeId", "0");
+ deviceConditionsInfo.Add("AttriButeData1", horizontalSeekBarVol.Progress.ToString());
+ deviceConditionsInfo.Add("AttriButeData2", "0");
+ deviceConditionsInfo.Add("Range", "7");
+ if (_bool && progresValue != horizontalSeekBarVol.Progress)
+ {
+
+ LogicIfon.AddDeviceconditions(common, deviceConditionsInfo);
+ }
+ if (!_bool)
+ {
+ //涓嶆槸缂栬緫杩涙潵鐨�;
+ LogicIfon.AddDeviceconditions(common, deviceConditionsInfo);
+ }
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ };
+
+
+ }
+
+
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 57045c8..008ae98 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -18,7 +18,7 @@
UserView.HomePage.Instance.RemoveViewByTag("Logic");
Tag = "Logic";
}
- EditText logicTextBox;
+
public async void Show(Action action)
{
@@ -36,14 +36,14 @@
}
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- // UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
+ // UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
action();
RemoveFromParent();
};
var middle = new VerticalScrolViewLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(Method.H - 184-180),
+ Height = Application.GetRealHeight(Method.H - 184 - 180),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -75,10 +75,10 @@
};
logicnamefl.AddChidren(text);
- logicTextBox = new EditText
+ EditText logicTextBox = new EditText
{
Y = Application.GetRealHeight(35),
- Width = Application.GetRealWidth(1080-58-300),
+ Width = Application.GetRealWidth(1080 - 58 - 300),
Height = Application.GetRealHeight(60),
X = text.Right,
TextAlignment = TextAlignment.CenterLeft,
@@ -103,20 +103,21 @@
middle.AddChidren(addconditionview.AddDeviceView());
///娣诲姞鏉′欢鐨勭偣鍑讳簨浠�
- addconditionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
- {
- if (Common.Logic.CurrentLogic.Conditions.Count == 1)
- {
- ConditionView(false);
- }
- else
- {
- var addLogicPage = new AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
- };
+ addconditionview.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+ if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+ {
+ new LogicDveiceStatus { }.ConditionView(false, this);
+ }
+ else
+ {
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
+ };
List<Dictionary<string, string>> ListConditions = new List<Dictionary<string, string>>();
ListConditions.Clear();
ListConditions.AddRange(Common.Logic.CurrentLogic.Conditions);
@@ -148,535 +149,14 @@
}
EventHandler<MouseEventArgs> editclick = (sender, e) =>
{
-
- ConditionView(true);
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+ new LogicDveiceStatus { }.ConditionView(true, this);
};
row.MouseUpEventHandler += editclick;
relationship.MouseUpEventHandler += editclick;
}
- for (int i = 0; i < ListConditions.Count; i++)
- {
- if (i == (ListConditions.Count - 1))
- {
- LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
- addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
- middle.AddChidren(addflview.AddFl());
- addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
- {
- if (Common.Logic.CurrentLogic.Conditions.Count == 1)
- {
- ConditionView(false);
- }
- else
- {
- var addLogicPage = new AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
- };
- }
- else
- {
- SelectedDeviceView selecteddevice = new SelectedDeviceView();
- selecteddevice.Show(middle);
- selecteddevice.stateRow.AddRightView(selecteddevice.edit);
- selecteddevice.stateRow.AddRightView(selecteddevice.del);
-
- var Type = int.Parse(ListConditions[i]["Type"]);
- var conditions = ListConditions[i];
- string name = "";
- string icon = "";
- string state = "";
- switch (Type)
- {
- /// (0:鏃堕棿鐐规潯浠�;1:璁惧鐘舵�佸彉鍖栨潯浠�;2:鍏朵粬閫昏緫鏉′欢;3:璁℃暟鍣ㄦ潯浠�;4:鍊掕鏃�;5:鏃堕棿娈垫潯浠�;6:瀹夐槻鏉′欢;7:鍦扮悊浣嶇疆)
- case 0:
- {
-
- //"0姝ｅ父鏃堕棿鐐�","1鏃ュ嚭鏃堕棿","2鏃ヨ惤鏃堕棿","3姝ｅ崍鏃堕棿"
- switch (int.Parse(conditions["DateType"]))
- {
- case 0:
- {
- name = Language.StringByID(MyInternationalizationString.immediateexecution);
- icon = "ZigeeLogic/timepoint.png";
- string s = "";
- s = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
- state = conditions["StartHour"] + ":" + s;
-
- }
- break;
- case 1:
- {
- name = Language.StringByID(MyInternationalizationString.sunrise);
- icon = "ZigeeLogic/sunrise.png";
- if (int.Parse(conditions["AdjustTime"]) > 0)
- {
- state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else if (int.Parse(conditions["AdjustTime"]) < 0)
- {
- state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else
- {
- //timeTxet.Text = Language.StringByID(MyInternationalizationString.sunrise);
- }
- }
- break;
- case 2:
- {
- name = Language.StringByID(MyInternationalizationString.sunset);
- icon = "ZigeeLogic/sunset.png";
- if (int.Parse(conditions["AdjustTime"]) > 0)
- {
- state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else if (int.Parse(conditions["AdjustTime"]) < 0)
- {
- state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else
- {
- // timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
- }
- }
- break;
- case 3:
- {
- name = Language.StringByID(MyInternationalizationString.noon);
- icon = "ZigeeLogic/noon.png";
- if (int.Parse(conditions["AdjustTime"]) > 0)
- {
- state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else if (int.Parse(conditions["AdjustTime"]) < 0)
- {
- state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
- }
- else
- {
- // timeTxet.Text = Language.StringByID(MyInternationalizationString.noon);
- }
- }
- break;
- }
-
- }
- break;
- case 5:
- {
- icon = "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"];
- ///鏄剧ず鏃堕棿
- name = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2;
- state =Language.StringByID(MyInternationalizationString.timeframe);
- }
- break;
- case 1:
- {
- var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
- name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
- selecteddevice.regionNameBtn.Visible = true;
- Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
-
- switch (deviceinof.Type)
- {
- case DeviceType.OnOffOutput:
- {
- icon = "ZigeeLogic/light.png";
- if (conditions["AttriButeId"] == "0")
- {
- if (conditions["AttriButeData1"] == "1")
- {
- state = Language.StringByID(MyInternationalizationString.open);
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.close);
- }
-
- }
- }
- break;
- case DeviceType.IASZone:
- {
- var iASZonedevice = deviceinof as IASZone;
- var intvalue = conditions["AttriButeData1"];
- icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
- switch (iASZonedevice.IasDeviceType)
- {
- case 13:
- {
- if (conditions.ContainsKey("IgnoreTime"))
- {
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
-
- }
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.someone);
- }
-
- }
- break;
- case 21:
- case 22:
- {
- if (conditions.ContainsKey("IgnoreTime"))
- {
-
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
-
- }
-
- }
-
- }
- else
- {
- if (intvalue == "1")
- {
- state = Language.StringByID(MyInternationalizationString.logicopen);
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.logicclose);
- }
-
- }
-
- }
- break;
- case 40:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID(MyInternationalizationString.smokescreen);
- }
-
- }
- break;
- case 42:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.waterleakage);
- }
- else
- {
- state =Language.StringByID( MyInternationalizationString.noleakage);
- }
- }
- break;
- case 43:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.gas);
- }
-
- }
- break;
- case 277:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID( MyInternationalizationString.callthepolice);
- }
-
- }
- break;
- default:
- {
- if (intvalue == "1")
- {
- state =Language.StringByID(MyInternationalizationString.callthepolice);
- }
- }
- break;
-
- }
- }
- break;
- case DeviceType.OnOffSwitch:
- {
- icon = "ZigeeLogic/panel.png";
- state = Language.StringByID(MyInternationalizationString.OnOffSwitch) + conditions["Epoint"];
- }
- break;
- case DeviceType.DoorLock:
- {
- icon = "ZigeeLogic/doorlock.png";
- for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
- {
- if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
- {
- if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
- {
- state = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
- break;
-
- }
- }
-
- }
- }
- break;
- case DeviceType.TemperatureSensor:
- {
- // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
- var dev = deviceinof as TemperatureSensor;
- if (conditions["Cluster_ID"] == "1026")
- {
- dev.SensorDiv = 1;
- }
- else
- {
- dev.SensorDiv = 2;
- }
- string s = "";
- switch (conditions["Range"])
- {
- case "0":
- {
- s = ">";
- }
- break;
- case "1":
- {
- s = "=";
- }
- break;
- case "2":
- {
- s = "<";
- }
- break;
- case "6":
- {
- s = "鈮�";
- }
- break;
- case "7":
- {
- s = "鈮�";
- }
- break;
- }
- ///杞崲娓╁害鍊�/100
- string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
- if (conditions["Cluster_ID"] == "1026")
- {
- icon = "ZigeeLogic/temperature.png";
- state = s + srtValue + "鈩�";
- }
- else
- {
- icon = "ZigeeLogic/humidity.png";
- state = s + srtValue + "%";
- }
- break;
-
- }
-
- }
- }
- break;
- case 6:
- {
- switch (conditions["EnOrWithdrawMode"])
- {
- case "0":
- {
- if (conditions["ModeId"] == "1")
- {
- icon = "ZigeeLogic/athome.png";
- name = Language.StringByID(MyInternationalizationString.logicathomegarrison);
-
- }
- else
- {
- icon = "ZigeeLogic/leavehome.png";
- name = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
- }
- }
- break;
- case "1":
- {
- icon = "ZigeeLogic/withdrawal.png";
- name = Language.StringByID(MyInternationalizationString.withdrawal);
- }
- break;
- case "2":
- {
- icon = "ZigeeLogic/withdrawal.png";
- name = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
- }
- break;
- }
- }
- break;
- case 7:
- {
- icon = "ZigeeLogic/position.png";
- name = Language.StringByID(MyInternationalizationString.geographicalposition);
- foreach (var radius in Common.Logic.CurrentLogic.Accounts)
- {
- if (radius["Type"] == "7")
- {
- if (conditions["AtHome"] == "1")
- {
- state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
- }
- }
- }
- }
- break;
- }
- if (Type != 1)
- {
- selecteddevice.ordinaryBtn.Visible = true;
- selecteddevice.iconBtn.UnSelectedImagePath = icon;
- selecteddevice.ordinaryBtn.Text = name;
- selecteddevice.selecetddevicestateBtn.Text = state;
- }
- else
- {
- //璁惧鐘舵��
- selecteddevice.deviceNameBtn.Visible = true;
- selecteddevice.iconBtn.UnSelectedImagePath = icon;
- selecteddevice.deviceNameBtn.Text = name;
- selecteddevice.selecetddevicestateBtn.Text = state;
- }
- ///缂栬緫
- selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
- {
- switch (Type)
- {
-
- /// (0:鏃堕棿鐐规潯浠�;1:璁惧鐘舵�佸彉鍖栨潯浠�;2:鍏朵粬閫昏緫鏉′欢;3:璁℃暟鍣ㄦ潯浠�;4:鍊掕鏃�;5:鏃堕棿娈垫潯浠�;6:瀹夐槻鏉′欢;7:鍦扮悊浣嶇疆)
- case 0:
- {
- var timePoint = new TimePoint();
- UserView.HomePage.Instance.AddChidren(timePoint);
- UserView.HomePage.Instance.PageIndex += 1;
- timePoint.IsEditor = true;
- timePoint.Show(conditions);
- }
- break;
- case 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();
- }
- break;
- case 1:
- {
- var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
- if (deviceinof.Type != DeviceType.DoorLock)
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_logic");
- }
- else
- {
- var memberList = new MemberList();
- UserView.HomePage.Instance.AddChidren(memberList);
- UserView.HomePage.Instance.PageIndex += 1;
- MemberList.edit = true;
- memberList.Show(deviceinof, conditions);
- }
- }
- break;
- case 6:
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- AddLogicPage.SecurityView(flMain, true);
- }
- break;
- case 7:
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- AddLogicPage.LocationView(flMain, true);
- }
- break;
- }
- };
- ///鍒犻櫎鎺т欢
- selecteddevice.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.CurrentLogic.Conditions.Remove(conditions);
- selecteddevice.selecetdFrameLayout.RemoveFromParent();
- //var logicCommunalPage = new LogicCommunalPage();
- //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- //UserView.HomePage.Instance.PageIndex += 1;
- //logicCommunalPage.Show(() => { });
- };
-
- };
-
- }
- }
-
+ new LogicDveiceStatus { }.Conditions(this, middle, ListConditions, logicTextBox.Text.Trim());
#endregion
@@ -686,578 +166,17 @@
addactionview.iconBtn.Visible = true;
addactionview.titleBtn.TextID = MyInternationalizationString.execute;
middle.AddChidren(addactionview.AddDeviceView());
-
- addactionview.clickBtn.MouseUpEventHandler+= (sender, e) =>
- {
- Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
- Method.View(IfString.Action_Logic,IfString.Action_LogicScene);
- };
+ addactionview.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
+ Method.View(IfString.Action_Logic, IfString.Action_LogicScene);
+ };
List<Dictionary<string, object>> ListActions = new List<Dictionary<string, object>>();
ListActions.Clear();
ListActions.AddRange(Common.Logic.CurrentLogic.Actions);
ListActions.Add(new Dictionary<string, object>());
-
- for (int i = 0; i < ListActions.Count; i++)
- {
- if (i == (ListActions.Count - 1))
- {
-
- LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
- addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
- middle.AddChidren(addflview.AddFl());
- addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
- {
- Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
- Method.View(IfString.Action_Logic, IfString.Action_LogicScene);
- };
- }
- else
- {
-
- SelectedDeviceView actiondevice = new SelectedDeviceView();
- actiondevice.Show(middle);
- var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
- var actions = ListActions[i];
- string name = "";
- string icon = "";
- string state = "";
-
- switch (linkType)
- {
- case 0:
- case 8:
- {
-
- var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
- actiondevice.regionNameBtn.Visible = true;
- Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
- switch (deviceinof.Type)
- {
- case DeviceType.OnOffOutput:
- {
- icon = "ZigeeLogic/light.png";
-
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- foreach (var status in TaskList)
- {
- if (status["TaskType"].ToString() == "1")
- {
- if (status["Data1"].ToString() == "0")
- {
- state = Language.StringByID(MyInternationalizationString.close);
-
- }
- else if (status["Data1"].ToString() == "1")
- {
- state = Language.StringByID(MyInternationalizationString.open);
-
- }
- else if (status["Data1"].ToString() == "2")
- {
-
- state = Language.StringByID(MyInternationalizationString.onoff);
- }
- }
-
- }
-
- }
- break;
- case DeviceType.DimmableLight:
- {
- icon = "ZigeeLogic/dimmableLight.png";
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- foreach (var status in TaskList)
- {
- if (status["TaskType"].ToString() == "3")
- {
- var intvalue = int.Parse(status["Data1"]);
- var lightbrightnessvalue = (intvalue * 100) / 254;
- state = lightbrightnessvalue.ToString() + "%";
- }
- else if (status["TaskType"].ToString() == "1")
- {
-
- if (status["Data1"].ToString() == "0")
- {
- state = Language.StringByID(MyInternationalizationString.close);
- }
- else if (status["Data1"].ToString() == "2")
- {
- state = Language.StringByID(MyInternationalizationString.onoff);
- }
- }
-
-
- }
-
- }
- break;
- case DeviceType.WindowCoveringDevice:
- {
- icon = "ZigeeLogic/curtain.png";
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- foreach (var status in TaskList)
- {
- if (status["TaskType"] == "6")
- {
- if (status["Data1"] == "0")
- {
- state = Language.StringByID(MyInternationalizationString.open);
- }
- else if (status["Data1"] == "1")
- {
- state = Language.StringByID(MyInternationalizationString.close);
- }
- else if (status["Data1"] == "5")
- {
- state = status["Data2"] + "%";
- }
- }
-
- }
- }
- break;
- case DeviceType.AirSwitch:
- {
- icon = "ZigeeLogic/airswitch.png";
-
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- foreach (var status in TaskList)
- {
- if (status["TaskType"].ToString() == "1")
- {
- if (status["Data1"].ToString() == "0")
- {
- state = Language.StringByID(MyInternationalizationString.close);
-
- }
- else if (status["Data1"].ToString() == "1")
- {
- state = Language.StringByID(MyInternationalizationString.open);
-
- }
- else if (status["Data1"].ToString() == "2")
- {
-
- state = Language.StringByID(MyInternationalizationString.onoff);
- }
- }
-
- }
-
- }
- break;
- case DeviceType.Thermostat:
- {
- icon = "ZigeeLogic/ac.png";
-
- var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (TaskList == null)
- {
- continue;
- }
- string modetext = "", temperaturetext = "", speedtext = "";
- bool ifclose = false;
- foreach (var status in TaskList)
- {
-
- if (TaskList.Count == 1)
- {
- //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
- ifclose = false;
- //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
- break;
- }
- else
- {
- ifclose = true;
- }
- if (status["TaskType"].ToString() == "5")
- {
- if (status["Data1"] == "3")
- {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
- switch (status["Data2"])
- {
- case "3":
- {
- modetext = Language.StringByID(MyInternationalizationString.logiccool);
- }
- break;
- case "4":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicheat);
- }
- break;
- case "1":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicauto);
- }
- break;
- case "8":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicdry);
- }
- break;
- case "7":
- {
- modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
- }
- break;
- }
- }
- else if (status["Data1"] == "6")
- {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
- switch (status["Data2"])
- {
- case "1":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logiclow);
- }
- break;
-
- case "2":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
- }
- break;
- case "3":
- {
- speedtext = Language.StringByID(MyInternationalizationString.logichigh);
- }
- break;
-
- }
- }
- //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
- else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
- {
- var s = int.Parse(status["Data2"]) / 100;
- temperaturetext = s.ToString();
- }
- else if (status["Data1"] == "20")
- {
- temperaturetext = "鏃�";
- }
-
-
- }
-
- }
- if (ifclose)
- {
- state = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.close);
-
- }
- }
- break;
- case DeviceType.DoorLock:
- {
- //闂ㄩ攣鐗规畩
- icon = "ZigeeLogic/doorlock.png";
- if (actions["PassData"].ToString() == "055704010112")
- {
- state = Language.StringByID(MyInternationalizationString.logicopen);
- }
- else
- {
- state = Language.StringByID(MyInternationalizationString.logicclose);
- }
- }
- break;
- case DeviceType.ColorTemperatureLight:
- {
- icon = "ZigeeLogic/nightLight.png";
- var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
- if (taskList == null)
- {
- continue;
- }
- foreach (var tasks in taskList)
- {
- switch (tasks["TaskType"])
- {
- case "1":
- {
- if (tasks["Data1"] == "0")
- {
- state += Language.StringByID(MyInternationalizationString.close) + ";";
- }
- else
- {
- state += Language.StringByID(MyInternationalizationString.open) + ";";
- }
- }
- break;
-
- }
- }
- foreach (var tasks in taskList)
- {
- switch (tasks["TaskType"])
- {
-
- case "3":
- {
- var intvalue = int.Parse(tasks["Data1"]);
- var lightbrightnessvalue = (intvalue * 100) / 254;
- state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
- }
- break;
-
- }
- }
- foreach (var tasks in taskList)
- {
- switch (tasks["TaskType"])
- {
-
- case "7":
- {
- if (tasks["Data1"] == "0")
- {
- state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
- }
- else
- {
- state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
- }
- }
- break;
-
- }
- }
- foreach (var tasks in taskList)
- {
- switch (tasks["TaskType"])
- {
-
- case "8":
- {
- var intvalue = int.Parse(tasks["Data1"]);
- var colorTemperatureValue = 1000000/(intvalue *100);
- state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
- }
- break;
- }
- }
-
- state=state.TrimEnd(';');//鍘绘帀鏈�鍚庨偅涓�";"
- }
- break;
- }
-
- }
- break;
- case 2:
- {
- //鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
- var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
- //鏈湴娌℃湁瀛樺湪;
- if (sceneinof == null)
- {
- //瀹炵幇鐩殑:鏄剧ず鍑烘潵璁╁彲浠ヨ嚜宸辨槸鍚﹀垹闄�
- sceneinof = new SceneUI();
- #region --------
- ////鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
- ////鏍囪闂:缃戠粶璇锋眰锛屽瓨鍦ㄨ鍥惧姞杞藉揩鎱㈢殑闂锛�
- //sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
- ////缃戝叧娌℃湁瀛樺湪;
- //if (sceneinof == null)
- //{
- // //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
- // //sceneinof = new SceneUI();
- // //绉婚櫎璇ュ満鏅暟鎹�;
- // Common.Logic.CurrentLogic.Actions.Remove(actions);
- // //绉婚櫎璇ュ満鏅鍥�;
- // devicesFrameLayout.RemoveFromParent();
- // continue;
- //}
- #endregion
- }
-
- icon = "ZigeeLogic/scene.png";
- name = sceneinof.Name;
- actiondevice.regionNameBtn.Visible = true;
- /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
- Common.Room room = new Common.Room();
- actiondevice.regionNameBtn.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
-
- }
- break;
- case 6:
- {
-
-
-
- if (actions["SecuritySetting"].ToString() == "0")
- {
- if (actions["Password"].ToString() == "888888")
- {
- icon = "ZigeeLogic/withdrawal.png";
- state = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
- }
- else
- {
- icon = "ZigeeLogic/withdrawal.png";
- state = Language.StringByID(MyInternationalizationString.withdrawal);
-
- }
- }
- else if (actions["SecuritySetting"].ToString() == "1")
- {
- if (actions["SecurityModeId"].ToString() == "1")
- {
- icon = "ZigeeLogic/athome.png";
- state = Language.StringByID(MyInternationalizationString.logicathomegarrison);
- }
- else if (actions["SecurityModeId"].ToString() == "2")
- {
- icon = "ZigeeLogic/leavehome.png";
- state = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
- }
- }
-
- }
- break;
- case 7:
- {
- var delaytimevalue = int.Parse(actions["DelayTime"].ToString());
- var Minutes = delaytimevalue / 60;
- var seconds = delaytimevalue % 60;
-
- icon = "ZigeeLogic/delay.png";
-
- if (Minutes != 0)
- {
- if (seconds == 0)
- {
- state = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute);
- }
- else
- {
- state = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute) + seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
- }
- }
- else
- {
- state = seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
- }
- //璁板綍寤舵椂锛�
- actiondevice.edit.Tag = i;
- };
- break;
- }
-
- if (linkType != 2)
- {
- actiondevice.stateRow.AddRightView(actiondevice.edit);
- }
- actiondevice.stateRow.AddRightView(actiondevice.del);
-
- if (linkType == 6 || linkType == 7)
- {
- actiondevice.ordinaryBtn.Visible = true;
- actiondevice.iconBtn.UnSelectedImagePath = icon;
- actiondevice.ordinaryBtn.Text = name;
- actiondevice.selecetddevicestateBtn.Text = state;
- }
- else
- {
- //璁惧鐘舵��
- actiondevice.deviceNameBtn.Visible = true;
- actiondevice.iconBtn.UnSelectedImagePath = icon;
- actiondevice.deviceNameBtn.Text = name;
- actiondevice.selecetddevicestateBtn.Text = state;
- }
- ///缂栬緫
- actiondevice.edit.MouseUpEventHandler += (sender, e) =>
- {
- switch (linkType)
- {
- case 8:
- case 0:
- {
- var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- if (deviceinof.Type != DeviceType.ColorTemperatureLight)
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic");
- }
- else
- {
- var nightlight = new Nightlight();
- UserView.HomePage.Instance.AddChidren(nightlight);
- UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show(deviceinof, true, "logic", actions);
- }
- }
- break;
- case 6:
- {
- var securityMode = new SecurityMode();
- UserView.HomePage.Instance.AddChidren(securityMode);
- UserView.HomePage.Instance.PageIndex += 1;
- securityMode.IsDeviceEditor = true;
- securityMode.Show();
- }
- break;
- case 7:
- {
- var delayTime = new DelayTime();
- UserView.HomePage.Instance.AddChidren(delayTime);
- UserView.HomePage.Instance.PageIndex += 1;
- delayTime.Show(int.Parse(actiondevice.edit.Tag.ToString()), true);
- }
- break;
-
- }
- };
- ///鍒犻櫎鎺т欢
- actiondevice.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.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(() => { });
- };
-
- };
- }
- }
+ new LogicDveiceStatus { }.Actions(this, middle, ListActions, logicTextBox.Text.Trim());
#endregion
@@ -1282,16 +201,16 @@
//Text = "姣忓ぉ",
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextID = MyInternationalizationString.everyday,
- Y = Application.GetRealHeight(35+30),
+ Y = Application.GetRealHeight(35 + 30),
X = weekview.titleBtn.Right,
TextSize = 14,
};
weekview.frameLayout.AddChidren(weekBtn);
- Method.UpdateWeek(weekBtn,Common.Logic.CurrentLogic);
+ Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic);
EventHandler<MouseEventArgs> cycleclick = (sender, e) =>
{
/*------淇濈暀姣忔湀,姣忓勾绫诲瀷*/
- var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic);});
+ var cycle = new Cycle(() => { Method.UpdateWeek(weekBtn, Common.Logic.CurrentLogic); });
UserView.HomePage.Instance.AddChidren(cycle);
UserView.HomePage.Instance.PageIndex += 1;
cycle.Show();
@@ -1307,121 +226,14 @@
#region ----鎺ㄩ�佽缃�----
Method.Push(middle);
-
+
#endregion
- saveBtn.clickviewBtn.MouseUpEventHandler +=(sender, e) =>
- {
- var name = logicTextBox.Text.Trim();
- Method.SaveLogic(IfString._Logic,name, IfString.Tag, Common.Logic.CurrentLogic);
- };
+ saveBtn.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var name = logicTextBox.Text.Trim();
+ Method.SaveLogic(IfString._Logic, name, IfString.Tag, Common.Logic.CurrentLogic);
+ };
}
-
- void ConditionView(bool edit)
- {
- Common.Logic.CurrentLogic.LogicName = logicTextBox.Text.Trim();
- #region ------缁勫悎鏉′欢鐣岄潰甯冨眬閮ㄥ垎
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
- this.AddChidren(flMain);
- CompleteView completeView = new CompleteView();
- flMain.AddChidren(completeView.Show(2));
- completeView.Btntitle.TextID = MyInternationalizationString.condition;
- EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
- {
- UserView.HomePage.Instance.ScrollEnabled = true;
- flMain.RemoveFromParent();
- };
- flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
-
- //婊¤冻鎵�鏈夋潯浠�
- mFunView allFunView = new mFunView();
- allFunView.frameLayout.Y = Application.GetRealHeight(140 + 20);
- completeView.Show(2).AddChidren(allFunView.Show());
- allFunView.titleBtn.TextID = MyInternationalizationString.Allconditions;
- //婊¤冻鍏朵腑涓�涓潯浠�
- mFunView ormFunview = new mFunView();
- ormFunview.frameLayout.Y = allFunView.frameLayout.Bottom;
- completeView.Show(2).AddChidren(ormFunview.Show());
- ormFunview.titleBtn.TextID = MyInternationalizationString.anycondition;
- ormFunview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- #endregion
-
- ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
- allFunView.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
- {
- allFunView.selectedIconBtn.Visible = true;
- ormFunview.selectedIconBtn.Visible = false;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- };
- ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
- ormFunview.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
- {
- allFunView.selectedIconBtn.Visible = false;
- ormFunview.selectedIconBtn.Visible = true;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- };
-
- if (edit)
- {
- if (Common.Logic.CurrentLogic.Relationship == 0)
- {
- allFunView.selectedIconBtn.Visible = true;
- ormFunview.selectedIconBtn.Visible = false;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- }
- else
- {
- allFunView.selectedIconBtn.Visible = false;
- ormFunview.selectedIconBtn.Visible = true;
- allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- }
- }
- completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
- {
- if (!allFunView.selectedIconBtn.Visible && !ormFunview.selectedIconBtn.Visible)
- {
- ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
- return;
- }
- flMain.RemoveFromParent();
-
- if (allFunView.selectedIconBtn.Visible)
- {
- Common.Logic.CurrentLogic.Relationship = 0;
-
- }
- if (ormFunview.selectedIconBtn.Visible)
- {
- Common.Logic.CurrentLogic.Relationship = 1;
-
- }
- if (edit)
- {
- if (Common.Logic.CurrentLogic.LogicId != 0)
- {
- Send.LogicControlSwitch(Common.Logic.CurrentLogic);
- }
- var logicCommunalPage = new LogicCommunalPage();
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- }
- else
- {
- var addLogicPage = new AddLogicPage();
- UserView.HomePage.Instance.AddChidren(addLogicPage);
- UserView.HomePage.Instance.PageIndex += 1;
- addLogicPage.Show();
- }
- };
-
- }
-
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
new file mode 100755
index 0000000..ebc0789
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -0,0 +1,1262 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+ public class LogicDveiceStatus
+ {
+
+ /// <summary>
+ /// 鏄剧ず閫昏緫鏉′欢鐘舵�佺殑鏂规硶
+ /// </summary>
+ /// <param name="frameLayout">鐖舵帶浠�</param>
+ /// <param name="middle"></param>
+ /// <param name="ListConditions">閫昏緫鏉′欢鍒楄〃</param>
+ /// <param name="logicName">閫昏緫鍚嶇О</param>
+ public void Conditions(FrameLayout frameLayout,VerticalScrolViewLayout middle,List<Dictionary<string, string>> ListConditions,string logicName)
+ {
+ for (int i = 0; i < ListConditions.Count; i++)
+ {
+ if (i == (ListConditions.Count - 1))
+ {
+ LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
+ addflview.titleBtn.TextID = MyInternationalizationString.addconditions;
+ middle.AddChidren(addflview.AddFl());
+ addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Common.Logic.CurrentLogic.LogicName = logicName;
+ if (Common.Logic.CurrentLogic.Conditions.Count == 1)
+ {
+ ConditionView(false, frameLayout);
+ }
+ else
+ {
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
+ };
+ }
+ else
+ {
+
+ SelectedDeviceView selecteddevice = new SelectedDeviceView();
+ selecteddevice.Show(middle);
+ selecteddevice.stateRow.AddRightView(selecteddevice.edit);
+ selecteddevice.stateRow.AddRightView(selecteddevice.del);
+
+ var Type = int.Parse(ListConditions[i]["Type"]);
+ var conditions = ListConditions[i];
+ string name = "";
+ string icon = "";
+ string state = "";
+ switch (Type)
+ {
+ /// (0:鏃堕棿鐐规潯浠�;1:璁惧鐘舵�佸彉鍖栨潯浠�;2:鍏朵粬閫昏緫鏉′欢;3:璁℃暟鍣ㄦ潯浠�;4:鍊掕鏃�;5:鏃堕棿娈垫潯浠�;6:瀹夐槻鏉′欢;7:鍦扮悊浣嶇疆)
+ case 0:
+ {
+
+ //"0姝ｅ父鏃堕棿鐐�","1鏃ュ嚭鏃堕棿","2鏃ヨ惤鏃堕棿","3姝ｅ崍鏃堕棿"
+ switch (int.Parse(conditions["DateType"]))
+ {
+ case 0:
+ {
+ name = Language.StringByID(MyInternationalizationString.immediateexecution);
+ icon = "ZigeeLogic/timepoint.png";
+ string s = "";
+ s = conditions["StartMin"].Length < 2 ? "0" + conditions["StartMin"] : conditions["StartMin"];
+ state = conditions["StartHour"] + ":" + s;
+
+ }
+ break;
+ case 1:
+ {
+ name = Language.StringByID(MyInternationalizationString.sunrise);
+ icon = "ZigeeLogic/sunrise.png";
+ if (int.Parse(conditions["AdjustTime"]) > 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else if (int.Parse(conditions["AdjustTime"]) < 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else
+ {
+ //timeTxet.Text = Language.StringByID(MyInternationalizationString.sunrise);
+ }
+ }
+ break;
+ case 2:
+ {
+ name = Language.StringByID(MyInternationalizationString.sunset);
+ icon = "ZigeeLogic/sunset.png";
+ if (int.Parse(conditions["AdjustTime"]) > 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else if (int.Parse(conditions["AdjustTime"]) < 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else
+ {
+ // timevalue.Text = Language.StringByID(MyInternationalizationString.sunset);
+ }
+ }
+ break;
+ case 3:
+ {
+ name = Language.StringByID(MyInternationalizationString.noon);
+ icon = "ZigeeLogic/noon.png";
+ if (int.Parse(conditions["AdjustTime"]) > 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.delayed) + conditions["AdjustTime"] + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else if (int.Parse(conditions["AdjustTime"]) < 0)
+ {
+ state = Language.StringByID(MyInternationalizationString.advance) + Math.Abs(int.Parse(conditions["AdjustTime"])).ToString() + Language.StringByID(MyInternationalizationString.logicminute);
+ }
+ else
+ {
+ // timeTxet.Text = Language.StringByID(MyInternationalizationString.noon);
+ }
+ }
+ break;
+ }
+
+ }
+ break;
+ case 5:
+ {
+ icon = "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"];
+ ///鏄剧ず鏃堕棿
+ name = conditions["StartHour"] + ":" + s1 + "-" + conditions["StopHour"] + ":" + s2;
+ state =Language.StringByID(MyInternationalizationString.timeframe);
+ }
+ break;
+ case 1:
+ {
+ var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ selecteddevice.regionNameBtn.Visible = true;
+ Method.RoomNmae(selecteddevice.regionNameBtn, deviceinof);
+
+ switch (deviceinof.Type)
+ {
+ case DeviceType.OnOffOutput:
+ {
+ icon = "ZigeeLogic/light.png";
+ if (conditions["AttriButeId"] == "0")
+ {
+ if (conditions["AttriButeData1"] == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.open);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+ }
+
+ }
+ }
+ break;
+ case DeviceType.IASZone:
+ {
+ var iASZonedevice = deviceinof as IASZone;
+ var intvalue = conditions["AttriButeData1"];
+ icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+ switch (iASZonedevice.IasDeviceType)
+ {
+ case 13:
+ {
+ if (conditions.ContainsKey("IgnoreTime"))
+ {
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ else
+ {
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+
+ }
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.someone);
+ }
+
+ }
+ break;
+ case 21:
+ case 22:
+ {
+ if (conditions.ContainsKey("IgnoreTime"))
+ {
+
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ else
+ {
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
+
+ }
+
+ }
+
+ }
+ else
+ {
+ if (intvalue == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.logicopen);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.logicclose);
+ }
+
+ }
+
+ }
+ break;
+ case 40:
+ {
+ if (intvalue == "1")
+ {
+ state =Language.StringByID(MyInternationalizationString.smokescreen);
+ }
+
+ }
+ break;
+ case 42:
+ {
+ if (intvalue == "1")
+ {
+ state =Language.StringByID( MyInternationalizationString.waterleakage);
+ }
+ else
+ {
+ state =Language.StringByID( MyInternationalizationString.noleakage);
+ }
+ }
+ break;
+ case 43:
+ {
+ if (intvalue == "1")
+ {
+ state =Language.StringByID( MyInternationalizationString.gas);
+ }
+
+ }
+ break;
+ case 277:
+ {
+ if (intvalue == "1")
+ {
+ state =Language.StringByID( MyInternationalizationString.callthepolice);
+ }
+
+ }
+ break;
+ case 541:
+ {
+ if (conditions["Cluster_ID"] == "1024") {
+ state = Language.StringByID(MyInternationalizationString.ambientLight)+"<"+conditions["AttriButeData1"]+"lux"+ Language.StringByID(MyInternationalizationString.hour1);
+ }
+ else
+ {
+ if (conditions.ContainsKey("IgnoreTime"))
+ {
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ else
+ {
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+
+ }
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.someone);
+ }
+ }
+ }
+ break;
+ default:
+ {
+ if (intvalue == "1")
+ {
+ state =Language.StringByID(MyInternationalizationString.callthepolice);
+ }
+ }
+ break;
+
+ }
+ }
+ break;
+ case DeviceType.OnOffSwitch:
+ {
+ icon = "ZigeeLogic/panel.png";
+ state = Language.StringByID(MyInternationalizationString.OnOffSwitch) + conditions["Epoint"];
+ }
+ break;
+ case DeviceType.DoorLock:
+ {
+ icon = "ZigeeLogic/doorlock.png";
+ for (int a = 0; a < Common.Logic.CurrentLogic.Accounts.Count; a++)
+ {
+ if (Common.Logic.CurrentLogic.Accounts[a]["Type"] == "1")
+ {
+ if (Common.Logic.CurrentLogic.Accounts[a]["UserId"] == conditions["AttriButeData2"])
+ {
+ state = Common.Logic.CurrentLogic.Accounts[a]["AccountName"];
+ break;
+
+ }
+ }
+
+ }
+ }
+ break;
+ case DeviceType.TemperatureSensor:
+ {
+ // conditionIcon.UnSelectedImagePath = "ZigeeLogic/temperature.png";
+ var dev = deviceinof as TemperatureSensor;
+ if (conditions["Cluster_ID"] == "1026")
+ {
+ dev.SensorDiv = 1;
+ }
+ else
+ {
+ dev.SensorDiv = 2;
+ }
+ string s = "";
+ switch (conditions["Range"])
+ {
+ case "0":
+ {
+ s = ">";
+ }
+ break;
+ case "1":
+ {
+ s = "=";
+ }
+ break;
+ case "2":
+ {
+ s = "<";
+ }
+ break;
+ case "6":
+ {
+ s = "鈮�";
+ }
+ break;
+ case "7":
+ {
+ s = "鈮�";
+ }
+ break;
+ }
+ ///杞崲娓╁害鍊�/100
+ string srtValue = (int.Parse(conditions["AttriButeData1"]) / 100).ToString();
+ if (conditions["Cluster_ID"] == "1026")
+ {
+ icon = "ZigeeLogic/temperature.png";
+ state = s + srtValue + "鈩�";
+ }
+ else
+ {
+ icon = "ZigeeLogic/humidity.png";
+ state = s + srtValue + "%";
+ }
+ break;
+
+ }
+
+ }
+ }
+ break;
+ case 6:
+ {
+ switch (conditions["EnOrWithdrawMode"])
+ {
+ case "0":
+ {
+ if (conditions["ModeId"] == "1")
+ {
+ icon = "ZigeeLogic/athome.png";
+ name = Language.StringByID(MyInternationalizationString.logicathomegarrison);
+
+ }
+ else
+ {
+ icon = "ZigeeLogic/leavehome.png";
+ name = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
+ }
+ }
+ break;
+ case "1":
+ {
+ icon = "ZigeeLogic/withdrawal.png";
+ name = Language.StringByID(MyInternationalizationString.withdrawal);
+ }
+ break;
+ case "2":
+ {
+ icon = "ZigeeLogic/withdrawal.png";
+ name = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
+ }
+ break;
+ }
+ }
+ break;
+ case 7:
+ {
+ icon = "ZigeeLogic/position.png";
+ name = Language.StringByID(MyInternationalizationString.geographicalposition);
+ foreach (var radius in Common.Logic.CurrentLogic.Accounts)
+ {
+ if (radius["Type"] == "7")
+ {
+ if (conditions["AtHome"] == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.athome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.leavehome) + radius["Radius"] + Language.StringByID(MyInternationalizationString.mi);
+ }
+ }
+ }
+ }
+ break;
+ }
+ if (Type != 1)
+ {
+ selecteddevice.ordinaryBtn.Visible = true;
+ selecteddevice.iconBtn.UnSelectedImagePath = icon;
+ selecteddevice.ordinaryBtn.Text = name;
+ selecteddevice.selecetddevicestateBtn.Text = state;
+ }
+ else
+ {
+ //璁惧鐘舵��
+ selecteddevice.deviceNameBtn.Visible = true;
+ selecteddevice.iconBtn.UnSelectedImagePath = icon;
+ selecteddevice.deviceNameBtn.Text = name;
+ selecteddevice.selecetddevicestateBtn.Text = state;
+ }
+ ///缂栬緫
+ selecteddevice.edit.Tag = i.ToString();
+ selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
+ {
+ switch (Type)
+ {
+
+ /// (0:鏃堕棿鐐规潯浠�;1:璁惧鐘舵�佸彉鍖栨潯浠�;2:鍏朵粬閫昏緫鏉′欢;3:璁℃暟鍣ㄦ潯浠�;4:鍊掕鏃�;5:鏃堕棿娈垫潯浠�;6:瀹夐槻鏉′欢;7:鍦扮悊浣嶇疆)
+ case 0:
+ {
+ var timePoint = new TimePoint();
+ UserView.HomePage.Instance.AddChidren(timePoint);
+ UserView.HomePage.Instance.PageIndex += 1;
+ timePoint.IsEditor = true;
+ timePoint.Show(conditions);
+ }
+ break;
+ case 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();
+ }
+ break;
+ case 1:
+ {
+ var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
+ if (deviceinof.Type != DeviceType.DoorLock)
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ frameLayout.AddChidren(flMain);
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_logic",int.Parse(selecteddevice.edit.Tag.ToString()));
+ }
+ else
+ {
+ var memberList = new MemberList();
+ UserView.HomePage.Instance.AddChidren(memberList);
+ UserView.HomePage.Instance.PageIndex += 1;
+ MemberList.edit = true;
+ memberList.Show(deviceinof, conditions);
+ }
+ }
+ break;
+ case 6:
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ frameLayout.AddChidren(flMain);
+ AddLogicPage.SecurityView(flMain, true);
+ }
+ break;
+ case 7:
+ {
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ frameLayout.AddChidren(flMain);
+ AddLogicPage.LocationView(flMain, true);
+ }
+ break;
+ }
+ };
+ ///鍒犻櫎鎺т欢
+ selecteddevice.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.CurrentLogic.Conditions.Remove(conditions);
+ selecteddevice.selecetdFrameLayout.RemoveFromParent();
+ //var logicCommunalPage = new LogicCommunalPage();
+ //UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ //UserView.HomePage.Instance.PageIndex += 1;
+ //logicCommunalPage.Show(() => { });
+ };
+
+ };
+
+ }
+ }
+
+
+ }
+ /// <summary>
+ ///鏄剧ず閫昏緫鐩爣鐘舵�佺殑鏂规硶
+ /// </summary>
+ /// <param name="frameLayout">鐖舵帶浠�</param>
+ /// <param name="middle"></param>
+ /// <param name="ListActions">閫昏緫鐩爣鍒楄〃</param>
+ /// <param name="logicName">閫昏緫鍚嶇О</param>
+ public void Actions(FrameLayout frameLayout,VerticalScrolViewLayout middle, List<Dictionary<string, object>> ListActions, string logicName)
+ {
+
+ for (int i = 0; i < ListActions.Count; i++)
+ {
+ if (i == (ListActions.Count - 1))
+ {
+
+ LogicView.AddDeviceView addflview = new LogicView.AddDeviceView();
+ addflview.titleBtn.TextID = MyInternationalizationString.addfunction;
+ middle.AddChidren(addflview.AddFl());
+ addflview.clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Common.Logic.CurrentLogic.LogicName = logicName;
+ Method.View(LogicView.IfString.Action_Logic, LogicView.IfString.Action_LogicScene);
+ };
+ }
+ else
+ {
+
+ SelectedDeviceView actiondevice = new SelectedDeviceView();
+ actiondevice.Show(middle);
+ var linkType = int.Parse(ListActions[i]["LinkType"].ToString());
+ var actions = ListActions[i];
+ string name = "";
+ string icon = "";
+ string state = "";
+
+ switch (linkType)
+ {
+ case 0:
+ case 8:
+ {
+
+ var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
+ name = LocalDevice.Current.GetDeviceEpointName(deviceinof);
+ actiondevice.regionNameBtn.Visible = true;
+ Method.RoomNmae(actiondevice.regionNameBtn, deviceinof);
+ switch (deviceinof.Type)
+ {
+ case DeviceType.OnOffOutput:
+ {
+ icon = "ZigeeLogic/light.png";
+
+ var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (TaskList == null)
+ {
+ continue;
+ }
+ foreach (var status in TaskList)
+ {
+ if (status["TaskType"].ToString() == "1")
+ {
+ if (status["Data1"].ToString() == "0")
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+
+ }
+ else if (status["Data1"].ToString() == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.open);
+
+ }
+ else if (status["Data1"].ToString() == "2")
+ {
+
+ state = Language.StringByID(MyInternationalizationString.onoff);
+ }
+ }
+
+ }
+
+ }
+ break;
+ case DeviceType.DimmableLight:
+ {
+ icon = "ZigeeLogic/dimmableLight.png";
+ var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (TaskList == null)
+ {
+ continue;
+ }
+ foreach (var status in TaskList)
+ {
+ if (status["TaskType"].ToString() == "3")
+ {
+ var intvalue = int.Parse(status["Data1"]);
+ var lightbrightnessvalue = (intvalue * 100) / 254;
+ state = lightbrightnessvalue.ToString() + "%";
+ }
+ else if (status["TaskType"].ToString() == "1")
+ {
+
+ if (status["Data1"].ToString() == "0")
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+ }
+ else if (status["Data1"].ToString() == "2")
+ {
+ state = Language.StringByID(MyInternationalizationString.onoff);
+ }
+ }
+
+
+ }
+
+ }
+ break;
+ case DeviceType.WindowCoveringDevice:
+ {
+ icon = "ZigeeLogic/curtain.png";
+ var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (TaskList == null)
+ {
+ continue;
+ }
+ foreach (var status in TaskList)
+ {
+ if (status["TaskType"] == "6")
+ {
+ if (status["Data1"] == "0")
+ {
+ state = Language.StringByID(MyInternationalizationString.open);
+ }
+ else if (status["Data1"] == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+ }
+ else if (status["Data1"] == "5")
+ {
+ state = status["Data2"] + "%";
+ }
+ }
+
+ }
+ }
+ break;
+ case DeviceType.AirSwitch:
+ {
+ icon = "ZigeeLogic/airswitch.png";
+
+ var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (TaskList == null)
+ {
+ continue;
+ }
+ foreach (var status in TaskList)
+ {
+ if (status["TaskType"].ToString() == "1")
+ {
+ if (status["Data1"].ToString() == "0")
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+
+ }
+ else if (status["Data1"].ToString() == "1")
+ {
+ state = Language.StringByID(MyInternationalizationString.open);
+
+ }
+ else if (status["Data1"].ToString() == "2")
+ {
+
+ state = Language.StringByID(MyInternationalizationString.onoff);
+ }
+ }
+
+ }
+
+ }
+ break;
+ case DeviceType.Thermostat:
+ {
+ icon = "ZigeeLogic/ac.png";
+
+ var TaskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (TaskList == null)
+ {
+ continue;
+ }
+ string modetext = "", temperaturetext = "", speedtext = "";
+ bool ifclose = false;
+ foreach (var status in TaskList)
+ {
+
+ if (TaskList.Count == 1)
+ {
+ //鏁扮粍鍙湁涓�涓厓绱犺鏄庡綋鍓嶇┖璋冪姸鎬佷负鍏筹紱
+ ifclose = false;
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
+ }
+ else
+ {
+ ifclose = true;
+ }
+ if (status["TaskType"].ToString() == "5")
+ {
+ if (status["Data1"] == "3")
+ {//3---璁剧疆宸ヤ綔妯″紡(1:鑷姩;3:鍒跺喎;4:鍒剁儹;7:閫侀;8:闄ゆ箍)
+ switch (status["Data2"])
+ {
+ case "3":
+ {
+ modetext = Language.StringByID(MyInternationalizationString.logiccool);
+ }
+ break;
+ case "4":
+ {
+ modetext = Language.StringByID(MyInternationalizationString.logicheat);
+ }
+ break;
+ case "1":
+ {
+ modetext = Language.StringByID(MyInternationalizationString.logicauto);
+ }
+ break;
+ case "8":
+ {
+ modetext = Language.StringByID(MyInternationalizationString.logicdry);
+ }
+ break;
+ case "7":
+ {
+ modetext = Language.StringByID(MyInternationalizationString.logicfanonly);
+ }
+ break;
+ }
+ }
+ else if (status["Data1"] == "6")
+ {//6---璁剧疆椋庢墖妯″紡(1:浣庨;2:涓;3:楂橀;)
+ switch (status["Data2"])
+ {
+ case "1":
+ {
+ speedtext = Language.StringByID(MyInternationalizationString.logiclow);
+ }
+ break;
+
+ case "2":
+ {
+ speedtext = Language.StringByID(MyInternationalizationString.logicmedium);
+ }
+ break;
+ case "3":
+ {
+ speedtext = Language.StringByID(MyInternationalizationString.logichigh);
+ }
+ break;
+
+ }
+ }
+ //4---璁剧疆鍔犵儹搴︽暟;5---璁剧疆鍒跺喎銆侀櫎婀垮害鏁�;7---璁剧疆鑷姩搴︽暟
+ else if (status["Data1"] == "4" || status["Data1"] == "5" || status["Data1"] == "7")
+ {
+ var s = int.Parse(status["Data2"]) / 100;
+ temperaturetext = s.ToString();
+ }
+ else if (status["Data1"] == "20")
+ {
+ temperaturetext = "鏃�";
+ }
+
+
+ }
+
+ }
+ if (ifclose)
+ {
+ state = modetext + ";" + temperaturetext + "鈩�;" + speedtext;
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.close);
+
+ }
+ }
+ break;
+ case DeviceType.DoorLock:
+ {
+ //闂ㄩ攣鐗规畩
+ icon = "ZigeeLogic/doorlock.png";
+ if (actions["PassData"].ToString() == "055704010112")
+ {
+ state = Language.StringByID(MyInternationalizationString.logicopen);
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.logicclose);
+ }
+ }
+ break;
+ case DeviceType.ColorTemperatureLight:
+ {
+ icon = "ZigeeLogic/nightLight.png";
+ var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
+ if (taskList == null)
+ {
+ continue;
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+ case "1":
+ {
+ if (tasks["Data1"] == "0")
+ {
+ state += Language.StringByID(MyInternationalizationString.close) + ";";
+ }
+ else
+ {
+ state += Language.StringByID(MyInternationalizationString.open) + ";";
+ }
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "3":
+ {
+ var intvalue = int.Parse(tasks["Data1"]);
+ var lightbrightnessvalue = (intvalue * 100) / 254;
+ state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "7":
+ {
+ if (tasks["Data1"] == "0")
+ {
+ state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
+ }
+ else
+ {
+ state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
+ }
+ }
+ break;
+
+ }
+ }
+ foreach (var tasks in taskList)
+ {
+ switch (tasks["TaskType"])
+ {
+
+ case "8":
+ {
+ var intvalue = int.Parse(tasks["Data1"]);
+ var colorTemperatureValue = 1000000 / (intvalue * 100);
+ state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+ }
+ break;
+ }
+ }
+
+ state = state.TrimEnd(';');//鍘绘帀鏈�鍚庨偅涓�";"
+ }
+ break;
+ }
+
+ }
+ break;
+ case 2:
+ {
+ //鍦ㄦ湰鍦版煡鎵捐鍦烘櫙;
+ var sceneinof = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(Convert.ToInt32(actions["DeviceAddr"].ToString()));
+ //鏈湴娌℃湁瀛樺湪;
+ if (sceneinof == null)
+ {
+ //瀹炵幇鐩殑:鏄剧ず鍑烘潵璁╁彲浠ヨ嚜宸辨槸鍚﹀垹闄�
+ sceneinof = new SceneUI();
+ #region --------
+ ////鍦ㄧ綉鍏虫煡鎵捐鍦烘櫙;
+ ////鏍囪闂:缃戠粶璇锋眰锛屽瓨鍦ㄨ鍥惧姞杞藉揩鎱㈢殑闂锛�
+ //sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
+ ////缃戝叧娌℃湁瀛樺湪;
+ //if (sceneinof == null)
+ //{
+ // //娉ㄨВ:鏈湴鍜岀綉鍏抽兘涓嶅瓨鍦ㄨ鍦烘櫙,鐣岄潰灏嗕笉浼氭樉绀鸿鍦烘櫙;
+ // //sceneinof = new SceneUI();
+ // //绉婚櫎璇ュ満鏅暟鎹�;
+ // Common.Logic.CurrentLogic.Actions.Remove(actions);
+ // //绉婚櫎璇ュ満鏅鍥�;
+ // devicesFrameLayout.RemoveFromParent();
+ // continue;
+ //}
+ #endregion
+ }
+
+ icon = "ZigeeLogic/scene.png";
+ name = sceneinof.Name;
+ actiondevice.regionNameBtn.Visible = true;
+ /////閫氳繃璁惧鎵惧埌鍖哄煙(鎴块棿)鍚嶇О
+ Common.Room room = new Common.Room();
+ actiondevice.regionNameBtn.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameBySceneId(sceneinof.Id);
+
+ }
+ break;
+ case 6:
+ {
+
+
+
+ if (actions["SecuritySetting"].ToString() == "0")
+ {
+ if (actions["Password"].ToString() == "888888")
+ {
+ icon = "ZigeeLogic/withdrawal.png";
+ state = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
+ }
+ else
+ {
+ icon = "ZigeeLogic/withdrawal.png";
+ state = Language.StringByID(MyInternationalizationString.withdrawal);
+
+ }
+ }
+ else if (actions["SecuritySetting"].ToString() == "1")
+ {
+ if (actions["SecurityModeId"].ToString() == "1")
+ {
+ icon = "ZigeeLogic/athome.png";
+ state = Language.StringByID(MyInternationalizationString.logicathomegarrison);
+ }
+ else if (actions["SecurityModeId"].ToString() == "2")
+ {
+ icon = "ZigeeLogic/leavehome.png";
+ state = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
+ }
+ }
+
+ }
+ break;
+ case 7:
+ {
+ var delaytimevalue = int.Parse(actions["DelayTime"].ToString());
+ var Minutes = delaytimevalue / 60;
+ var seconds = delaytimevalue % 60;
+
+ icon = "ZigeeLogic/delay.png";
+
+ if (Minutes != 0)
+ {
+ if (seconds == 0)
+ {
+ state = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute);
+ }
+ else
+ {
+ state = Minutes.ToString() + Language.StringByID(MyInternationalizationString.minute) + seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
+ }
+ }
+ else
+ {
+ state = seconds.ToString() + Language.StringByID(MyInternationalizationString.second);
+ }
+ //璁板綍寤舵椂锛�
+ actiondevice.edit.Tag = i;
+ };
+ break;
+ }
+
+ if (linkType != 2)
+ {
+ actiondevice.stateRow.AddRightView(actiondevice.edit);
+ }
+ actiondevice.stateRow.AddRightView(actiondevice.del);
+
+ if (linkType == 6 || linkType == 7)
+ {
+ actiondevice.ordinaryBtn.Visible = true;
+ actiondevice.iconBtn.UnSelectedImagePath = icon;
+ actiondevice.ordinaryBtn.Text = name;
+ actiondevice.selecetddevicestateBtn.Text = state;
+ }
+ else
+ {
+ //璁惧鐘舵��
+ actiondevice.deviceNameBtn.Visible = true;
+ actiondevice.iconBtn.UnSelectedImagePath = icon;
+ actiondevice.deviceNameBtn.Text = name;
+ actiondevice.selecetddevicestateBtn.Text = state;
+ }
+ ///缂栬緫
+ actiondevice.edit.Tag = i.ToString();
+ actiondevice.edit.MouseUpEventHandler += (sender, e) =>
+ {
+ switch (linkType)
+ {
+ case 8:
+ case 0:
+ {
+ var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ frameLayout.AddChidren(flMain);
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic", int.Parse(actiondevice.edit.Tag.ToString()));
+ }
+ break;
+ case 6:
+ {
+ var securityMode = new SecurityMode();
+ UserView.HomePage.Instance.AddChidren(securityMode);
+ UserView.HomePage.Instance.PageIndex += 1;
+ securityMode.IsDeviceEditor = true;
+ securityMode.Show();
+ }
+ break;
+ case 7:
+ {
+ var delayTime = new DelayTime();
+ UserView.HomePage.Instance.AddChidren(delayTime);
+ UserView.HomePage.Instance.PageIndex += 1;
+ delayTime.Show(int.Parse(actiondevice.edit.Tag.ToString()), true);
+ }
+ break;
+
+ }
+ };
+ ///鍒犻櫎鎺т欢
+ actiondevice.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.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(() => { });
+ };
+
+ };
+
+
+ }
+ }
+
+
+ }
+ /// <summary>
+ /// 涓庢垨鏉′欢甯冨眬鐣岄潰鐨勬柟娉�
+ /// </summary>
+ /// <param name="edit"></param>
+ /// <param name="frameLayout"></param>
+ public void ConditionView(bool edit, FrameLayout frameLayout)
+ {
+
+ #region ------缁勫悎鏉′欢鐣岄潰甯冨眬閮ㄥ垎
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+ frameLayout.AddChidren(flMain);
+ CompleteView completeView = new CompleteView();
+ flMain.AddChidren(completeView.Show(2));
+ completeView.Btntitle.TextID = MyInternationalizationString.condition;
+ EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
+ {
+ UserView.HomePage.Instance.ScrollEnabled = true;
+ flMain.RemoveFromParent();
+ };
+ flMain.MouseUpEventHandler += clickcancel;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
+
+ //婊¤冻鎵�鏈夋潯浠�
+ mFunView allFunView = new mFunView();
+ allFunView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+ completeView.Show(2).AddChidren(allFunView.Show());
+ allFunView.titleBtn.TextID = MyInternationalizationString.Allconditions;
+ //婊¤冻鍏朵腑涓�涓潯浠�
+ mFunView ormFunview = new mFunView();
+ ormFunview.frameLayout.Y = allFunView.frameLayout.Bottom;
+ completeView.Show(2).AddChidren(ormFunview.Show());
+ ormFunview.titleBtn.TextID = MyInternationalizationString.anycondition;
+ ormFunview.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ #endregion
+
+ ///婊¤冻鎵�鏈夋潯浠剁偣鍑讳簨浠�
+ allFunView.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
+ {
+ allFunView.selectedIconBtn.Visible = true;
+ ormFunview.selectedIconBtn.Visible = false;
+ allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ };
+ ///婊¤冻鍏朵腑涓�涓潯浠剁偣鍑讳簨浠�
+ ormFunview.clickviewBtn.MouseUpEventHandler += (sedner, e) =>
+ {
+ allFunView.selectedIconBtn.Visible = false;
+ ormFunview.selectedIconBtn.Visible = true;
+ allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ };
+
+ if (edit)
+ {
+ if (Common.Logic.CurrentLogic.Relationship == 0)
+ {
+ allFunView.selectedIconBtn.Visible = true;
+ ormFunview.selectedIconBtn.Visible = false;
+ allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ }
+ else
+ {
+ allFunView.selectedIconBtn.Visible = false;
+ ormFunview.selectedIconBtn.Visible = true;
+ allFunView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ ormFunview.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+ }
+ }
+ completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
+ {
+ if (!allFunView.selectedIconBtn.Visible && !ormFunview.selectedIconBtn.Visible)
+ {
+ ///鍙互鎻愮ず鏈�変腑鐘舵�侊紱
+ return;
+ }
+ flMain.RemoveFromParent();
+
+ if (allFunView.selectedIconBtn.Visible)
+ {
+ Common.Logic.CurrentLogic.Relationship = 0;
+
+ }
+ if (ormFunview.selectedIconBtn.Visible)
+ {
+ Common.Logic.CurrentLogic.Relationship = 1;
+
+ }
+ if (edit)
+ {
+ if (Common.Logic.CurrentLogic.LogicId != 0)
+ {
+ Send.LogicControlSwitch(Common.Logic.CurrentLogic);
+ }
+ var logicCommunalPage = new LogicCommunalPage();
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
+ }
+ else
+ {
+ var addLogicPage = new AddLogicPage();
+ UserView.HomePage.Instance.AddChidren(addLogicPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ addLogicPage.Show();
+ }
+ };
+
+ }
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index a893a4a..fd74126 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -41,6 +41,25 @@
}
}
+ else if (common.Type == DeviceType.IASZone)
+ {
+ var iASZonedevice = common as IASZone;
+ if (iASZonedevice.IasDeviceType == 541)
+ {//鐞冨舰绉诲姩浼犳劅鍣�
+ if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == objecttype["Cluster_ID"])
+ {
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+ }
+ continue;
+ }
+
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, objecttype);
+ return;
+
+ }
else
{
Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
@@ -187,8 +206,7 @@
/// <summary>
/// 娣诲姞瀹夐槻杈撳嚭鐨勬柟娉�
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">actionsInfo.</param>
public static void AddSecurityactions(Dictionary<string, object> actionsInfo)
{
for (int i = 0; i < Common.Logic.CurrentLogic.Actions.Count; i++)
@@ -206,8 +224,8 @@
/// <summary>
/// 娣诲姞鑷姩鍖栬緭鍑虹殑鏂规硶
/// </summary>
- /// <param name="objecttype">Objecttype.</param>
- /// <param name="o">O.</param>
+ /// <param name="actionsInfo">Objecttype.</param>
+ /// <param name="logic">logic</param>
public static void AddLogicactions(Common.Logic logic, Dictionary<string, object> actionsInfo)
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 8383026..5ce1f29 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -22,7 +22,7 @@
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
- view.toptitleNameBtn.Text = Name;
+ view.toptitleNameBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -270,10 +270,10 @@
Send.dictionary(brightnessDictionary, "Data2", "0");
var horizontalSeekBarVol = new DiyImageSeekBar
{
- Y = Application.GetRealHeight(140),
- X = Application.GetRealWidth(78),
- Width = Application.GetRealWidth(918),
- Height = Application.GetRealHeight(320),//婊戝姩鏉＄埗鎺т欢楂樺害
+ Y = Application.GetRealHeight(140),//杩涘害鏉＄埗鎺т欢Y鍧愭爣
+ X = Application.GetRealWidth(78),//杩涘害鏉鍧愭爣
+ Width = Application.GetRealWidth(918),//杩涘害鏉＄殑闀垮害
+ Height = Application.GetRealHeight(320),//杩涘害鏉＄埗鎺ф帶浠堕珮搴�
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index feab18b..d07e6d8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -380,6 +380,7 @@
/// <param name="devicelist">璁惧鍒楄〃</param>
void ConditionDeviceView(List<DeviceType> deviceTypelist, List<CommonDevice> devicelist)
{
+
middle.RemoveAll();
foreach (var common in devicelist)
{
@@ -459,7 +460,7 @@
devicename.IsSelected = true;
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
+ CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType,0);
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
@@ -468,6 +469,6 @@
devicename.MouseUpEventHandler += devicclick;
}
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index da81d33..26c0e85 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -872,7 +872,7 @@
{
//鏈嶅姟杩斿洖鏉ユ病鏈夐棬閿佹垚鍛樹俊鎭紝娌℃湁蹇呰鍐嶅幓璇锋眰鎴愬憳鍒楄〃锛�
//鍘熷洜锛氳妭绾︽椂闂达紝浣撻獙鏁堟灉濂斤紱
- result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+ result = UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
}
if (string.IsNullOrEmpty(result))
{
@@ -1236,12 +1236,16 @@
/// <param name="method">璇锋眰鏂瑰紡涓篜OST/GET</param>
/// <param name="second">瓒呮椂鏃堕棿</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3)
+ public static async System.Threading.Tasks.Task<string> HttpWebRequest(string getUrl, string str, string method, int second = 3, bool _bool = false)
{
HttpWebRequest request = WebRequest.Create(getUrl) as HttpWebRequest; //鍒涘缓璇锋眰
request.Method = method; //璇锋眰鏂瑰紡涓篜OST/GET
- request.ContentType = "application/json";
+ request.ContentType = "application/json";
request.Timeout = second * 1000;//瓒呮椂鏃堕棿
+ if (_bool) {
+ //鐢ㄤ簬楂樿儨鍙瀵硅鎺ュ彛
+ request.Headers.Add("Authorization", Config.Instance.Token);
+ }
if (method == "POST")
{
byte[] jsonbyte = System.Text.Encoding.UTF8.GetBytes(str);
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 1c7f1b2..0f5a797 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -64,6 +64,7 @@
}
#region 鈼� 鑷姩鍖朹_________________________
+ public static bool If_once = true;//杩涙潵鍙涓�娆℃爣璇�;
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
/// </summary>
@@ -241,6 +242,7 @@
if (!Config.Instance.Home.IsVirtually)
{//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
//閲嶆柊鍒锋柊logic鍒楄〃
+ If_once = true;
Common.Logic.LogicList.Clear();
Read(logicScrolView, no);
}
@@ -271,35 +273,39 @@
{
if (!Config.Instance.Home.IsVirtually)//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
{
- 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);
- }
+ if (If_once)
+ {
+ if (Common.Logic.LogicList.Count == 0)
+ {
+ If_once = false;
+ 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);
+ }
+ }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index 2d5b82d..b3aa415 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -270,14 +270,15 @@
}
break;
}
-
+
///缂栬緫
+ selecteddevice.edit.Tag = i.ToString();
selecteddevice.edit.MouseUpEventHandler += (sender, e) =>
{
var deviceinof = Method.GetCommonDevice(conditions["MacAddr"], conditions["Epoint"]);
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould");
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "condition_mould", int.Parse(selecteddevice.edit.Tag.ToString()));
};
///鍒犻櫎鎺т欢
@@ -403,11 +404,13 @@
break;
}
///缂栬緫
+
+ actiondevice.edit.Tag = i;
actiondevice.edit.MouseUpEventHandler += (sender, e) => {
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould");
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_mould",int.Parse(actiondevice.edit.Tag.ToString()));
};
///鍒犻櫎鎺т欢
actiondevice.del.MouseUpEventHandler += (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
new file mode 100755
index 0000000..070ceac
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -0,0 +1,275 @@
+锘縰sing System;
+using Newtonsoft.Json.Linq;
+using Shared.Common;
+using System.Collections.Generic;
+using Shared.Phone.Device.Logic;
+
+namespace Shared.Phone.Device.VideoIntercom
+{
+ public class VideoMachine : FrameLayout
+ {
+ public VideoMachine()
+ {
+ }
+ public void Show(List<VideoCalss> videoInfosLists)
+ {
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = R.MyInternationalizationString.videoIntercom;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+
+ var middle = new VerticalRefreshLayout
+ {
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(Method.H - 184),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+ };
+ this.AddChidren(middle);
+
+ for (int i = 0; i < videoInfosLists.Count; i++)
+ {
+ var videoInfos = videoInfosLists[i];
+ var fLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(160),
+ BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ };
+ middle.AddChidren(fLayout);
+ var iconBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
+ X = Application.GetRealWidth(58),
+ Y = Application.GetRealHeight(55),
+ UnSelectedImagePath = "Item/videoIntercom.png",
+ };
+ fLayout.AddChidren(iconBtn);
+ var nameBtn = new Button
+ {
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+ Y = Application.GetRealHeight(30),
+ X = Application.GetRealWidth(176),
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(400),
+ Text = videoInfos.DeviceName,
+ };
+ fLayout.AddChidren(nameBtn);
+
+ var name1Btn = new Button
+ {
+ Text = videoInfos.RoomName,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ TextSize = 12,
+ Y = nameBtn.Bottom + Application.GetRealHeight(3),
+ X = Application.GetRealWidth(176),
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(400),
+ };
+ fLayout.AddChidren(name1Btn);
+
+ var nextBtn = new Button
+ {
+ Width = Application.GetMinRealAverage(104),
+ Height = Application.GetMinRealAverage(104),
+ UnSelectedImagePath = "Item/videoIntercomNext.png",
+ X = Application.GetRealWidth(743 + 176),
+ Y = Application.GetRealHeight(30),
+ };
+ fLayout.AddChidren(nextBtn);
+
+ var lineBtn = new Button
+ {
+ Width = Application.GetRealWidth(845),
+ Height = 1,
+ Y = fLayout.Height - 1,
+ X = Application.GetRealWidth(176),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ };
+ fLayout.AddChidren(lineBtn);
+ var clickBtn = new Button
+ {
+ Height = Application.GetRealHeight(160),
+ };
+ fLayout.AddChidren(clickBtn);
+
+ clickBtn.MouseUpEventHandler += (sen, e) =>
+ {
+#if iOS
+ GateWay.Ios.ESVideoInfo eSVideoInfo = new GateWay.Ios.ESVideoInfo();
+ eSVideoInfo.DeviceName = videoInfos.DeviceName;
+ eSVideoInfo.ESVideoUUID = videoInfos.ESVideoUUID;
+ eSVideoInfo.ESRoomID = videoInfos.ESRoomID;
+ eSVideoInfo.RoomName = videoInfos.RoomName;
+ GateWay.Ios.ESVideo.ShowESVideoMonitor(eSVideoInfo);
+#elif Android
+
+#endif
+ };
+
+ }
+
+ }
+ /// <summary>
+ /// 鍒ゆ柇璐﹀彿鏄惁鏀寔鍙瀵硅
+ /// </summary>
+ /// <param name="topFrameLayout"></param>
+ public async static void AccountSupportVideo(FrameLayout topFrameLayout)
+ {
+ var jobject = new JObject();
+ jobject.Add("RequestVersion", CommonPage.RequestVersion);
+ jobject.Add("RequestSource", "0");
+ jobject.Add("HomeID", Config.Instance.HomeId);
+ var url = "https://developer.hdlcontrol.com/ProposedProductionApi/VideoIntercom/CheckBindRecord";
+ var str = await Send.HttpWebRequest(url, jobject.ToString(), "POST", 3, true);
+ if (!string.IsNullOrEmpty(str))
+ {
+ try
+ {
+ var json = JObject.Parse(str);
+ if (json != null)
+ {
+ var stateCode = json["StateCode"].ToString();
+ //鍙瀵硅蹇嵎鏂瑰紡
+ var videoIntercomBtn = new Button();
+ videoIntercomBtn.Gravity = Gravity.CenterVertical;
+ videoIntercomBtn.UnSelectedImagePath = "Item/videoIntercom.png";
+ videoIntercomBtn.Width = Application.GetMinRealAverage(69);
+ videoIntercomBtn.Height = Application.GetMinRealAverage(69);
+ List<VideoCalss> videoList= new List<VideoCalss>();
+ if (stateCode == "Success")
+ {//鍒ゆ柇杩欎釜璐﹀彿鏄惁缁戝畾;
+ topFrameLayout.AddChidren(videoIntercomBtn);
+ CloudsVideo cloudsVideo = Newtonsoft.Json.JsonConvert.DeserializeObject<CloudsVideo>(json["ResponseData"].ToString());
+ videoList = await GetVideoInfoList(cloudsVideo);
+ }
+ if (UserCenter.UserCenterResourse.ResidenceOption.SafetyShortcut)
+ {
+ videoIntercomBtn.X = Application.GetRealWidth(746 + 10);
+ }
+ else
+ {
+ videoIntercomBtn.X = Application.GetRealWidth(850 + 10);
+ }
+ videoIntercomBtn.MouseUpEventHandler += (sender, e) =>
+ {
+
+ var videoMachine = new Device.VideoIntercom.VideoMachine();
+ UserView.HomePage.Instance.AddChidren(videoMachine);
+ UserView.HomePage.Instance.PageIndex += 1;
+ videoMachine.Show(videoList);
+
+ };
+ }
+ }
+ catch { }
+ }
+
+
+
+ }
+ /// <summary>
+ /// 鑾峰彇鍙瀵硅鍒楄〃
+ /// </summary>
+ static async System.Threading.Tasks.Task<List<VideoCalss>> GetVideoInfoList(CloudsVideo clouds)
+ {
+ List<VideoCalss> eSVideoInfosList = new List<VideoCalss>();
+ var jobject = new JObject();
+ jobject.Add("cmtID", clouds.FLCommunityID);
+ jobject.Add("unitno", clouds.FLBuildingID);
+ jobject.Add("method", "getUUIDList");
+ var url = " http://112.74.164.111:180/api.php/Device/getmonitorUUID";
+ var str = await Send.HttpWebRequest(url, jobject.ToString(), "POST");
+ if (string.IsNullOrEmpty(str))
+ {
+ return eSVideoInfosList;
+ }
+ var json = JObject.Parse(str);
+ if (json == null)
+ {
+ return eSVideoInfosList;
+ }
+ if (json["resCode"].ToString() != "0")
+ {
+ return eSVideoInfosList;
+ }
+ var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Dictionary<string, string>>>(json["list"].ToString());
+ if (list.Count == 0)
+ {
+ return eSVideoInfosList;
+ }
+ foreach (var videoInfo in list)
+ {
+ VideoCalss eSVideoInfo = new VideoCalss();
+ eSVideoInfo.ESRoomID = int.Parse(clouds.FLRoomID);
+ string str1 = clouds.FLBuildingID.Substring(0, 2).TrimStart('0');
+ string str2 = clouds.FLBuildingID.Substring(2, 2).TrimStart('0');
+ eSVideoInfo.RoomName = str1 +Language.StringByID( R.MyInternationalizationString.dong) + str2 + Language.StringByID(R.MyInternationalizationString.unit);
+ eSVideoInfo.DeviceName = videoInfo["aliasName"];
+ if (videoInfo["uuid"].Contains(","))
+ {
+ var uuid = videoInfo["uuid"].Split(',');
+ eSVideoInfo.ESVideoUUID = uuid[0];
+ }
+ else
+ {
+ eSVideoInfo.ESVideoUUID = videoInfo["uuid"];
+ }
+ eSVideoInfosList.Add(eSVideoInfo);
+ }
+ return eSVideoInfosList;
+ }
+ }
+ public class VideoCalss
+ {
+ /// <summary>
+ /// 瀹ゅ鏈虹殑UUID
+ /// 渚嬶細JJY000007FSEYX
+ /// </summary>
+ public string ESVideoUUID = string.Empty;
+ /// <summary>
+ /// 褰撳墠鐢ㄦ埛鐨勬埧闂碔D
+ /// 渚嬶細0801
+ /// </summary>
+ public int ESRoomID;
+ /// <summary>
+ /// 瀹ゅ鏈虹殑鍚嶇О
+ /// 渚嬶細瀹ゅ鏈�
+ /// </summary>
+ public string DeviceName = string.Empty;
+ /// <summary>
+ /// 鎴块棿鍛藉悕
+ /// 渚嬶細8鏍�1鍗曞厓0801
+ /// </summary>
+ public string RoomName = string.Empty;
+
+ }
+ public class CloudsVideo
+ {
+ /// <summary>
+ /// 鏍嬫ゼ鍗曞厓鍙�
+ /// </summary>
+ public string FLBuildingID = string.Empty;
+ /// <summary>
+ /// 閭ｆ爧妤肩殑鍚嶇О
+ /// </summary>
+ public string FLBuildingName = string.Empty;
+ /// <summary>
+ /// 灏忓尯ID
+ /// </summary>
+ public string FLCommunityID = string.Empty;
+ /// <summary>
+ /// 鎴块棿ID
+ /// </summary>
+ public string FLRoomID = string.Empty;
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeID = string.Empty;
+
+ public string FLSecretKey = string.Empty;
+
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs b/ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs
index cab0428..60b0ace 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountForgetPWD.cs
@@ -286,7 +286,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
- private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
+ private void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
if (CheckAccount(account) == false)
{
@@ -313,7 +313,7 @@
AreaCode = int.Parse(CommonPage.PhoneZoneStr),
Language = CommonPage.ZigBeeLanguage
};
- var requestRevertObj = await CommonFormResouce.LoginSendVerCode(reqDto);
+ var requestRevertObj = CommonFormResouce.LoginSendVerCode(reqDto);
if (requestRevertObj == null)
{
errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
@@ -396,7 +396,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
- private async void Reset(object sender,MouseEventArgs mouseEventArgs)
+ private void Reset(object sender,MouseEventArgs mouseEventArgs)
{
if (CheckAccount(account) == false)
@@ -426,7 +426,7 @@
Language = CommonPage.ZigBeeLanguage
};
//楠岃瘉楠岃瘉鐮�
- var requestRevertObj = await CommonFormResouce.ValidatorCode(reqDto);
+ var requestRevertObj = CommonFormResouce.ValidatorCode(reqDto);
if (requestRevertObj == null)
{
CommonPage.Instance.FailureToServer();
@@ -443,7 +443,7 @@
AreaCode = int.Parse(CommonPage.PhoneZoneStr),
AgainPassword = pwdComfireRow.PasswrodET.Text.Trim()
};
- var revertObj = await CommonFormResouce.ResetPassword(reqREPWD);
+ var revertObj = CommonFormResouce.ResetPassword(reqREPWD);
if (revertObj == null)
{
CommonPage.Instance.FailureToServer();
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index e0fe24b..a70a48b 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -557,7 +557,7 @@
btnSendCode.TextAlignment = TextAlignment.Center;
btnSendCode.IsBold = true;
rowVerCode.AddChidren(btnSendCode);
- btnSendCode.ButtonClickEvent += async (sender, e) =>
+ btnSendCode.ButtonClickEvent += (sender, e) =>
{
//妫�娴嬭緭鍏ョ殑璐﹀彿
nowInputAccount = txtAccount.Text.Trim();
@@ -566,7 +566,7 @@
return;
}
//鍙戦�侀獙璇佺爜
- hadSendCode = await this.SendVerCode(btnSendCode, nowInputAccount, i_div);
+ hadSendCode = this.SendVerCode(btnSendCode, nowInputAccount, i_div);
};
//搴曠嚎
@@ -753,7 +753,7 @@
//鐧婚檰涓�....
CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鐧婚檰鍙傛暟
var pra = new SendDataToServer.LoginObj();
@@ -764,7 +764,7 @@
//璁块棶鎺ュ彛
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
- var result = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var result = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));
//澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹�
this.AdjustLoginSuccessData(result, pra, i_account, i_psw, i_div);
@@ -830,10 +830,10 @@
{
return;
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鏄惁宸茬粡缁戝畾
- var re = await isBindAuthAsync(authStr);
+ var re = isBindAuthAsync(authStr);
if (re)
{
Application.RunOnMainThread(() =>
@@ -841,14 +841,14 @@
//鐩存帴鐧诲綍
HomePage.Instance.ShowLoginLoadView();
});
- var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
- var homes = await HdlResidenceLogic.Current.GetHomeListsFromDb();
+ var resultRegID = Shared.Common.CommonPage.Instance.PushRegID();
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
this.RemoveFromParent();
CommonPage.Instance.RemoveViewByTag("Login");
@@ -858,7 +858,7 @@
else
{
var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
var registerPage = new AccountRegister();
CommonPage.Instance.AddChidren(registerPage);
@@ -875,7 +875,7 @@
/// </summary>
/// <param name="authStr"></param>
/// <returns></returns>
- private async System.Threading.Tasks.Task<bool> isBindAuthAsync(string authStr)
+ private bool isBindAuthAsync(string authStr)
{
var authRes = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.AuthUserRes>(authStr);
var auth = new SendDataToServer.AuthUser()
@@ -887,7 +887,7 @@
//鑾峰彇寰俊鏄电О
var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + authRes.access_token;
strUrl += "&openid=" + authRes.openid;
- var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
if (byteData == null)
{
return false;
@@ -897,7 +897,7 @@
auth.UserName = nickData.nickname;
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/InsertOrUpdateAuthUser", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (revertObj == null)
{
return false;
@@ -932,18 +932,24 @@
/// <param name="i_account">璐﹀彿</param>
/// <param name="i_verCode">楠岃瘉鐮�</param>
/// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
- private async void LoginByVerCode(string i_account, string i_verCode, int i_div)
+ private void LoginByVerCode(string i_account, string i_verCode, int i_div)
{
- var pra = new SendDataToServer.LoginValidCodeOBJ()
+ //鐧婚檰涓�....
+ CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
+
+ HdlThreadLogic.Current.RunThread(() =>
{
- Account = i_account,
- Code = i_verCode,
- Language = CommonPage.ZigBeeLanguage,
- AreaCode = int.Parse(CommonPage.PhoneZoneStr)
- };
- var result = await CommonFormResouce.LoginByCode(pra);
- //澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹�
- this.AdjustLoginSuccessData(result, pra, i_account, string.Empty, i_div);
+ var pra = new SendDataToServer.LoginValidCodeOBJ()
+ {
+ Account = i_account,
+ Code = i_verCode,
+ Language = CommonPage.ZigBeeLanguage,
+ AreaCode = int.Parse(CommonPage.PhoneZoneStr)
+ };
+ var result = CommonFormResouce.LoginByCode(pra);
+ //澶勭悊鐧婚檰鎴愬姛鐨勬暟鎹�
+ this.AdjustLoginSuccessData(result, pra, i_account, string.Empty, i_div);
+ });
}
/// <summary>
@@ -953,7 +959,7 @@
/// <param name="account">璐﹀彿</param>
/// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
/// <returns></returns>
- private async System.Threading.Tasks.Task<bool> SendVerCode(NormalViewControl btnSendCode, string account, int i_div)
+ private bool SendVerCode(NormalViewControl btnSendCode, string account, int i_div)
{
//涓嶈兘鍐嶇偣鍑�
btnSendCode.CanClick = false;
@@ -974,7 +980,7 @@
AreaCode = int.Parse(CommonPage.PhoneZoneStr),
Language = CommonPage.ZigBeeLanguage
};
- var requestRevertObj = await CommonFormResouce.LoginSendVerCode(reqDtoSignPhone);
+ var requestRevertObj = CommonFormResouce.LoginSendVerCode(reqDtoSignPhone);
if (requestRevertObj == null)
{
//璇锋眰鏈嶅姟鍣ㄥけ璐�
@@ -1068,7 +1074,7 @@
/// <param name="i_account">璐﹀彿</param>
/// <param name="i_psw">瀵嗙爜锛岄獙璇佺爜鐧婚檰鏃�,璁剧疆涓� string.Empty</param>
/// <param name="i_div">1:鎵嬫満鍙� 2:閭</param>
- private async void AdjustLoginSuccessData(Common.ResponseEntity.ResponsePack revertObj, object pra,
+ private void AdjustLoginSuccessData(Common.ResponseEntity.ResponsePack revertObj, object pra,
string i_account, string i_psw, int i_div)
{
if (revertObj == null)
@@ -1104,10 +1110,10 @@
Config.Instance.LoginToken = revertData.Token;
Config.Instance.Save();
- var resultRegID = await CommonPage.Instance.PushRegID();
- var homes = await HdlResidenceLogic.Current.GetHomeListsFromDb();
+ var resultRegID = CommonPage.Instance.PushRegID();
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread();
+ UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
index 13b39cb..31ad343 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
@@ -265,7 +265,7 @@
/// </summary>
/// <param name="sender">Sender.</param>
/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
- private async void Register(object sender, MouseEventArgs mouseEventArgs)
+ private void Register(object sender, MouseEventArgs mouseEventArgs)
{
if (CheckAccount(account) == false)
{
@@ -297,7 +297,7 @@
AreaCode = int.Parse(CommonPage.PhoneZoneStr)
};
//楠岃瘉楠岃瘉鐮�
- var requestRevertObj = await CommonFormResouce.Register(reqDto);
+ var requestRevertObj = CommonFormResouce.Register(reqDto);
if (requestRevertObj == null)
{
CommonPage.Instance.FailureToServer();
@@ -415,7 +415,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="mouseEventArgs"></param>
- private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
+ private void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
{
if (CheckAccount(account) == false)
{
@@ -454,7 +454,7 @@
AreaCode = int.Parse(CommonPage.PhoneZoneStr),
Language = CommonPage.ZigBeeLanguage
};
- var requestRevertObj = await CommonFormResouce.RegisterSendVerCode(reqDto);
+ var requestRevertObj = CommonFormResouce.RegisterSendVerCode(reqDto);
if (requestRevertObj == null)
{
CommonPage.Instance.FailureToServer();
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
index d23f24b..38323c9 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
@@ -101,21 +101,21 @@
HomePage.Instance.ShowLoginLoadView();
CommonPage.Loading.Start(Language.StringByID(R.MyInternationalizationString.Logining));
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//璐﹀彿瀵嗙爜鐧婚檰
- var loginSuccess = await HomePage.Instance.LoginByPWDAsync(account, password);
+ var loginSuccess = HomePage.Instance.LoginByPWDAsync(account, password);
if (loginSuccess == 1)
{
if (string.IsNullOrEmpty(OpenID) == false)
{
//缁戝畾绗笁鏂�
- await BindAuthUser(Config.Instance.Guid, OpenID);
+ BindAuthUser(Config.Instance.Guid, OpenID);
}
- var homes = await HdlResidenceLogic.Current.GetHomeListsFromDb();
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread();
+ UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
@@ -153,14 +153,14 @@
/// </summary>
/// <param name="guid"></param>
/// <param name="openId"></param>
- private async System.Threading.Tasks.Task BindAuthUser(string guid, string openId)
+ private void BindAuthUser(string guid, string openId)
{
var auth = new SendDataToServer.BindAuthUser();
auth.AccountGuid = guid;
auth.OpenID = openId;
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(auth);
- await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
+ CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/BindAuthUserToAccount", Encoding.UTF8.GetBytes(requestJson));
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
index c3889ad..b87c37b 100755
--- a/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Login/Logic/AccountLogic.cs
@@ -115,7 +115,7 @@
Latitude = lat
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = RequestHttpsZigbeeAsync("ProcessRange/ReceiveAppLatAndLon", System.Text.Encoding.UTF8.GetBytes(requestJson));
}
catch { }
}
@@ -127,9 +127,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
+ public Shared.Common.ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
{
- string result = await RequestHttpsZigbeeResultAsync(requestUrl, byteData);
+ string result = RequestHttpsZigbeeResultAsync(requestUrl, byteData);
if (result != null)
{
try
@@ -152,9 +152,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<string> RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
+ public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
{
- var result = await RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
+ var result = RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
if (result != null)
{
return Encoding.UTF8.GetString(result);
@@ -170,12 +170,12 @@
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
+ public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST")
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var requestHost = "https://global.hdlcontrol.com/GeofenceService";
var fullUrl = $"{requestHost}/{requestUrl}";
- return await CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
+ return CommonPage.Instance.DoRequestZigbeeHttpsInterface(fullUrl, byteData, Config.Instance.Token, requestMethod);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Login/PhoneZone.cs b/ZigbeeApp/Shared/Phone/Login/PhoneZone.cs
deleted file mode 100755
index 13a0844..0000000
--- a/ZigbeeApp/Shared/Phone/Login/PhoneZone.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using Shared.Common;
-
-namespace Shared.Phone.Device.Login
-{
- public class PhoneZone : UserCenter.FrameLayoutBase
- {
- #region 鈼� 鍙橀噺____________________________
- /// <summary>
- /// 閫夋嫨鐨勫尯鍙�
- /// </summary>
- public Action<string> ActionSelectedZone;
- /// <summary>
- /// *****鍗囩骇鍒嗗竷寮忓悗锛孉ccount 浠呭寘鍚墜鏈哄彿锛屼笉鍐嶅寘鍚�00鍖哄彿銆傚瘑鐮佷笉鍐嶉渶瑕丮D5鍔犲瘑銆俵anguage涓篈PP璇�
- /// 涓嬫潵閫夋嫨鎵嬫満鍖哄彿 榛樿涓浗澶ч檰涓�86
- ///鍙戦�佸浗闄� / 娓境鍙版秷鎭椂锛屾帴鏀跺彿鐮佹牸寮忎负00 + 鍥介檯鍖哄彿 + 鍙风爜锛屽鈥�008615899998888鈥� 璋冪敤API鏃讹紝Company瀛楁璇蜂紶鍏ユ暣鍨嬪�硷細4銆� 銆�
- ///鍥藉唴 璋冪敤API鏃讹紝Company瀛楁璇蜂紶鍏ユ暣鍨嬪�硷細0銆�
- /// </summary>
- public List<Common.ResponseEntity.AreaCodeOBJ> areaCodeList = new List<Common.ResponseEntity.AreaCodeOBJ>();
- /// <summary>
- /// 閫夋嫨鍖哄彿瑙嗗浘
- /// </summary>
- private FrameLayout phoneZoneSelectedShowView;
- /// <summary>
- /// 鍖哄彿瑙嗗浘
- /// </summary>
- private VerticalScrolViewLayout phoneZoneListView;
- /// <summary>
- /// tempClickZoneCodeBtn
- /// </summary>
- Button tempClickZoneCodeBtn = new Button();
- /// <summary>
- /// tempClickZoneNameBtn
- /// </summary>
- Button tempClickZoneNameBtn = new Button();
- /// <summary>
- /// tempClickZoneItemFL
- /// </summary>
- FrameLayout tempClickZoneItemFL = new FrameLayout();
- #endregion
- /// <summary>
- /// PhoneZone
- /// </summary>
- public PhoneZone()
- {
-
- }
- /// <summary>
- /// Show
- /// </summary>
- public void Show()
- {
- Init();
- }
- /// <summary>
- /// Init
- /// </summary>
- private void Init()
- {
- CommonPage.Loading.Start();
- ShowZoneList();
- new System.Threading.Thread(async () =>
- {
- var zoneList = await GetZoneListAsync();
- if (zoneList == null)
- {
- Application.RunOnMainThread(() =>
- {
- CommonPage.Loading.Hide();
-
- });
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- foreach (var areaCode in zoneList)
- {
- AddZone(areaCode, phoneZoneListView);
- }
- CommonPage.Loading.Hide();
- });
- }
- })
- { IsBackground = true }.Start();
- }
- /// <summary>
- /// GetZoneListAsync
- /// </summary>
- /// <returns></returns>
- private async System.Threading.Tasks.Task<List<Common.ResponseEntity.AreaCodeOBJ>> GetZoneListAsync()
- {
- try
- {
- var requestOBJ = new SendDataToServer.GetAreaCodeOBJ()
- {
- RequestVersion = CommonPage.RequestVersion
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
- var revertOBJ = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/GetAreaCode", System.Text.Encoding.UTF8.GetBytes(requestJson));
- if (revertOBJ == null)
- {
- return null;
- }
- if (revertOBJ.StateCode.ToUpper() == "SUCCESS")
- {
-
- var responseData = revertOBJ.ResponseData;
- return Newtonsoft.Json.JsonConvert.DeserializeObject<List<Common.ResponseEntity.AreaCodeOBJ>>(responseData.ToString());
- }
- else
- {
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
- /// <summary>
- /// ShowZoneList
- /// </summary>
- private void ShowZoneList()
- {
- //ZoneListView
- var phoneZoneDialog = new FrameLayout()
- {
- BackgroundColor = ZigbeeColor.Current.GXCDailogBackGroundColor
- };
- AddChidren(phoneZoneDialog);
-
- phoneZoneSelectedShowView = new FrameLayout()
- {
- Height = Application.GetRealHeight(1342),
- Width = Application.GetRealWidth(850),
- BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
- Radius = (uint)Application.GetRealHeight(30),
- Gravity = Gravity.Center
- };
- phoneZoneDialog.AddChidren(phoneZoneSelectedShowView);
-
- var phoneZoneTitle = new Button()
- {
- X = Application.GetRealWidth(CommonPage.XLeft),
- Y = Application.GetRealHeight(69),
- Height = Application.GetRealHeight(60),
- Width = Application.GetRealWidth(250),
- TextID = R.MyInternationalizationString.PleaseSelectAreaCode,
- TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
- TextAlignment = TextAlignment.CenterLeft
- };
- phoneZoneSelectedShowView.AddChidren(phoneZoneTitle);
-
- var searchBorder = new FrameLayout()
- {
- X = phoneZoneTitle.Right + Application.GetRealWidth(CommonPage.XLeft),
- Y = Application.GetRealHeight(46),
- Height = Application.GetRealHeight(104),
- Width = Application.GetRealWidth(400),
- BorderWidth = 1,
- BorderColor = ZigbeeColor.Current.GXCBorderColor,
- Radius = (uint)Application.GetRealHeight(46 / 2)
- };
- phoneZoneSelectedShowView.AddChidren(searchBorder);
-
- var phoneZoneSearch = new EditText()
- {
- X = phoneZoneTitle.Right + Application.GetRealWidth(CommonPage.XLeft + 10),
- Y = Application.GetRealHeight(46),
- Height = Application.GetRealHeight(104),
- Width = Application.GetRealWidth(400),
- PlaceholderText = Language.StringByID(R.MyInternationalizationString.Search),
- PlaceholderTextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
- TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor
- };
- phoneZoneSelectedShowView.AddChidren(phoneZoneSearch);
-
- phoneZoneListView = new VerticalScrolViewLayout()
- {
- Y = phoneZoneSearch.Bottom + Application.GetRealHeight(10),
- Height = Application.GetRealHeight(986),
- };
- phoneZoneSelectedShowView.AddChidren(phoneZoneListView);
-
- var btnOk = new UserCenter.BottomClickButton(668);
- btnOk.Y = Application.GetRealHeight(1166);
- btnOk.TextID = R.MyInternationalizationString.Complete;
- phoneZoneSelectedShowView.AddChidren(btnOk);
- btnOk.ButtonClickEvent += (sender, e) =>
- {
- ActionSelectedZone?.Invoke(CommonPage.PhoneZoneStr);
- ActionSelectedZone = null;
- RemoveFromParent();
- };
- var cancleBtn = new Button()
- {
- Y = Application.GetRealHeight(1719),
- Height = this.GetPictrueRealSize(86),
- Width = this.GetPictrueRealSize(86),
- UnSelectedImagePath = "Account/Cancle.png",
- Gravity = Gravity.CenterHorizontal
- };
- phoneZoneDialog.AddChidren(cancleBtn);
-
- cancleBtn.MouseUpEventHandler += (sender, e) =>
- {
- this.RemoveFromParent();
- };
- }
- /// <summary>
- /// AddZone
- /// </summary>
- /// <param name="areaCode"></param>
- /// <param name="phoneZoneSelectedListView"></param>
- private void AddZone(Common.ResponseEntity.AreaCodeOBJ areaCode, VerticalScrolViewLayout phoneZoneSelectedListView)
- {
- var zoneItemLName = areaCode.Name;
- var zoneItemLCode = areaCode.Code;
- var zoneItemFL = new FrameLayout()
- {
- Width = phoneZoneSelectedListView.Width,
- Height = Application.GetRealHeight(110),
- };
- phoneZoneSelectedListView.AddChidren(zoneItemFL);
-
- var zoneItemNameBtn = new Button()
- {
- X = Application.GetRealWidth(58),
- Width = zoneItemFL.Width - Application.GetRealWidth(300),
- Height = Application.GetRealHeight(110) - 1,
- Text = zoneItemLName,
- TextColor = ZigbeeColor.Current.GXCTextColor,
- SelectedTextColor = ZigbeeColor.Current.GXCTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- };
- zoneItemFL.AddChidren(zoneItemNameBtn);
-
- var zoneCode = new Button()
- {
- X = Application.GetRealWidth(58) + zoneItemNameBtn.Right,
- Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(80),
- Gravity = Gravity.CenterVertical,
- Text = $"+{zoneItemLCode}",
- TextAlignment = TextAlignment.CenterRight,
- TextColor = ZigbeeColor.Current.GXCTextColor,
- SelectedTextColor = ZigbeeColor.Current.GXCTextBlackColor,
- };
- zoneItemFL.AddChidren(zoneCode);
-
- EventHandler<MouseEventArgs> selectedZone = (sender, e) =>
- {
- tempClickZoneCodeBtn.IsSelected = false;
- tempClickZoneNameBtn.IsSelected = false;
- tempClickZoneItemFL.BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
- zoneItemNameBtn.IsSelected = true;
- zoneCode.IsSelected = true;
- tempClickZoneCodeBtn = zoneCode;
- tempClickZoneNameBtn = zoneItemNameBtn;
- tempClickZoneItemFL = zoneItemFL;
- zoneItemFL.BackgroundColor = ZigbeeColor.Current.GXCRowSelectedColor;
- CommonPage.PhoneZoneStr = zoneItemLCode;
- };
-
- zoneCode.MouseUpEventHandler += selectedZone;
- zoneItemNameBtn.MouseUpEventHandler += selectedZone;
- //榛樿
- if (zoneItemLCode == CommonPage.PhoneZoneStr)
- {
- zoneItemNameBtn.IsSelected = true;
- zoneCode.IsSelected = true;
- zoneItemFL.BackgroundColor = ZigbeeColor.Current.GXCRowSelectedColor;
- tempClickZoneCodeBtn = zoneCode;
- tempClickZoneNameBtn = zoneItemNameBtn;
- tempClickZoneItemFL = zoneItemFL;
- }
- }
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index d3cc6fc..921cc7c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -222,35 +222,14 @@
{
//璁惧鐘舵�佸繀椤诲埛鏂�
this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
-
- if (this.btnBackGroud.IsSelected == isOpen)
- {
- //鐘舵�佷竴鏍�,鍒欎笉闇�瑕佸鐞�
- return;
- }
- //鑳屾櫙鍥剧墖
- this.btnBackGroud.IsSelected = isOpen;
- //璁惧鍚嶇О鎺т欢
- this.btnDeviceName.IsSelected = isOpen;
- this.btnDeviceName.IsBold = isOpen;
- //璁惧鐨勮儗鏅渾鍦堝浘
- if (isOpen == true)
- {
- fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionBackgroundColor;
- }
- else
- {
- fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
- }
- //璁惧鍥炬爣鎺т欢
- this.btnDeviceIcon.IsSelected = isOpen;
- //鐘舵�佹枃鏈帶浠�
- this.btnStatu.IsSelected = isOpen;
//寮�鍏虫帶浠�
- if (btnSwitch != null)
+ if (btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
{
this.btnSwitch.IsSelected = isOpen;
}
+
+ //鍒囨崲鍗＄墖鐘舵�佺壒鏁�
+ this.SwitchCardStatuAppeal(isOpen);
}
/// <summary>
@@ -428,6 +407,84 @@
#endregion
+ #region 鈻� 鍗＄墖闂儊鐗规晥_______________________
+
+ /// <summary>
+ /// 鏄惁澶勪簬鐗规晥涓�
+ /// </summary>
+ private bool isAppeal = false;
+ /// <summary>
+ /// 寮�鍚崱鐗囬棯鐑佺壒鏁�
+ /// </summary>
+ public void StartCardLightAppeal()
+ {
+ //璁惧鐘舵�佸繀椤诲埛鏂�
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+
+ if (this.isAppeal == true) { return; }
+ this.isAppeal = true;
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //闂儊5绉�,闂撮殧400姣
+ int count = 5000 / 400;
+ bool isOpen = false;
+ while (this.Parent != null && count >= 0)
+ {
+ //闂儊鐗规晥
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ isOpen = !isOpen;
+ this.SwitchCardStatuAppeal(isOpen);
+ });
+ System.Threading.Thread.Sleep(400);
+ count--;
+ }
+ if (this.Parent != null && isOpen == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //缁撴潫鏃�,榛樿涓烘墦寮�鐗规晥
+ this.SwitchCardStatuAppeal(true);
+ }, ShowErrorMode.NO);
+ }
+ this.isAppeal = false;
+
+ }, ShowErrorMode.NO);
+ }
+
+ /// <summary>
+ /// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
+ /// </summary>
+ private void SwitchCardStatuAppeal(bool isOpen)
+ {
+ if (this.btnBackGroud.IsSelected == isOpen)
+ {
+ //鐘舵�佷竴鏍�,鍒欎笉闇�瑕佸鐞�
+ return;
+ }
+ //鑳屾櫙鍥剧墖
+ this.btnBackGroud.IsSelected = isOpen;
+ //璁惧鍚嶇О鎺т欢
+ this.btnDeviceName.IsSelected = isOpen;
+ this.btnDeviceName.IsBold = isOpen;
+ //璁惧鐨勮儗鏅渾鍦堝浘
+ if (isOpen == true)
+ {
+ fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionBackgroundColor;
+ }
+ else
+ {
+ fraDeviceRound.BackgroundColor = Common.ZigbeeColor.Current.GXCForFunctionUnSelectedBackgroundColor;
+ }
+ //璁惧鍥炬爣鎺т欢
+ this.btnDeviceIcon.IsSelected = isOpen;
+ //鐘舵�佹枃鏈帶浠�
+ this.btnStatu.IsSelected = isOpen;
+ }
+
+ #endregion
+
#region 鈻� 鎺т欢鎽ф瘉___________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
index 645b3dc..1e95885 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
@@ -60,6 +60,7 @@
this.ButtonClickEvent += (sender, e) =>
{
//璋冪敤鍦烘櫙
+ this.CanClick = false;
this.SetSceneAction();
};
}
@@ -125,12 +126,17 @@
timeSelect.Init();
timeSelect.TimeAction = (time) =>
{
+ //閫夋嫨鐨勬槸涓嶅紑鍚�
+ if (time == 0) { return; }
+
i_scene.SceneDelayTime = time;
//鏃堕棿鍥炬爣涓嶆樉绀�
this.btnTimeIcon.Visible = false;
//鏄剧ず鍓╀綑鐨勬椂闂�
this.btnTimeView.Text = this.GetTimeString(time, hourText, minuText, secondText);
+ //閫夋嫨寤舵椂鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
};
};
@@ -195,7 +201,13 @@
var result = await HdlSceneLogic.Current.ControlScene(scene);
if (result == false)
{
+ this.CanClick = true;
return;
+ }
+ if (scene.SceneDelayTime > 0)
+ {
+ //璋冪敤鏈夊欢鏃剁殑鍦烘櫙,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
//淇敼鏃堕棿
scene.RemainTime = scene.SceneDelayTime;
@@ -236,6 +248,7 @@
}
//寮�鍚欢鏃跺�掕鏃剁壒鏁�
+ this.CanClick = false;
this.StartRemainTimeApreal(i_scene);
}
@@ -251,6 +264,7 @@
{
if (i_scene.RemainTime <= 0)
{
+ this.CanClick = true;
return;
}
int remainTine = i_scene.RemainTime;
@@ -284,6 +298,7 @@
this.btnTimeView.Text = string.Empty;
//鐩存帴寮�鍚疞oading鐗规晥
this.StartLoadingApreal();
+ this.CanClick = true;
});
})
{ IsBackground = true }.Start();
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index fd85bdd..38a2eb3 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -54,10 +54,10 @@
public void ShowForm()
{
this.FormID = "HomeMainPageForm";
- Instance = this;
-
- //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
- if (ListRoomViewFrom.Instance == null) { }
+ Instance = this;
+
+ //鍏堝垵濮嬪寲宸︽粦鎴块棿鍒楄〃鐣岄潰(鍦ㄥ弽灏勯噷闈㈠垵濮嬪寲)
+ if (LeftListRoomViewFrom.Instance == null) { }
//鏁翠釜鑳屾櫙鐨勪笂涓嬫粦鍔ㄦ帶浠�
if (this.listBodyContr == null)
@@ -73,6 +73,9 @@
this.listBodyContr.frameTable.RemoveAll();
listBodyContr.RecoverTableHeight();
}
+
+ //鍒濆鍖栭粯璁ゆゼ灞侷D
+ this.InitDefultFloorId();
//鍒濆鍖栧ご閮ㄦ帶浠�
this.InitTopFrameLayoutControl();
@@ -129,6 +132,9 @@
this.ShowSelectFloorForm(btnFloorName);
};
}
+
+ //鍙瀵硅蹇嵎鏂瑰紡
+ Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);
//瀹夐槻蹇嵎鏂瑰紡
if (UserCenterResourse.ResidenceOption.SafetyShortcut)
{
@@ -170,7 +176,8 @@
selectHouse.Init();
selectHouse.HouseAction = (houseId) =>
{
- ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));
+ //鍒囨崲浣忓畢
+ this.ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));
};
}
};
@@ -402,10 +409,9 @@
roomPageView.SetLeftAndRightImageView(mLeftImageView, mRightImageView);
//褰撳墠鎴块棿
- var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
if (HdlRoomLogic.Current.NowMainPageRoom == null)
{
- //璁剧疆绗竴涓负鍒濆鎴块棿
HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];
}
var curIndex = 0;
@@ -505,7 +511,7 @@
//褰撴病鏈夌粦瀹氭湁缃戝叧,宸︽粦鏃�,鐐瑰嚮鎴块棿鍒楄〃,鍒欎笉楦熷畠
return;
}
- var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+ var listRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
for (int i = 0; i < listRoom.Count; i++)
{
if (room.Id == listRoom[i].Id)
@@ -521,7 +527,7 @@
//閲嶇疆涓�涓嬫ゼ灞傚悕瀛�
if (this.btnFloorName != null)
{
- btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);
+ btnFloorName.Text = Config.Instance.Home.GetCurrentFloorName;
}
}
@@ -1056,36 +1062,21 @@
/// <param name="home">Home.</param>
private void ChangeResidence(House home)
{
- try
+ HdlThreadLogic.Current.RunThread(() =>
{
- CommonPage.Loading.Start();
- new System.Threading.Thread(async () =>
- {
- Config.Instance.HomeId = home.Id;
- Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(home.Id);
- Global.CreateHomeDirectory(home.Id);
- Config.Instance.Save();
- //鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread();
+ this.ShowProgressBar();
- Application.RunOnMainThread(() =>
- {
- //鍒锋柊鐣岄潰
- this.ShowForm();
+ //鍒囨崲浣忓畢
+ HdlResidenceLogic.Current.SwitchResidence(home.Id);
- CommonPage.Loading.Hide();
- });
- })
- { IsBackground = true }.Start();
- }
- catch (Exception ex)
- {
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- CommonPage.Loading.Hide();
- Console.WriteLine(ex.Message);
+ //鍒锋柊鐣岄潰
+ this.ShowForm();
+
+ this.CloseProgressBar();
});
- }
+ });
}
#endregion
@@ -1111,7 +1102,11 @@
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚
this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
//鍒锋柊鎺т欢
- this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
+ if (locadevice.Type != DeviceType.IASZone)
+ {
+ //浼犳劅鍣ㄤ笉闇�瑕佸睘鎬т笂鎶�(浣嗘槸閭ｄ釜鐞冨瀷浼犳劅鍣ㄥ眳鐒朵細灞炴�т笂鎶�)
+ this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
+ }
}
}, ShowErrorMode.NO);
});
@@ -1152,10 +1147,8 @@
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
{
- //鏈湴璁惧瀵硅薄
- var locadevice = LocalDevice.Current.GetDevice(mainKeys);
- //鍒锋柊鍗＄墖淇℃伅
- this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
+ //寮�鍚崱鐗囬棯鐑佺壒鏁�
+ this.dicDeviceCardControl[mainKeys].StartCardLightAppeal();
}
}, ShowErrorMode.NO);
@@ -1172,13 +1165,16 @@
private void ShowSelectFloorForm(NormalViewControl btnFloor)
{
var floorFL = new Category.SelectFloorForm();
+ floorFL.CurFloorId = Config.Instance.Home.CurrentFloorId;
this.AddChidren(floorFL);
floorFL.Init(35, 153);
- floorFL.changeFloor = true;
floorFL.FloorAction = (floorId) =>
{
btnFloor.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
+ Config.Instance.Home.CurrentFloorId = floorId;
HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
+ //鍒嗙被鐣岄潰闇�瑕佸埛鏂�
+ UserView.UserPage.Instance.RefreshCategoryForm = true;
this.ShowForm();
};
}
@@ -1220,6 +1216,23 @@
return true;
}
+ /// <summary>
+ /// 鍒濆鍖栭粯璁ゆゼ灞侷D
+ /// </summary>
+ private void InitDefultFloorId()
+ {
+ if (Config.Instance.Home.CurrentFloorId != string.Empty)
+ {
+ return;
+ }
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
+ {
+ Config.Instance.Home.CurrentFloorId = floorId;
+ break;
+ }
+ }
+
#endregion
#region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
similarity index 86%
rename from ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
rename to ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
index 3b2d07d..da61323 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
@@ -10,22 +10,22 @@
/// <summary>
/// 宸︽粦鑿滃崟鐨勭殑鎴块棿鍒楄〃鐣岄潰
/// </summary>
- public class ListRoomViewFrom : EditorCommonForm
+ public class LeftListRoomViewFrom : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
- private static ListRoomViewFrom roomManagement = null;
+ private static LeftListRoomViewFrom roomManagement = null;
/// <summary>
/// 宸︽粦鑿滃崟鐨勭殑鎴块棿瀵硅薄
/// </summary>
- public static ListRoomViewFrom Instance
+ public static LeftListRoomViewFrom Instance
{
get
{
if (roomManagement == null)
{
//鍒濆鍖栧乏婊戣彍鍗�
- roomManagement = new ListRoomViewFrom();
+ roomManagement = new LeftListRoomViewFrom();
CommonPage.Instance.AddLeftView(roomManagement);
}
return roomManagement;
@@ -52,6 +52,10 @@
/// 鍗＄墖鎺т欢闆嗗悎
/// </summary>
private Dictionary<string, Controls.ListRoomCardControl> dicCardControl = new Dictionary<string, Controls.ListRoomCardControl>();
+ /// <summary>
+ /// 鏈垎閰嶇晫闈�(鐢ㄤ簬瀵瑰簲鍒汉涔辨悶,鍦ㄦ墦寮�鏈垎閰嶇晫闈笉鍏虫椂,鍘诲埛鏂板満鏅�,鐒跺悗鎻恇ug璇存病鏈夊満鏅�)
+ /// </summary>
+ private UnallocatedRoomForm unalloctedRoom = null;
#endregion
@@ -60,7 +64,7 @@
/// <summary>
/// 鐢婚潰鏄剧ず
/// </summary>
- public void ShowForm()
+ private void ShowForm()
{
//鍒濆鍖栧ご閮ㄤ俊鎭�
this.InitTopFrame();
@@ -92,13 +96,18 @@
};
//鑾峰彇妤煎眰
- this.curFloorId = Config.Instance.Home.CurrentFloorId;
-
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
return;
}
+ //妤煎眰鍒濆ID
+ foreach (var floorId in dicFloor.Keys)
+ {
+ this.curFloorId = floorId;
+ break;
+ }
+
//妤煎眰鍥炬爣
var btnIconContr = new MostRightIconControl(69, 69);
btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";
@@ -116,9 +125,9 @@
{
//妤煎眰鑿滃崟
var floors = new Category.SelectFloorForm();
+ floors.CurFloorId = this.curFloorId;
AddChidren(floors);
- floors.changeFloor = false;
- floors.CurFloorId = curFloorId;
+ floors.CurFloorId = this.curFloorId;
floors.Init(599, 161, Direction.Right);
floors.FloorAction += (floorId) =>
{
@@ -152,6 +161,9 @@
/// </summary>
public void RefreshListRoom()
{
+ //淇濋櫓璧疯,杩欓噷瑕佸叧闂湭鍒嗛厤鐣岄潰
+ this.CloseUnallocatedRoomForm();
+
//濡傛灉杩樻病鏈夊垵濮嬪寲瀹屾垚鐣岄潰鐨勮瘽
if (this.isInitFinish == false)
{
@@ -212,7 +224,6 @@
{
return;
}
- string oldFloorId = Config.Instance.Home.CurrentFloorId;
CommonPage.Instance.CloseLeftMenu();
HdlThreadLogic.Current.RunThread(() =>
@@ -224,10 +235,11 @@
//鐐瑰嚮鐨勬槸鏀惰棌鎴块棿鐨勮瘽,涓嶅彉鏇村綋鍓嶆ゼ灞俰d
if (room.FloorId != string.Empty)
{
- Config.Instance.Home.CurrentFloorId = room.FloorId;
- if (oldFloorId != room.FloorId)
+ if (Config.Instance.Home.CurrentFloorId != room.FloorId)
{
//妤煎眰閮藉垏鎹㈢殑璇�,鍒锋柊鏁翠釜涓婚〉
+ Config.Instance.Home.CurrentFloorId = room.FloorId;
+ HdlRoomLogic.Current.NowMainPageRoom = room;
UserPage.Instance.ReFreshControl();
return;
}
@@ -295,14 +307,33 @@
return;
}
//鏈垎閰�
- var unalloctedRoom = new UnallocatedRoomForm();
+ this.unalloctedRoom = new UnallocatedRoomForm();
this.AddChidren(unalloctedRoom);
unalloctedRoom.ShowForm();
+ unalloctedRoom.FormCloseEvent += () =>
+ {
+ //鎵嬪姩鐐瑰嚮鍏抽棴鐨勮瘽,鐩存帴缃┖
+ this.unalloctedRoom = null;
+ };
};
}
#endregion
+ #region 鈻� 鍏抽棴鏈垎閰嶇晫闈____________________
+
+ /// <summary>
+ /// 鍏抽棴鏈垎閰嶇晫闈�
+ /// </summary>
+ public void CloseUnallocatedRoomForm()
+ {
+ //鍏抽棴鐣岄潰
+ this.unalloctedRoom?.CloseForm();
+ this.unalloctedRoom = null;
+ }
+
+ #endregion
+
#region 鈻� 鍒锋柊鎸囧畾鎴块棿_______________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index af70771..520287b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -16,6 +16,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 鐣岄潰鍏抽棴浜嬩欢
+ /// </summary>
+ public Action FormCloseEvent = null;
+ /// <summary>
/// 娣诲姞鍒� 鐨勮儗鏅浘鎺т欢
/// </summary>
private FrameLayoutStatuControl frameAddBackGroud = null;
@@ -530,19 +534,24 @@
frameAddBackGroud.AddChidren(btnAdd, ChidrenBindMode.BindEvent);
frameAddBackGroud.ButtonClickEvent += (sender, e) =>
{
- var selectZone = new SelectZone();
- selectZone.title = Language.StringByID(R.MyInternationalizationString.AddTo);
- selectZone.Init();
- selectZone.ZoneAction += (selectRoom) =>
+ HdlControlLogic.Current.ShowBottomListRoomView(string.Empty, Language.StringByID(R.MyInternationalizationString.AddTo), (selectId, selectName) =>
{
+ if (selectId == string.Empty)
+ {
+ //閫夋嫨鐨勬槸鏈垎閰�
+ return;
+ }
//鍙樻洿浜嗗綋鍓嶆埧闂寸殑涓滆タ,涓婚〉闇�瑕佸埛鏂�
- if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)
+ if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectId)
{
this.dataHadChanged = true;
}
//淇濆瓨閫夋嫨鐨勮澶囧拰鍦烘櫙
- this.SaveSelectDeviceAndScene(selectRoom);
- };
+ var room = HdlRoomLogic.Current.GetRoomById(selectId);
+ this.SaveSelectDeviceAndScene(room);
+ //鍒嗙被鐣岄潰闇�瑕佸埛鏂�
+ UserPage.Instance.RefreshCategoryForm = true;
+ });
};
}
@@ -654,6 +663,10 @@
/// </summary>
public override void CloseFormBefore()
{
+ //璋冪敤鍥炶皟浜嬩欢
+ this.FormCloseEvent?.Invoke();
+ this.FormCloseEvent = null;
+
if (this.dataHadChanged == true)
{
HdlThreadLogic.Current.RunMainInThread(() =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index aa44917..6d9e61b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -219,7 +219,7 @@
#elif Android
try
{
- var versionResult = await RequestHttpsAndroidAppVersionAsync();
+ var versionResult = RequestHttpsAndroidAppVersionAsync();
if (versionResult == null)
{
return false;
@@ -255,7 +255,7 @@
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var bytesTotalLengthResult = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));
+ var bytesTotalLengthResult = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DownloadPlatformUploadFirmwarePreLength", Encoding.UTF8.GetBytes(requestJson));
if (bytesTotalLengthResult == null || bytesTotalLengthResult.ResponseData == null)
{
CommonPage.Instance.ShowErrorInfoAlert(R.MyInternationalizationString.UpdateAppFail);
@@ -354,7 +354,7 @@
/// 鑾峰彇 Android-APP 鐗堟湰淇℃伅
/// </summary>
/// <returns>The https app version async.</returns>
- private async System.Threading.Tasks.Task<Common.ResponseEntity.ApkInfoOBJ> RequestHttpsAndroidAppVersionAsync()
+ private Common.ResponseEntity.ApkInfoOBJ RequestHttpsAndroidAppVersionAsync()
{
try
{
@@ -364,7 +364,7 @@
RequestVersion = CommonPage.CodeIDString
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
- var result = await CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var result = CommonPage.Instance.RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (result == null)
{
return null;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
index 8853572..1c2e460 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
@@ -23,10 +23,10 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
var strUrl = "https://hdlcontrol.com/%E6%B2%B3%E4%B8%9C%E9%9A%90%E7%A7%81%E6%9D%83%E6%94%BF%E7%AD%9620200331.txt";
- var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
if (byteData == null)
{
this.CloseProgressBar(ShowReLoadMode.YES);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
index 4ea33c1..76b0fa8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/AccountOption.cs
@@ -77,11 +77,8 @@
string oldGestureAuthentication = GestureAuthentication;
GestureAuthentication = UserCenterLogic.EncryptPassword(hdlKey, oldGestureAuthentication);
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(this);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- string fullName = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.AccountOptionFile);
//鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.AccountOptionFile, this);
//杩樺師鏄庣爜
PswAuthentication = oldPswAuthentication;
GestureAuthentication = oldGestureAuthentication;
@@ -98,14 +95,14 @@
/// <returns></returns>
public AccountOptionClass Load()
{
- string fileName = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.AccountOptionFile);
+ string fileName = DirNameResourse.AccountOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new AccountOptionClass();
}
try
{
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
+ var varByte = HdlFileLogic.Current.ReadFileByteContent(fileName);
string strValue = System.Text.Encoding.UTF8.GetString(varByte);
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountOptionClass>(strValue);
//瑙ｅ瘑瀵嗙爜
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
index 18d80cf..c4dfa2e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/ResidenceOption.cs
@@ -55,18 +55,8 @@
/// </summary>
public void Save()
{
- try
- {
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(this);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
- }
- catch (Exception ex)
- {
- HdlLogLogic.Current.WriteLog(ex);
- }
+ //鍐欏叆鍐呭
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.ResidenceOptionFile, this);
}
/// <summary>
@@ -75,14 +65,14 @@
/// <returns></returns>
public ResidenceOptionClass Load()
{
- string fileName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ResidenceOptionFile);
+ string fileName = DirNameResourse.ResidenceOptionFile;
if (System.IO.File.Exists(fileName) == false)
{
return new ResidenceOptionClass();
}
try
{
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
+ var varByte = HdlFileLogic.Current.ReadFileByteContent(fileName);
string strValue = System.Text.Encoding.UTF8.GetString(varByte);
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<ResidenceOptionClass>(strValue);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index c69f370..e35c611 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -62,7 +62,6 @@
/// <summary>
/// 鐧婚檰鏉冮檺缂栧彿鐨勭炕璇戝悕锛�1:涓昏处鍙疯嚜宸�(鏈汉) 2:璧嬩簣绠＄悊鍛樻潈闄愮殑鎴愬憳 3:鎴愬憳
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
public string AuthorityText = string.Empty;
/// <summary>
/// 鐢ㄦ埛澶村儚鏁版嵁(涓存椂鐢�,浼氱疆绌�)
@@ -1304,6 +1303,14 @@
/// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
/// </summary>
public int DoorLockNomallyOpenTimeMode = 0;
+ /// <summary>
+ /// 鏄惁灏嗗彂閫佸強鎺ユ敹鍒扮殑鏁版嵁鍐欏叆鍒癓og涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSendAndReceveDataToFile = 0;
+ /// <summary>
+ /// 鏄惁灏哠ocketReceive鐨勬暟鎹啓鍏ュ埌Log涓� 1->鍐欏叆
+ /// </summary>
+ public int WriteSocketReceiveDataToFile = 0;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
index 08bd6c6..70432a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
@@ -3,25 +3,6 @@
namespace Shared.Phone.UserCenter
{
/// <summary>
- /// 琛屾帶浠堕噷闈㈠瓙鎺т欢鐨勪綅缃榻愭柟寮�
- /// </summary>
- public enum UViewAlignment
- {
- /// <summary>
- /// 浣嶄簬涓婇儴(绛夐棿璺濈灞呬腑:浣嶄簬涓婇儴锛屼互涓棿妯嚎涓哄熀鍑嗭紝浣嗘槸涓婁笅绌虹櫧涓�鑷�)
- /// </summary>
- Top = 1,
- /// <summary>
- /// 浣嶄簬姝ｄ腑闂�
- /// </summary>
- Center = 2,
- /// <summary>
- /// 浣嶄簬搴曢儴(绛夐棿璺濈灞呬腑:浣嶄簬涓婇儴锛屼互涓棿妯嚎涓哄熀鍑嗭紝涓婁笅绌虹櫧涓�鑷�)
- /// </summary>
- Bottom = 3
- }
-
- /// <summary>
/// 鐘舵�佹帶浠舵坊鍔犲瓙鎺т欢浜嬩欢鐨勭粦瀹氭ā寮�
/// </summary>
public enum ChidrenBindMode
@@ -34,75 +15,6 @@
/// 涓嶇粦瀹氫簨浠讹紝涔熶笉鏄剧ず閫夋嫨鐘舵��
/// </summary>
NotBind = 2
- }
-
- /// <summary>
- /// 鎺т欢鑷姩璋冩暣楂樺害澶у皬妯″紡
- /// </summary>
- public enum HeightAutoMode
- {
- /// <summary>
- /// 浠�涔堜簨閮戒笉鍋�
- /// </summary>
- None = 1,
- /// <summary>
- /// 鑷姩澧炲姞楂樺害,鍙褰撳墠瀹瑰櫒杩涜鍒ゅ畾(鐢辨帶浠剁殑bottomSpace鐨勫�艰繘琛屽垽瀹�)
- /// </summary>
- IncreaseOnly = 2,
- /// <summary>
- /// 鑷姩璋冩暣楂樺害,鍙褰撳墠瀹瑰櫒杩涜鍒ゅ畾锛岃鎱庣敤姝ゆā寮�(澧炲姞鎴栬�呭噺灏戯紝鐢辨帶浠剁殑bottomSpace鐨勫�艰繘琛屽垽瀹�)
- /// </summary>
- AutoOnly = 3,
- /// <summary>
- /// 鑷姩澧炲姞楂樺害,鍖呭惈鍏ㄩ儴鐖跺鍣ㄨ繘琛屽垽瀹�(鐢辨帶浠剁殑bottomSpace鐨勫�艰繘琛屽垽瀹�)
- /// </summary>
- IncreaseAll = 4,
- /// <summary>
- /// 鑷姩璋冩暣楂樺害,鍖呭惈鍏ㄩ儴鐖跺鍣ㄨ繘琛屽垽瀹氾紝璇锋厧鐢ㄦ妯″紡(澧炲姞鎴栬�呭噺灏戯紝鐢辨帶浠剁殑bottomSpace鐨勫�艰繘琛屽垽瀹�)
- /// </summary>
- AutoAll = 5
- }
-
- /// <summary>
- /// 杩涘害鏉＄殑娣诲姞妯″紡
- /// </summary>
- public enum ProBarAddMode
- {
- /// <summary>
- /// 瀹屽叏閬綇鐢婚潰,涓嶈兘杩涜浠讳綍鎿嶄綔
- /// </summary>
- FullForm = 1,
- /// <summary>
- /// 杩涘害鏉″彧鐩栦綇Body锛屼絾鑳芥搷浣滃ご閮ㄨ彍鍗曪紝鍏佽鐢ㄦ埛鍙栨秷
- /// </summary>
- BodyFrame = 2
- }
-
- /// <summary>
- /// 寮圭獥鐢婚潰鐨勬ā寮�
- /// </summary>
- public enum DialogFrameMode
- {
- /// <summary>
- /// <para>涓嶅仛浠讳綍澶勭悊,瀛愭帶浠剁敱鑷畾涔夋坊鍔�,瀛愭帶浠舵坊鍔犲畬鎴愬悗</para>
- /// <para>璇疯皟鐢ㄣ�怓inishInitControl銆戝嚱鏁板畬鎴愭渶鍚庣殑鍒濆鍖�</para>
- /// </summary>
- None = 1,
- /// <summary>
- /// <para>鍙湁涓�涓緭鍏ユ,鐢盜nputText灞炴�ц幏鍙栬緭鍏ュ��</para>
- /// <para>鐢盨etTipText鍑芥暟璁剧疆杈撳叆妗嗙伆鑹插瓧浣撹鏄�(濡傛灉鏈夐渶瑕�)</para>
- /// </summary>
- OnlyInput = 2,
- /// <summary>
- /// <para>鍙湁涓�涓緭鍏ユ(瀵嗙爜妯″紡)</para>
- /// <para>鐢盜nputText灞炴�ц幏鍙栬緭鍏ュ��,鐢盨etTipText鍑芥暟璁剧疆杈撳叆妗嗙伆鑹插瓧浣撹鏄�</para>
- /// </summary>
- OnlyPassword = 3,
- /// <summary>
- /// <para>鍙湁涓�涓緭鍏ユ(瀵嗙爜妯″紡),鍙宠竟鏈変竴涓彲浠ョ湅瑙佸瘑鐮佺殑鍥炬爣</para>
- /// <para>鐢盜nputText灞炴�ц幏鍙栬緭鍏ュ��,鐢盨etTipText鍑芥暟璁剧疆杈撳叆妗嗙伆鑹插瓧浣撹鏄�</para>
- /// </summary>
- PasswordView = 4
}
/// <summary>
@@ -291,21 +203,6 @@
}
/// <summary>
- /// 楠岃瘉妯″紡
- /// </summary>
- public enum ValidatedMode
- {
- /// <summary>
- /// 涓嶉獙璇�
- /// </summary>
- NO = 0,
- /// <summary>
- /// 楠岃瘉
- /// </summary>
- YES = 1
- }
-
- /// <summary>
/// 鍥轰欢闃剁骇鍒嗙被
/// </summary>
public enum FirmwareLevelType
@@ -350,45 +247,6 @@
/// WIFI
/// </summary>
WIFI = 2
- }
-
- /// <summary>
- /// 鑾峰彇鍚嶅瓧妯″紡
- /// </summary>
- public enum GetNameMode
- {
- /// <summary>
- /// 浠�涔堢壒鏁堥兘涓嶅姞锛岀洿鎺ヨ幏鍙�
- /// </summary>
- None = 0,
- /// <summary>
- /// <para>璁惧鍚嶅瓧鍔犵壒鏁�</para>
- /// <para>澶氬洖璺椂锛歑XXX(NN鍥炶矾)</para>
- /// </summary>
- SpecialDevice = 1,
- /// <summary>
- /// 缃戝叧鍚嶇О鍔犵壒鏁�
- /// </summary>
- SpecialGateway = 2
- }
-
- /// <summary>
- /// 姘村钩婊戝姩婊氬姩鏉＄殑绫诲瀷妯″紡
- /// </summary>
- public enum SeekBarTypeMode
- {
- /// <summary>
- /// 鍗曠函鍙湪鍙宠竟鏈変竴涓櫨鍒嗘瘮鐨勬枃鏈�(鏈夋晥鎺т欢锛歴eekBar锛宐tnRight)
- /// </summary>
- OnlyPersent = 1,
- /// <summary>
- /// 宸﹁竟鏈変竴涓枃鏈�,鍙宠竟鏈変竴涓櫨鍒嗘瘮鐨勬枃鏈�(鏈夋晥鎺т欢锛歴eekBar锛宐tnLeft锛宐tnRight)
- /// </summary>
- LeftAndPersent = 2,
- /// <summary>
- /// 宸﹁竟鍜屽彸杈归兘鏈変竴涓枃鏈�,浣嗘槸鏃犺繘搴︽潯(鏈夋晥鎺т欢锛歴eekBar锛宐tnLeft锛宐tnRight)
- /// </summary>
- LeftAndRight = 3
}
/// <summary>
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 3a2334a..1cad842 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -23,6 +23,8 @@
get { return m_CanClick; }
set
{
+ if (m_CanClick == value) { return; }
+
m_CanClick = value;
//鑳藉鐐瑰嚮,鍒欐樉绀烘病鏈夌偣鍑昏繃鐨勭姸鎬�
if (m_CanClick == true) { this.SetNotClickStatu(); }
@@ -307,21 +309,6 @@
{
base.RemoveFromParent();
}
- }
-
- /// <summary>
- /// Y杞撮噸缃�(鐪熷疄鏁板��,娌℃湁鐖跺鍣ㄦ棤鏁�)
- /// </summary>
- /// <param name="alignment">涓婁笅瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅涓ら儴鍒嗙殑闂磋窛</param>
- public void ReSetYaxis(UViewAlignment alignment, int Space = 0)
- {
- if (this.Parent == null)
- {
- return;
- }
- //Y杞撮噸缃�
- this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
index dbf1a01..6d11849 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -284,21 +284,6 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// Y杞撮噸缃�(鐪熷疄鏁板��,娌℃湁鐖跺鍣ㄦ棤鏁�)
- /// </summary>
- /// <param name="alignment">涓婁笅瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅涓ら儴鍒嗙殑闂磋窛</param>
- public void ReSetYaxis(UViewAlignment alignment, int Space = 0)
- {
- if (this.Parent == null)
- {
- return;
- }
- //Y杞撮噸缃�
- this.Y = HdlControlLogic.Current.GetControlChidrenYaxis(this.Parent.Height, this.Height, alignment, Space);
- }
-
- /// <summary>
/// 璁＄畻鍥剧墖鐨勭湡瀹為珮瀹藉害
/// </summary>
/// <param name="i_size"></param>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index f667767..8bbe274 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -20,25 +20,9 @@
/// </summary>
public string RoomKey = string.Empty;
/// <summary>
- /// 褰撳墠閫夋嫨鐨勬ゼ灞備富閿�(娌″繀瑕佸叕寮�鍑哄幓)
+ /// 鏄剧ず鏂囨湰
/// </summary>
- private string FloorKey = string.Empty;
- /// <summary>
- /// 妤煎眰鍒楄〃鍚嶅瓧
- /// </summary>
- private List<string> listFloorName = new List<string>();
- /// <summary>
- /// 妤煎眰鍒楄〃涓婚敭
- /// </summary>
- private List<string> listFloorKeys = new List<string>();
- /// <summary>
- /// 鎴块棿鍚嶅瓧
- /// </summary>
- private List<List<string>> listRoomName = new List<List<string>>();
- /// <summary>
- /// 鎴块棿涓婚敭
- /// </summary>
- private List<List<string>> listRoomKeys = new List<List<string>>();
+ private NormalViewControl btnTextView = null;
#endregion
@@ -50,8 +34,6 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public BelongAreaControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- //鍒濆鍖栨暟鎹�
- this.InitData();
}
/// <summary>
@@ -114,7 +96,6 @@
{
string roomName = i_Room.Name;
this.RoomKey = i_Room.Id;
- this.FloorKey = i_Room.FloorId;
if (Common.Config.Instance.Home.FloorDics.ContainsKey(i_Room.FloorId) == true)
{
//妤煎眰+鎴块棿
@@ -140,17 +121,17 @@
this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);
//鏄剧ず妗�
- var txtView = new NormalViewControl(700, true);
- txtView.X = Application.GetRealWidth(294);
- txtView.Gravity = Gravity.CenterVertical;
- txtView.TextColor = UserCenterColor.Current.TextGrayColor1;
- txtView.Text = i_RoomName;
- this.AddChidren(txtView, ChidrenBindMode.BindEvent);
+ this.btnTextView = new NormalViewControl(700, true);
+ btnTextView.X = Application.GetRealWidth(294);
+ btnTextView.Gravity = Gravity.CenterVertical;
+ btnTextView.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTextView.Text = i_RoomName;
+ this.AddChidren(btnTextView, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnCaption.Y += chidrenYaxis;
- txtView.Y += chidrenYaxis;
+ btnTextView.Y += chidrenYaxis;
}
if (IsSharedRoom == true)
@@ -159,74 +140,15 @@
this.UseClickStatu = false;
return;
}
- if (this.listFloorKeys.Count == 0 && listRoomKeys.Count == 0)
- {
- //鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
- this.UseClickStatu = false;
- return;
- }
+
//鍙崇澶�
this.AddRightArrow();
this.ButtonClickEvent += (sender, e) =>
{
//鍖哄煙閫夋嫨
- this.ShowSelectRoom(txtView, i_caption);
+ this.ShowSelectRoom(btnTextView, i_caption);
};
- }
-
- /// <summary>
- /// 鍒濆鍖栨暟鎹�
- /// </summary>
- private void InitData()
- {
- 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);
- foreach (var myRoom in listRoom)
- {
- 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);
- if (listRoom.Count > 0)
- {
- //妤煎眰鍚嶅瓧鍜屼富閿敹闆�
- this.listFloorKeys.Add(fKeys);
- this.listFloorName.Add(dicFloor[fKeys]);
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- listName = new List<string>();
- listKeys = new List<string>();
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
- }
- }
- }
}
#endregion
@@ -240,58 +162,39 @@
/// <param name="i_caption"></param>
private void ShowSelectRoom(NormalViewControl txtView, string i_caption)
{
- int index1 = this.listFloorKeys.IndexOf(FloorKey);
- if (index1 == -1) { index1 = 0; }
- int index2 = this.listRoomKeys[index1].IndexOf(RoomKey);
- if (index2 == -1) { index2 = 0; }
-
- if (this.listFloorKeys.Count == 0)
+ //鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛�
+ var result = HdlControlLogic.Current.ShowBottomListRoomView(this.RoomKey, i_caption, (selectId, selectName) =>
{
- //鏃犳ゼ灞傛ā寮�
- PickerView.Show(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,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
- else
+ this.RoomKey = selectId;
+ txtView.Text = selectName;
+ //璋冪敤鍥炶皟鍑芥暟
+ this.SelectRoomEvent?.Invoke(RoomKey);
+ });
+ if (result == false)
{
- //鏈夋ゼ灞傛ā寮�
- PickerView.ShowSecondary(this.listFloorName, 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,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
+ //鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
+ this.UseClickStatu = false;
}
}
#endregion
+ #region 鈻� 鍒锋柊鎺т欢___________________________
+
+ /// <summary>
+ /// 閲嶆柊鍒锋柊鎺т欢
+ /// </summary>
+ /// <param name="i_RoomId">鎸囧畾浠ュ摢涓埧闂碔D鍒锋柊鎺т欢</param>
+ public void RefreshControl(string i_RoomId)
+ {
+ this.RoomKey = i_RoomId;
+
+ var room = HdlRoomLogic.Current.GetRoomById(i_RoomId);
+ this.btnTextView.Text = HdlRoomLogic.Current.GetRoomName(room);
+ }
+
+ #endregion
+
#region 鈻� 鎺т欢鎽ф瘉___________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
index 63d9ce0..850ab6d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/NormalSelectControl.cs
@@ -16,6 +16,10 @@
/// </summary>
private string textValue = string.Empty;
/// <summary>
+ /// 涓嬮儴鏄剧ず鏂囨湰
+ /// </summary>
+ private string textBottomValue = null;
+ /// <summary>
/// 鏂囨湰鎺т欢
/// </summary>
private NormalViewControl btnText = null;
@@ -46,7 +50,7 @@
}
}
/// <summary>
- /// 澶勪簬闈為�変腑鐘舵�佹椂锛屾槸鍚︽妸瀛椾綋鍙樻垚鐏拌壊(榛樿鍙樻垚鐏拌壊)
+ /// 澶勪簬閫変腑鎴栬�呴潪閫変腑鐘舵�佹椂锛屾槸鍚﹀彉鏇村瓧浣撻鑹�
/// </summary>
public bool ChangedTextColor = true;
@@ -65,6 +69,18 @@
}
/// <summary>
+ /// 鍋氭垚涓�涓畝鍗曠殑閫夋嫨鎺т欢
+ /// </summary>
+ /// <param name="i_topText">涓婇儴鏄剧ず鏂囨湰</param>
+ /// <param name="i_bottomText">涓嬮儴鏄剧ず鏂囨湰</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
+ public NormalSelectControl(string i_topText, string i_bottomText, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
+ {
+ this.textValue = i_topText;
+ this.textBottomValue = i_bottomText;
+ }
+
+ /// <summary>
/// 鍒濆鍖栧唴閮ㄦ帶浠�
/// </summary>
/// <param name="iconParh">宸︿晶鍥炬爣</param>
@@ -76,9 +92,18 @@
var btnIcon = this.AddLeftIcon();
btnIcon.UnSelectedImagePath = iconParh;
}
- //鏄剧ず鏂囨湰
- btnText = this.AddLeftCaption(this.textValue, 600);
- btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ if (this.textBottomValue == null)
+ {
+ //鏄剧ず鏂囨湰
+ btnText = this.AddLeftCaption(this.textValue, 600);
+ btnText.TextColor = UserCenterColor.Current.TextGrayColor3;
+ }
+ else
+ {
+ //鏄剧ず鏂囨湰
+ btnText = this.AddTopView(this.textValue, 600);
+ this.AddBottomView(this.textBottomValue, 600);
+ }
//閫夋嫨鎺т欢
btnSelect = this.AddMostRightEmptyIcon(58, 58);
btnSelect.Visible = false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
index a652601..7edeaa4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressBar.cs
@@ -38,13 +38,13 @@
public static void Show(string text = "")
{
m_value = 0;
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (Common.CommonPage.Loading.Visible == false && notShow == false)
{
Common.CommonPage.Loading.Start(text);
}
- });
+ }, ShowErrorMode.NO);
}
/// <summary>
@@ -58,8 +58,8 @@
if (coerce == true)
{
notClose = false;
- }
- Application.RunOnMainThread(() =>
+ }
+ HdlThreadLogic.Current.RunMain(() =>
{
if (Common.CommonPage.Loading.Visible == true && notClose == false)
{
@@ -67,8 +67,8 @@
notShow = false;
notClose = false;
notSetValue = false;
- }
- });
+ }
+ }, ShowErrorMode.NO);
}
/// <summary>
@@ -113,12 +113,12 @@
if (notSetValue == true)
{
return;
- }
- Application.RunOnMainThread(() =>
+ }
+ HdlThreadLogic.Current.RunMain(() =>
{
//loading.Text = text;
- Common.CommonPage.Loading.Text = text + appendText;
- });
+ Common.CommonPage.Loading.Text = text + appendText;
+ }, ShowErrorMode.NO);
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
index 3349ea3..0f048dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs
@@ -124,7 +124,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
btnText.Text = msg;
- });
+ }, ShowErrorMode.NO);
}
#endregion
@@ -137,7 +137,7 @@
/// <param name="value">姝ゅ�间负鐧惧垎姣斿��(涔熷氨鏄皬浜庢垨鑰呯瓑浜�1鐨�)</param>
public void SetValue(decimal value)
{
- this.btnProgressBar.SetValue(value);
+ this.btnProgressBar?.SetValue(value);
}
/// <summary>
@@ -147,7 +147,7 @@
/// <param name="maxValue">鏈�澶у��</param>
public void SetValue(decimal value, decimal maxValue)
{
- this.btnProgressBar.SetValue(value, maxValue);
+ this.btnProgressBar?.SetValue(value, maxValue);
}
#endregion
@@ -165,7 +165,7 @@
{
//鍒濆鍖栬繘搴︽潯
this.InitProgressFormBar();
- });
+ }, ShowErrorMode.NO);
}
}
@@ -200,7 +200,7 @@
//鍏抽棴浜嬩欢
this.CloseEvent?.Invoke();
this.CloseEvent = null;
- });
+ }, ShowErrorMode.NO);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressRowBar.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressRowBar.cs
index 91b3ada..d3be37f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressRowBar.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressRowBar.cs
@@ -12,7 +12,7 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 杩涘浘鏉¤兘鍚﹀線鍥炶蛋(榛樿鍙互)
+ /// 杩涘害鏉¤兘鍚﹀線鍥炶蛋(榛樿鍙互)
/// </summary>
public bool ProgressBarGoback = true;
/// <summary>
@@ -35,6 +35,22 @@
/// 妯″紡鍖哄垎
/// </summary>
private int m_ModeDiv = -1;
+
+ /// <summary>
+ /// 杩涘害鏉℃槸鍚﹀彲瑙�
+ /// </summary>
+ public new bool Visible
+ {
+ get { return base.Visible; }
+ set
+ {
+ if (this.frameProgressBack != null)
+ {
+ this.frameProgressBack.Visible = value;
+ }
+ base.Visible = value;
+ }
+ }
#endregion
@@ -143,10 +159,12 @@
/// <param name="value"></param>
private void SetValueEx(decimal value)
{
- if (btnProgressBar == null || this.m_ModeDiv != 1 || value > 1)
+ if (btnProgressBar == null || this.m_ModeDiv != 1)
{
return;
}
+ if (value > 1) { value = 1; }
+
HdlThreadLogic.Current.RunMain(() =>
{
int width = (int)(value * this.Width);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index d02b8e4..b081b6c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -181,8 +181,21 @@
public override void RemoveFromParent()
{
this.SelectTabEvent = null;
+ if (this.Parent != null)
+ {
+ base.RemoveFromParent();
+ }
+ }
- base.RemoveFromParent();
+ /// <summary>
+ /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+ /// </summary>
+ public override void RemoveAll()
+ {
+ if (this.Parent != null)
+ {
+ base.RemoveAll();
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
index 9238cc3..4ed629e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightFloorMenuControl.cs
@@ -35,6 +35,10 @@
/// 琛屾暟
/// </summary>
private int RowCount = 0;
+ /// <summary>
+ /// 褰撳墠妤煎眰id
+ /// </summary>
+ private string nowFloorId = string.Empty;
#endregion
@@ -48,9 +52,11 @@
/// <para>1: 395瀹藉害</para>
/// <para>2: 449瀹藉害</para>
/// </param>
+ /// <param name="i_floorId">褰撳墠閫夋嫨鐨勬ゼ灞侷D</param>
/// <param name="titleText">鏍囬鏂囨湰(濡傛灉涓嶄负绌�,鑿滃崟妯″紡鍙樻洿涓烘嫢鏈夋爣棰樼殑妯″紡)</param>
- public TopRightFloorMenuControl(int i_RowCount, int i_widthType, string titleText = null)
+ public TopRightFloorMenuControl(int i_RowCount, int i_widthType,string i_floorId, string titleText = null)
{
+ this.nowFloorId = i_floorId;
this.RowCount = i_RowCount;
if (i_widthType == 1)
{
@@ -162,7 +168,7 @@
btnLine.X = Application.GetRealWidth(81);
}
- if (floorId == Common.Config.Instance.Home.CurrentFloorId)
+ if (this.nowFloorId == floorId)
{
//褰撳墠妤煎眰榛樿璁剧疆涓洪�夋嫨鐘舵��
this.SetRowSelectStatu(rowFrame, true);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
index 5609b22..cc6932b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
@@ -160,27 +160,60 @@
return;
}
this.sensorPushing = true;
- //璁惧
- uint oldTextColor1 = btnDeviceName.TextColor;
- btnDeviceName.TextColor = UserCenterColor.Current.TextOrangeColor;
- //璁惧鎴块棿
- uint oldTextColor2 = btnDeviceRoom.TextColor;
- btnDeviceRoom.TextColor = UserCenterColor.Current.TextOrangeColor;
+
HdlThreadLogic.Current.RunThread(() =>
{
- System.Threading.Thread.Sleep(5000);
- HdlThreadLogic.Current.RunMain(() =>
+ //闂儊5绉�,闂撮殧400姣
+ int count = 5000 / 400;
+ bool isOpen = false;
+ while (this.Parent != null && count >= 0)
{
- if (btnDeviceName.Parent != null)
+ //闂儊鐗规晥
+ HdlThreadLogic.Current.RunMain(() =>
{
- //璁惧
- btnDeviceName.TextColor = oldTextColor1;
- //璁惧鎴块棿
- btnDeviceRoom.TextColor = oldTextColor2;
- }
- this.sensorPushing = false;
- }, ShowErrorMode.NO);
- });
+ isOpen = !isOpen;
+ this.SwitchRowStatuAppeal(isOpen);
+ }, ShowErrorMode.NO);
+ System.Threading.Thread.Sleep(400);
+ count--;
+ }
+ if (this.Parent != null && isOpen == true)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //缁撴潫鏃�,榛樿涓烘棤鐗规晥
+ this.SwitchRowStatuAppeal(false);
+ }, ShowErrorMode.NO);
+ }
+ this.sensorPushing = false;
+
+ }, ShowErrorMode.NO);
+ }
+
+ /// <summary>
+ /// 鍒囨崲琛岄棯鐑佺壒鏁�
+ /// </summary>
+ /// <param name="isOpen"></param>
+ private void SwitchRowStatuAppeal(bool isOpen)
+ {
+ if (isOpen == true)
+ {
+ //鍥炬爣
+ btnIcon.IsSelected = true;
+ //璁惧
+ btnDeviceName.TextColor = UserCenterColor.Current.TextOrangeColor;
+ //璁惧鎴块棿
+ btnDeviceRoom.TextColor = UserCenterColor.Current.TextOrangeColor;
+ }
+ else
+ {
+ //鍥炬爣
+ btnIcon.IsSelected = false;
+ //璁惧
+ btnDeviceName.TextColor = UserCenterColor.Current.TextColor1;
+ //璁惧鎴块棿
+ btnDeviceRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
index 037155f..86cc665 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs
@@ -173,12 +173,17 @@
/// 娣诲姞宸﹁竟鍥炬爣
/// </summary>
/// <param name="i_Iconsize">鍥炬爣澶у皬</param>
+ /// <param name="i_IconPath">鍥炬爣鍦板潃</param>
/// <returns></returns>
- public IconViewControl AddLeftIcon(int i_Iconsize = 81)
+ public IconViewControl AddLeftIcon(int i_Iconsize = 81, string i_IconPath = null)
{
var btnIcon = new IconViewControl(i_Iconsize);
btnIcon.X = ControlCommonResourse.XXLeft + LeftOffset;
btnIcon.Gravity = Gravity.CenterVertical;
+ if (i_IconPath != null)
+ {
+ btnIcon.UnSelectedImagePath = i_IconPath;
+ }
this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index fd43d18..cea4fbb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -85,16 +85,16 @@
this.InitFrameTable();
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
view.Y = value + rowSpace;
}
- this.m_frameTable.AddChidren(view);
+ this.frameTable.AddChidren(view);
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < view.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = view.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -125,10 +125,16 @@
/// 璋冩暣瀛怓rameLayout鐨勭湡瀹為珮搴�
/// </summary>
/// <param name="frame"></param>
- public void AdjustChidrenFrameRealHeight(FrameLayout frame)
+ /// <param name="minHeight">鏈�灏忛珮搴�</param>
+ public void AdjustChidrenFrameRealHeight(FrameLayout frame, int minHeight = -1)
{
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
int value = this.GetLocationMostLastViewBottom(frame);
+ if (minHeight != -1 && value < minHeight)
+ {
+ //娌℃湁瓒呰繃鏈�灏忛珮搴�
+ return;
+ }
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
@@ -148,11 +154,11 @@
}
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
- this.m_frameTable.Height = value;
+ this.frameTable.Height = value;
}
else
{
@@ -174,7 +180,7 @@
this.AdjustTableHeight();
var btnTemp = new BottomClickButton();
- if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)
+ if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)
{
//娌℃湁瓒呰繃
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index 7f5b774..e10b04e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -85,16 +85,16 @@
//鍒濆鍖栨甯冩帶浠�
this.InitFrameTable();
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
view.Y = value + rowSpace;
}
- this.m_frameTable.AddChidren(view);
+ this.frameTable.AddChidren(view);
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < view.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = view.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -108,20 +108,20 @@
this.InitFrameTable();
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
view.Y = value;
}
- this.m_frameTable.AddChidren(view);
+ this.frameTable.AddChidren(view);
if (rowSpace > 0)
{
view.Height += rowSpace;
}
//璋冩暣妗屽竷楂樺害
- if (this.m_frameTable.Height < view.Bottom)
+ if (this.frameTable.Height < view.Bottom)
{
- this.m_frameTable.Height = view.Bottom;
+ this.frameTable.Height = view.Bottom;
}
}
@@ -158,11 +158,11 @@
}
//鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
- int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+ int value = this.GetLocationMostLastViewBottom(this.frameTable);
if (value != -1)
{
//璋冩暣妗屽竷楂樺害
- this.m_frameTable.Height = value + buttomSpace;
+ this.frameTable.Height = value + buttomSpace;
}
else
{
@@ -181,7 +181,7 @@
this.AdjustTableHeight();
var btnTemp = new BottomClickButton();
- if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)
+ if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)
{
//娌℃湁瓒呰繃
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index c4d31b4..f2a9145 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -19,6 +19,10 @@
/// </summary>
public Action CancelClickEvent = null;
/// <summary>
+ /// 鐐瑰嚮鑳屾櫙鏄惁鍏抽棴寮圭獥
+ /// </summary>
+ public bool CloseByClickBack = true;
+ /// <summary>
/// 淇℃伅绫诲瀷
/// </summary>
private ShowMsgType msgType = ShowMsgType.Confirm;
@@ -105,9 +109,12 @@
Common.CommonPage.Instance.AddChidren(frameMain);
frameMain.MouseUpEventHandler += (sender, e) =>
{
- //绉婚櫎鐣岄潰
- frameMain.RemoveFromParent();
- this.ConfirmClickEvent = null;
+ if (this.CloseByClickBack == true)
+ {
+ //绉婚櫎鐣岄潰
+ frameMain.RemoveFromParent();
+ this.ConfirmClickEvent = null;
+ }
};
//鐧借壊鑳屾櫙妗�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
index 77406ae..d3beaca 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
@@ -63,13 +63,13 @@
}
ControlCommonResourse.ReadMessageAgain = false;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
string nowHomeId = Common.Config.Instance.Home.Id;
var pra = new MessageInfoPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotSetAgain", "NotCheck" });
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotCheck" });
if (string.IsNullOrEmpty(result) == true)
{
//鍑洪敊锛岄渶瑕侀噸鏂拌鍙�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
index b0bca1d..5c74341 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -30,7 +30,7 @@
/// </summary>
public bool SetCanSelect
{
- set
+ set
{
m_SetCanSelect = value;
}
@@ -111,7 +111,7 @@
var form = new BottomItemSelectForm();
form.CancelCallEvent = true;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo - 1);
+ form.AddForm(title, listText, null, nowSelectNo - 1);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo - 1)
@@ -128,7 +128,7 @@
{
//璁剧疆鍔熻兘绫诲瀷鍒扮綉鍏�
var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
-
+
HdlThreadLogic.Current.RunMain(() =>
{
if (result == true)
@@ -137,7 +137,7 @@
this.RefreshDfunctionType();
//璁惧鏀瑰彉鍔熻兘绫诲瀷鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
//璋冪敤鍥炶皟鍑芥暟
this.FinishSelectEvent?.Invoke(nowSelectNo);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
index 5582faa..e39e4e8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneRoomControl.cs
@@ -79,7 +79,7 @@
var room = HdlRoomLogic.Current.GetRoomBySceneId(this.SceneId);
if (room != null)
{
- btnRoom.Text = room.Name;
+ btnRoom.Text = HdlRoomLogic.Current.GetRoomName(room);
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
index cb8e6e2..2b6a909 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/AreaCodeSelectForm.cs
@@ -111,7 +111,7 @@
/// <summary>
/// 鍒濆鍖栧湴鍖哄垪琛�
/// </summary>
- private async void InitAreaList()
+ private void InitAreaList()
{
if (listAreaCode == null)
{
@@ -121,10 +121,10 @@
//鑾峰彇鍏ㄩ儴鐨勫湴鍖轰唬鐮佸垪琛�
var Pra = new { Common.CommonPage.RequestVersion };
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAreaCode", false, Pra);
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetAreaCode", false, Pra);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
- if (result == null)
+ if (string.IsNullOrEmpty(result) == true)
{
return;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
index 00c5eb4..e149453 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
@@ -5,14 +5,15 @@
namespace Shared.Phone.UserCenter
{
/// <summary>
- /// 搴曢儴寮圭獥椤圭洰閫夋嫨鐣岄潰(鍒楄〃鏁板敖鍙兘鍒紕閭ｄ箞澶�)
+ /// 搴曢儴寮圭獥椤圭洰閫夋嫨鐣岄潰
/// </summary>
public class BottomItemSelectForm : DialogCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
- /// 瀹屾垚閫夋嫨鐨勪簨浠�(鍙傛暟涓洪�夋嫨鐨勬槸鍒楄〃鐨勭鍑犺,浠�0寮�濮�)
+ /// <para>瀹屾垚閫夋嫨鐨勪簨浠�(鍙傛暟涓洪�夋嫨鐨勬槸鍒楄〃鐨勭鍑犺,浠�0寮�濮�)</para>
+ /// <para>褰揅ancelCallEvent=true鏃�,鐐瑰嚮纭鎸夐挳鏃�,鍙傛暟涓�:-1</para>
/// </summary>
public Action<int> FinishSelectEvent = null;
/// <summary>
@@ -24,7 +25,7 @@
/// </summary>
public bool CancelCallEvent = false;
/// <summary>
- /// 閫夋嫨鐨勮鑳藉惁鍙栨秷
+ /// 閫夋嫨鐨勮鑳藉惁鍙栨秷(榛樿鍙互鍙栨秷)
/// </summary>
public bool SelectRowCanCancel = true;
@@ -36,12 +37,13 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_topText">澶撮儴鏍囬</param>
- /// <param name="i_listText">闇�瑕佹樉绀虹殑鍒楄〃淇℃伅(鍒楄〃鏁板敖鍙兘鍒紕閭ｄ箞澶�)</param>
+ /// <param name="i_listText">闇�瑕佹樉绀虹殑鍒楄〃淇℃伅</param>
+ /// <param name="i_listBottomText">闇�瑕佹樉绀虹殑鍒楄〃淇℃伅(搴曢儴),濡傛灉鍙槸鍗曡鏄剧ず,鍒欐鍊艰缃负null(濡傛灉涓嶄负null,浣嗘槸绱㈠紩鎵�鎸囧悜鐨勫�间负null,鍒欒琛屽己鍒跺崟琛屾樉绀�)</param>
/// <param name="i_selectNo">璁剧疆鍝釜鏂囨湰涓洪粯璁ら�夋嫨(涓嶈缃～-1)</param>
- public void ShowForm(string i_topText, List<string> i_listText, int i_selectNo)
+ public void ShowForm(string i_topText, List<string> i_listText, List<string> i_listBottomText, int i_selectNo)
{
//鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame(i_topText, i_listText, i_selectNo);
+ this.InitMiddleFrame(i_topText, i_listText, i_listBottomText, i_selectNo);
}
/// <summary>
@@ -49,48 +51,62 @@
/// </summary>
/// <param name="i_topText">澶撮儴鏍囬</param>
/// <param name="i_listText">闇�瑕佹樉绀虹殑鍒楄〃淇℃伅</param>
+ /// <param name="i_listBottomtext">闇�瑕佹樉绀虹殑鍒楄〃淇℃伅(搴曢儴)</param>
/// <param name="i_selectNo">榛樿閫夋嫨</param>
- private void InitMiddleFrame(string i_topText, List<string> i_listText, int i_selectNo)
+ private void InitMiddleFrame(string i_topText, List<string> i_listText, List<string> i_listBottomtext, int i_selectNo)
{
- //寮у害鐨勫渾鐨勪竴鍗婄殑楂樺害(鍥哄畾)
- int halfRoundHeigth = Application.GetRealHeight(116) / 2;
- //澶撮儴楂樺害
- int topHeight = Application.GetRealHeight(195);
- //搴曢儴楂樺害
- int bottomHeight = Application.GetRealHeight(57);
- //鏄庣粏楂樺害
- int detailHeight = (ControlCommonResourse.ListViewRowHeight + Application.GetRealHeight(12)) * i_listText.Count;
+ //涓嶈兘澶熸粦鍔ㄧ殑涓滆タ
+ FrameListControl listDetailView1 = null;
+ //鑳藉婊戝姩鐨勪笢瑗�
+ VerticalListControl listDetailView2 = null;
- //鎼炰竴涓�忔槑鐨勬
- var frameTransparent = new FrameLayout();
- frameTransparent.Y = bodyFrameLayout.Height - topHeight - bottomHeight - detailHeight;
- frameTransparent.Height = topHeight + bottomHeight + detailHeight + halfRoundHeigth * 2;//楂樺害灏辨槸瑕佸畠瓒呰繃锛岄殢渚挎悶鐨�
- frameTransparent.BackgroundColor = UserCenterColor.Current.Transparent;
- bodyFrameLayout.AddChidren(frameTransparent);
+ //鈽呪槄浠庝笅寰�涓婃坊鍔犳帶浠垛槄鈽�
- //鏄庣粏鍒楄〃鐨勬甯冿紝鐧借壊鑳屾櫙(瀹冧笌瀹為檯楂樺害灏忎簡鍗婁釜寮у害鐨勫渾)
- var detailBackFrame = new FrameLayout();
- detailBackFrame.Y = halfRoundHeigth;
- detailBackFrame.Height = frameTransparent.Height;
- detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
- frameTransparent.AddChidren(detailBackFrame);
+ //鏄庣粏楂樺害(鍒濆鏈�澶氬彧鏄剧ず9琛�)
+ int detailHeight = ControlCommonResourse.ListViewRowHeight + Application.GetRealHeight(12);
+ if (i_listText.Count > 9)
+ {
+ //63:涓婇儴闂磋窛 58:涓嬮儴闂磋窛
+ detailHeight = detailHeight * 9 + Application.GetRealHeight(63 + 58);
+ listDetailView2 = new VerticalListControl(12);
+ listDetailView2.Height = detailHeight;
+ listDetailView2.Gravity = Gravity.BottomCenter;
+ listDetailView2.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listDetailView2);
+ }
+ else
+ {
+ //63:涓婇儴闂磋窛 58:涓嬮儴闂磋窛
+ detailHeight = detailHeight * i_listText.Count + Application.GetRealHeight(63 + 58);
+ listDetailView1 = new FrameListControl(12);
+ listDetailView1.Height = detailHeight;
+ listDetailView1.Gravity = Gravity.BottomCenter;
+ listDetailView1.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(listDetailView1);
+ }
+ //绾�
+ int lineYY = listDetailView1 != null ? listDetailView1.Y : listDetailView2.Y;
+ var btnLine = new NormalViewControl(bodyFrameLayout.Width, ControlCommonResourse.BottomLineHeight, false);
+ btnLine.Y = lineYY - ControlCommonResourse.BottomLineHeight;
+ btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+ bodyFrameLayout.AddChidren(btnLine);
- //寮у害鐨勫渾
- var rowRound = new FrameLayout();
- rowRound.Width = bodyFrameLayout.Width;
- rowRound.Height = halfRoundHeigth * 2;
- rowRound.BackgroundColor = UserCenterColor.Current.White;
- rowRound.Radius = (uint)halfRoundHeigth;
- frameTransparent.AddChidren(rowRound);
+ //澶撮儴鐧借壊鑳屾櫙
+ var topBackFame = new FrameLayout();
+ topBackFame.Y = btnLine.Y - Application.GetRealHeight(138);
+ topBackFame.BackgroundColor = UserCenterColor.Current.White;
+ topBackFame.Height = Application.GetRealHeight(138);
+ topBackFame.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ bodyFrameLayout.AddChidren(topBackFame);
//澶撮儴淇℃伅
- var btnTitle = new NormalViewControl(detailBackFrame.Width, Application.GetRealHeight(63), false);
- btnTitle.Y = Application.GetRealHeight(35);
+ var btnTitle = new NormalViewControl(topBackFame.Width, Application.GetRealHeight(65), false);
+ btnTitle.Y = Application.GetRealHeight(34);
btnTitle.Text = i_topText;
btnTitle.TextColor = UserCenterColor.Current.TextColor4;
btnTitle.TextSize = 16;
btnTitle.TextAlignment = TextAlignment.Center;
- rowRound.AddChidren(btnTitle);
+ topBackFame.AddChidren(btnTitle);
//鍙栨秷
var btnCancel = new NormalViewControl(200, 58, true);
@@ -98,7 +114,7 @@
btnCancel.Y = Application.GetRealHeight(40);
btnCancel.TextColor = UserCenterColor.Current.TextGrayColor1;
btnCancel.TextID = R.MyInternationalizationString.uCancel;
- rowRound.AddChidren(btnCancel);
+ topBackFame.AddChidren(btnCancel);
btnCancel.ButtonClickEvent += (sender, e) =>
{
this.CloseForm();
@@ -111,7 +127,7 @@
btnFinish.TextAlignment = TextAlignment.CenterRight;
btnFinish.TextColor = 0xfffb744a;
btnFinish.TextID = R.MyInternationalizationString.uFinish;
- rowRound.AddChidren(btnFinish);
+ topBackFame.AddChidren(btnFinish);
btnFinish.ButtonClickEvent += (sender, e) =>
{
if (FinishSelectEvent != null && oldSelectContr != null)
@@ -127,23 +143,32 @@
this.CloseForm();
};
- //绾�
- var btnLine = new NormalViewControl(detailBackFrame.Width, ControlCommonResourse.BottomLineHeight, false);
- btnLine.Y = Application.GetRealHeight(138) - ControlCommonResourse.BottomLineHeight - halfRoundHeigth;
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- detailBackFrame.AddChidren(btnLine);
+ //娣诲姞涓�涓櫧鑹茬殑闂磋窛
+ var frameSpace = new FrameLayout();
+ frameSpace.Height = Application.GetRealHeight(63);
+ listDetailView1?.AddChidren(frameSpace);
+ listDetailView2?.AddChidren(frameSpace);
- //鍒楄〃鎺т欢
- var listView = new FrameListControl(12);
- listView.Height = detailHeight + bottomHeight;
- listView.Y = topHeight - halfRoundHeigth;
- detailBackFrame.AddChidren(listView);
+ //鏄庣粏鍒楄〃鎺т欢
+ int rowSpace = listDetailView1 != null ? listDetailView1.rowSpace : listDetailView2.rowSpace;
for (int i = 0; i < i_listText.Count; i++)
{
- var btnRow = new NormalSelectControl(i_listText[i], listView.rowSpace / 2);
+ NormalSelectControl btnRow = null;
+ if (i_listBottomtext == null || i_listBottomtext[i] == null)
+ {
+ //鍙樉绀轰竴琛�
+ btnRow = new NormalSelectControl(i_listText[i], rowSpace / 2);
+ }
+ else
+ {
+ //鏄剧ず涓婁笅涓よ
+ btnRow = new NormalSelectControl(i_listText[i], i_listBottomtext[i], rowSpace / 2);
+ }
btnRow.LeftOffset = Application.GetRealWidth(81) - ControlCommonResourse.XXLeft;//鍚戝彸鍋忕Щ
btnRow.RightOffset = ControlCommonResourse.XXLeft - Application.GetRealWidth(81);//鍚戝乏鍋忕Щ
- listView.AddChidren(btnRow);
+ listDetailView1?.AddChidren(btnRow);
+ listDetailView2?.AddChidren(btnRow);
+
btnRow.InitControl();
btnRow.MainKeys = i.ToString();
btnRow.ButtonClickEvent += (sender, e) =>
@@ -178,6 +203,14 @@
btnRow.AddBottomLine();
}
}
+
+ //濡傛灉鏄粦鍔ㄦ帶浠�,鍒欐坊鍔犲簳閮ㄩ棿璺�
+ if (listDetailView2 != null)
+ {
+ var frameSpace2 = new FrameLayout();
+ frameSpace2.Height = Application.GetRealHeight(58);
+ listDetailView2?.AddChidren(frameSpace2);
+ }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
index 4db67ff..4d96275 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlACZbGatewayUpdateLogic.cs
@@ -173,7 +173,7 @@
//涓嬭浇鍥轰欢璧勬簮
var pra = new { RequestVersion = Common.CommonPage.RequestVersion, DistributedMark = this.deviceFirmware.DistributedMark };
- this.deviceFirmwareByte = await Common.CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("FirmwareMana/DownloadPlatformUploadFirmware", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra)));
+ this.deviceFirmwareByte = Common.CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("FirmwareMana/DownloadPlatformUploadFirmware", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra)));
if (this.deviceFirmwareByte == null)
{
//璁惧鍥轰欢璧勬簮涓嬭浇澶辫触
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
index 88b24d8..5eeab9e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAlarmsLogic.cs
@@ -58,34 +58,27 @@
this.listDoorLockAlarmInfo.Clear();
string fileName = DateTime.Now.ToString("yyyyMMdd");
- //鍒ゆ柇鏈夋病鏈夎繖涓枃浠�
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory, fileName);
- if (System.IO.File.Exists(fullName) == true)
+ //瀹夐槻鎶ヨ
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ var data1 = HdlFileLogic.Current.ReadFileByteContent(fullName);
+ if (data1 != null)
{
- lock (listSafetyAlarmInfo)
+ this.listSafetyAlarmInfo = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data1));
+ if (this.listSafetyAlarmInfo == null)
{
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- var data = Global.ReadFileByDirectory(dir, fileName);
- this.listSafetyAlarmInfo = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
- if (this.listSafetyAlarmInfo == null)
- {
- this.listSafetyAlarmInfo = new List<SafeguardAlarmInfo>();
- }
+ this.listSafetyAlarmInfo = new List<SafeguardAlarmInfo>();
}
}
+
//闂ㄩ攣璁板綍
- fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory, fileName);
- if (System.IO.File.Exists(fullName) == true)
+ fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);
+ var data2 = HdlFileLogic.Current.ReadFileByteContent(fullName);
+ if (data2 != null)
{
- lock (listDoorLockAlarmInfo)
+ this.listDoorLockAlarmInfo = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data2));
+ if (this.listDoorLockAlarmInfo == null)
{
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- var data = Global.ReadFileByDirectory(dir, fileName);
- this.listDoorLockAlarmInfo = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
- if (this.listDoorLockAlarmInfo == null)
- {
- this.listDoorLockAlarmInfo = new List<DeviceAlarmInfo>();
- }
+ this.listDoorLockAlarmInfo = new List<DeviceAlarmInfo>();
}
}
}
@@ -141,10 +134,8 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listSafetyAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);
if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
{
@@ -217,10 +208,8 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listSafetyAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.SafeguardAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listSafetyAlarmInfo);
}
}
@@ -248,16 +237,15 @@
{
lock (listSafetyAlarmInfo)
{
- string fullPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
- //鍊熺敤涓�涓嬭嚜鍔ㄥ浠借幏鍙栨寚瀹氱洰褰曚笅闈㈢殑鏂囦欢鐨勫嚱鏁�
- List<string> listFile = HdlAutoBackupLogic.GetFileFromDirectory(fullPath);
+ string fullPath = DirNameResourse.SafeguardAlarmDirectory;
+ //鑾峰彇鎸囧畾鐩綍涓嬮潰鐨勬枃浠�
+ List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);
//鍗囧簭
listFile.Sort();
var dic = new Dictionary<string, List<SafeguardAlarmInfo>>();
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardAlarmDirectory);
for (int i = listFile.Count - 1; i >= 0; i--)
{
- var data = Global.ReadFileByDirectory(dir, listFile[i]);
+ var data = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(fullPath, listFile[i]));
var info = JsonConvert.DeserializeObject<List<SafeguardAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
if (info == null)
{
@@ -309,6 +297,10 @@
return null;
}
IASZone iASZone = (IASZone)i_device;
+ if (iASZone.iASInfo == null)
+ {
+ return null;
+ }
var alarmInfo = new IASZoneReportInfo();
if (iASZone.iASInfo.Battery == 1)
@@ -323,11 +315,11 @@
}
//杩愬姩浼犳劅鍣�
- if (device.IasDeviceType == 13)
+ if (device.IasDeviceType == 13 || device.IasDeviceType == 541)
{
if (iASZone.iASInfo.Alarm1 == 1)
{
- //鏈変笉鏄庣墿浣撶粡杩�
+ //鏈変汉缁忚繃
alarmInfo.AlarmMsg = Language.StringByID(R.MyInternationalizationString.uHadUnKnowObjectPassed);
}
}
@@ -475,10 +467,9 @@
}
//淇濆瓨鍒版湰鍦�
- var saveData = JsonConvert.SerializeObject(this.listDoorLockAlarmInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- Global.WriteFileToDirectoryByBytes(dir, fileName, byteData);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DoorLockAlarmDirectory, fileName);
+ HdlFileLogic.Current.SaveFileContent(fullName, this.listDoorLockAlarmInfo);
+
return true;
}
}
@@ -491,16 +482,15 @@
{
lock (listDoorLockAlarmInfo)
{
- string fullPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
- //鍊熺敤涓�涓嬭嚜鍔ㄥ浠借幏鍙栨寚瀹氱洰褰曚笅闈㈢殑鏂囦欢鐨勫嚱鏁�
- List<string> listFile = HdlAutoBackupLogic.GetFileFromDirectory(fullPath);
+ string fullPath = DirNameResourse.DoorLockAlarmDirectory;
+ //鑾峰彇鎸囧畾鐩綍涓嬮潰鐨勬枃浠�
+ List<string> listFile = HdlFileLogic.Current.GetFileFromDirectory(fullPath);
//鍗囧簭
listFile.Sort();
var dic = new Dictionary<string, List<DeviceAlarmInfo>>();
- string dir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DoorLockAlarmDirectory);
for (int i = listFile.Count - 1; i >= 0; i--)
{
- var data = Global.ReadFileByDirectory(dir, listFile[i]);
+ var data = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(fullPath, listFile[i]));
var info = JsonConvert.DeserializeObject<List<DeviceAlarmInfo>>(System.Text.Encoding.UTF8.GetString(data));
if (info == null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
index e855dda..4d6cefc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlAutoBackupLogic.cs
@@ -22,10 +22,10 @@
/// 鎵ц涓婁紶鑷姩澶囦唤鏁版嵁(0:娌℃湁鍙笂浼犵殑鑷姩澶囦唤鏁版嵁 1:鎴愬姛 -1锛氬け璐�)
/// </summary>
/// <returns></returns>
- public async static Task<int> DoUpLoadAutoBackupData()
+ public static int DoUpLoadAutoBackupData()
{
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null)
{
return -1;
@@ -36,15 +36,15 @@
//鍒犻櫎鍏ㄩ儴鐨勮嚜鍔ㄥ浠界殑鏈湴鏂囦欢
DeleteAllAutoBackupFile();
//濡傛灉娌℃湁鑷姩澶囦唤鏁版嵁,鍒欐妸鏈湴鍏ㄩ儴涓滆タ涓婁紶
- var pathTemp = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
+ var pathTemp = DirNameResourse.AutoBackupDirectory;
//澶嶅埗鏈湴鎵�鏈夋枃浠惰繃鍘�
- List<string> listAllFile = Global.FileListByHomeId();
+ List<string> listAllFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string fileName in listAllFile)
{
- string oldFile = UserCenterLogic.CombinePath(fileName);
+ string oldFile = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
string newFile = System.IO.Path.Combine(pathTemp, fileName);
//澶嶅埗鏂囦欢
- System.IO.File.Copy(oldFile, newFile, true);
+ HdlFileLogic.Current.CopyFile(oldFile, newFile);
}
}
@@ -63,7 +63,7 @@
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileUploading));
//涓婁紶鏂囦欢鍒颁簯绔�
- bool result = await UpLoadBackupFileToDB(listEditor);
+ bool result = UpLoadBackupFileToDB(listEditor);
if (result == false)
{
ProgressFormBar.Current.Close();
@@ -71,7 +71,7 @@
}
//鍒犻櫎鏂囦欢
- result = await DoDeleteFileFromDB(listDelete);
+ result = DoDeleteFileFromDB(listDelete);
if (result == false)
{
ProgressFormBar.Current.Close();
@@ -88,16 +88,16 @@
/// </summary>
/// <param name="listFile"></param>
/// <returns></returns>
- private async static Task<bool> UpLoadBackupFileToDB(List<string> listFile)
+ private static bool UpLoadBackupFileToDB(List<string> listFile)
{
int listFileCount = listFile.Count;
- string backUpDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
+ string backUpDir = DirNameResourse.AutoBackupDirectory;
for (int i = 0; i < listFile.Count; i++)
{
string file = listFile[i];
var datainfo = new FileInfoData();
datainfo.BackupFileName = file;
- datainfo.BackupFileContent = ReadDirctoryFileByName(backUpDir, file);
+ datainfo.BackupFileContent = HdlFileLogic.Current.ReadFileByteContent(System.IO.Path.Combine(backUpDir, file));
if (datainfo.BackupFileContent == null)
{
continue;
@@ -106,7 +106,7 @@
list.Add(datainfo);
//鎵ц鏄笂浼�
- bool falge = await DoUpLoadInfoToDB(list);
+ bool falge = DoUpLoadInfoToDB(list);
if (falge == false)
{
return false;
@@ -122,7 +122,7 @@
/// </summary>
/// <param name="listData">鍒犻櫎鐨勬枃浠�</param>
/// <returns></returns>
- private async static Task<bool> DoDeleteFileFromDB(List<string> listData)
+ private static bool DoDeleteFileFromDB(List<string> listData)
{
if (listData.Count == 0)
{
@@ -130,7 +130,7 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null || data.Count == 0)
{
return true;
@@ -146,19 +146,18 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("App/DeleteAppBackupFile", true, upData);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/DeleteAppBackupFile", true, upData);
if (falge == false)
{
return false;
}
//鍒犻櫎鏂囦欢
- string strroot = Common.Config.Instance.FullPath;
- var backPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);
+ var backPath = DirNameResourse.AutoBackupdeleteDirectory;
foreach (var file in listData)
{
string fullName = System.IO.Path.Combine(backPath, file);
- System.IO.File.Delete(fullName);
+ HdlFileLogic.Current.DeleteFile(fullName);
}
return true;
}
@@ -168,7 +167,7 @@
/// </summary>
/// <param name="listData">涓婁紶鐨勬暟鎹�</param>
/// <returns></returns>
- private async static Task<bool> DoUpLoadInfoToDB(List<FileInfoData> listData)
+ private static bool DoUpLoadInfoToDB(List<FileInfoData> listData)
{
var nowZigbeeNumHomeId = Shared.Common.Config.Instance.Home.Id;
@@ -178,19 +177,18 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("App/HomeAppAutoDataBackup", true, upData);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/HomeAppAutoDataBackup", true, upData, null, true);
if (falge == false)
{
return false;
}
//鍒犻櫎鏂囦欢
- string strroot = Common.Config.Instance.FullPath;
- var backPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
+ var backPath = DirNameResourse.AutoBackupDirectory;
foreach (var file in listData)
{
string fullName = System.IO.Path.Combine(backPath, file.BackupFileName);
- System.IO.File.Delete(fullName);
+ HdlFileLogic.Current.DeleteFile(fullName);
}
return true;
@@ -200,31 +198,13 @@
#region 鈻� 鑾峰彇鏂囦欢___________________________
- /// <summary>
- /// 鑾峰彇鎸囧畾鏂囦欢澶逛笅闈㈢殑鏂囦欢鍐呭
- /// </summary>
- /// <param name="dirctory">鎸囧畾鏂囦欢澶圭殑鍚嶅瓧(涓嶆槸鍏ㄨ矾寰�)</param>
- /// <param name="fileName">File name.</param>
- private static byte[] ReadDirctoryFileByName(string dirctory, string fileName)
- {
- var path = UserCenterLogic.CombinePath(dirctory, fileName);
- if (System.IO.File.Exists(path) == false)
- {
- return null;
- }
- return Shared.IO.FileUtils.ReadFile(path);
- }
-
/// <summary>
/// 鑾峰彇鑷姩澶囦唤鐩綍涓嬬殑娣诲姞鎴栬�呯紪杈戠殑鏂囦欢
/// </summary>
/// <returns></returns>
public static List<string> GetAutoBackupEditorFile()
{
- string strroot = Common.Config.Instance.FullPath;
- var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
-
- return GetFileFromDirectory(path);
+ return HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupDirectory);
}
/// <summary>
@@ -233,32 +213,7 @@
/// <returns></returns>
public static List<string> GetAutoBackupDeleteFile()
{
- string strroot = Common.Config.Instance.FullPath;
- var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);
-
- return GetFileFromDirectory(path);
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾鏂囦欢澶归噷闈㈢殑鍏ㄩ儴鏂囦欢
- /// </summary>
- /// <param name="directory">鏂囦欢璺緞锛堝叏鍚嶏級</param>
- /// <returns></returns>
- public static List<string> GetFileFromDirectory(string directory)
- {
- if (System.IO.Directory.Exists(directory) == false)
- {
- return new List<string>();
- }
-
- List<string> list = new List<string>();
- var files = System.IO.Directory.GetFiles(directory);
- foreach (var file in files)
- {
- var f = file.Substring(directory.Length + 1);
- list.Add(f);
- }
- return list;
+ return HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupdeleteDirectory);
}
#endregion
@@ -271,35 +226,26 @@
/// <param name="fileName">鏂囦欢鐨勫悕瀛�,涓嶅惈璺緞</param>
public static void AddOrEditorFile(string fileName)
{
- //鏍圭洰褰�
- string strroot = Common.Config.Instance.FullPath;
- if (strroot == string.Empty)
- {
- return;
- }
+ fileName = System.IO.Path.GetFileName(fileName);
//鑷姩澶囦唤鐩綍
- string strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
-
-
- //鑷姩鍒犻櫎澶囦唤鐩綍
- string strdelBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);
- //濡傛灉鍒犻櫎鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
- string delFile = System.IO.Path.Combine(strdelBackPath, fileName);
- if (System.IO.File.Exists(delFile) == true)
- {
- System.IO.File.Delete(delFile);
- }
-
- string soureFile = System.IO.Path.Combine(strroot, fileName);
- string newFile = System.IO.Path.Combine(strBackPath, fileName);
+ string strBackPath = DirNameResourse.AutoBackupDirectory;
if (System.IO.Directory.Exists(strBackPath) == false)
{
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- UserCenterLogic.CreatAllUserCenterDirectory();
+ HdlFileLogic.Current.CreatAllUserCenterDirectory();
}
+ //鑷姩鍒犻櫎澶囦唤鐩綍
+ string strdelBackPath = DirNameResourse.AutoBackupdeleteDirectory;
+ //濡傛灉鍒犻櫎鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
+ string delFile = System.IO.Path.Combine(strdelBackPath, fileName);
+ HdlFileLogic.Current.DeleteFile(delFile);
+
+ string soureFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, fileName);
+ string newFile = System.IO.Path.Combine(strBackPath, fileName);
+
//鍘熷師鏈湰鐨勫鍒舵枃浠跺埌鎸囧畾鏂囦欢澶�
- CopyFile(soureFile, newFile);
+ HdlFileLogic.Current.CopyFile(soureFile, newFile);
}
/// <summary>
@@ -308,15 +254,9 @@
/// <param name="fileName">鏂囦欢鐨勫悕瀛�,涓嶅惈璺緞</param>
public static void DeleteFile(string fileName)
{
- //鏍圭洰褰�
- string strroot = Common.Config.Instance.FullPath;
- if (strroot == string.Empty)
- {
- return;
- }
+ fileName = System.IO.Path.GetFileName(fileName);
//鑷姩鍒犻櫎澶囦唤鐩綍
- string strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);
-
+ string strBackPath = DirNameResourse.AutoBackupdeleteDirectory;
string newFile = System.IO.Path.Combine(strBackPath, fileName);
//鍒涘缓涓�涓┖鏂囦欢
@@ -324,13 +264,11 @@
file.Close();
//鑷姩澶囦唤鐩綍
- strBackPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
+ strBackPath = DirNameResourse.AutoBackupDirectory;
//濡傛灉澶囦唤鍒楄〃閲岄潰鏈夎繖涓笢瑗跨殑璇濓紝绉婚櫎鎺�
string delFile = System.IO.Path.Combine(strBackPath, fileName);
- if (System.IO.File.Exists(delFile) == true)
- {
- System.IO.File.Delete(delFile);
- }
+
+ HdlFileLogic.Current.DeleteFile(delFile);
}
#endregion
@@ -341,15 +279,15 @@
/// 鍚屾浜戠鏁版嵁(浠呴檺APP鍚姩涔嬪悗) -1锛氬紓甯� 0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝� 1锛氭甯稿悓姝� 2:娌℃湁鑷姩澶囦唤鏁版嵁
/// </summary>
/// <returns></returns>
- public static async Task<int> SynchronizeDbAutoBackupData()
+ public static int SynchronizeDbAutoBackupData()
{
//鍒ゆ柇鏄惁鑳藉鍚屾鏁版嵁
- string checkFile = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoDownLoadBackupCheckFile);
+ string checkFile = DirNameResourse.AutoDownLoadBackupCheckFile;
//濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
if (System.IO.File.Exists(checkFile) == true)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDbSharedContent();
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
return 0;
}
@@ -357,7 +295,7 @@
if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDbSharedContent();
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file = System.IO.File.Create(checkFile);
file.Close();
@@ -365,7 +303,7 @@
}
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var data = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var data = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (data == null)
{
return -1;
@@ -373,7 +311,7 @@
if (data.Count == 0)
{
//鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭
- await HdlShardLogic.Current.SynchronizeDbSharedContent();
+ HdlShardLogic.Current.SynchronizeDbSharedContent();
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file = System.IO.File.Create(checkFile);
file.Close();
@@ -387,7 +325,7 @@
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uAccountDataIsSynchronizing));
//浠庝簯绔幏鍙栧浠界殑鏂囦欢锛岀劧鍚庡瓨鍏ユ湰鍦版寚瀹氱殑涓存椂鏂囦欢澶�
- string tempDir = await HdlBackupLogic.Current.GetBackFileFromDBAndSetToLocation(backId);
+ string tempDir = HdlBackupLogic.Current.GetBackFileFromDBAndSetToLocation(backId);
if (tempDir == null)
{
//鍒犻櫎妫�娴嬫枃浠�
@@ -396,10 +334,10 @@
return -1;
}
//濡傛灉璇诲彇鍒扮殑鏂囦欢瀹屽叏娌℃湁闂锛屽垯娓呯悊鏈湴鐨勬枃浠�
- UserCenterLogic.DeleteAllLocationFile(false);
+ HdlFileLogic.Current.DeleteAllLocationFile(false);
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
- Global.MoveDirectoryFileToHomeDirectory(tempDir, true);
+ HdlFileLogic.Current.MoveDirectoryFileToHomeDirectory(tempDir, true);
//鍒涘缓涓�涓┖鏂囦欢(鏍囪瘑宸茬粡瀹屾垚鍚屾)
var file2 = System.IO.File.Create(checkFile);
@@ -416,37 +354,19 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// 澶嶅埗鏂囦欢
- /// </summary>
- /// <param name="sourseFile">鎸囧畾鏂囦欢锛堝叏鍚嶏級</param>
- /// <param name="newFile">鏂版枃浠讹紙鍏ㄥ悕锛�</param>
- private static void CopyFile(string sourseFile, string newFile)
- {
- try
- {
- if (System.IO.File.Exists(sourseFile) == false)
- {
- return;
- }
- System.IO.File.Copy(sourseFile, newFile, true);
- }
- catch { }
- }
-
- /// <summary>
/// 鍒犻櫎鍏ㄩ儴鐨勮嚜鍔ㄥ浠界殑鏈湴鏂囦欢(姝ゅ嚱鏁扮敤浜庤鍙栬嚜鍔ㄥ浠界殑鏃跺�欎娇鐢�)
/// </summary>
public static void DeleteAllAutoBackupFile()
{
//娓呯┖鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
- string dirPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- System.IO.Directory.Delete(dirPath, true);
- System.IO.Directory.CreateDirectory(dirPath);
+ string dirPath = DirNameResourse.AutoBackupDirectory;
+ HdlFileLogic.Current.DeleteDirectory(dirPath);
+ HdlFileLogic.Current.CreateDirectory(dirPath, true);
//娓呯┖鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
- dirPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupdeleteDirectory);
- System.IO.Directory.Delete(dirPath, true);
- System.IO.Directory.CreateDirectory(dirPath);
+ dirPath = DirNameResourse.AutoBackupdeleteDirectory;
+ HdlFileLogic.Current.DeleteDirectory(dirPath);
+ HdlFileLogic.Current.CreateDirectory(dirPath, true);
}
#endregion
@@ -461,11 +381,11 @@
public static void SaveBackupNotPrompted(bool notPrompted, int day = -1)
{
//鏂囦欢鍏ㄨ矾寰�
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);
+ string fullName = DirNameResourse.AutoBackupNotPromptedFile;
BackupNotPrompted info = null;
if (System.IO.File.Exists(fullName) == true)
{
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);
+ var data = HdlFileLogic.Current.ReadFileByteContent(fullName);
info = JsonConvert.DeserializeObject<BackupNotPrompted>(System.Text.Encoding.UTF8.GetString(data));
}
if (info == null)
@@ -480,9 +400,7 @@
info.Day = day;
}
//淇濆瓨
- var saveData = JsonConvert.SerializeObject(info);
- var byteData = System.Text.Encoding.UTF8.GetBytes(saveData);
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile, byteData);
+ HdlFileLogic.Current.SaveFileContent(fullName, info);
}
/// <summary>
@@ -495,10 +413,8 @@
//鏆備笉鏀寔鎴愬憳
return;
}
- string strroot = Common.Config.Instance.FullPath;
- var path = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- List<string> listFile1 = GetFileFromDirectory(path);
+ List<string> listFile1 = HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.AutoBackupDirectory);
List<string> listFile2 = GetAutoBackupDeleteFile();
if (listFile1.Count == 0 && listFile2.Count == 0)
@@ -512,7 +428,7 @@
}
//鏂囦欢鍏ㄨ矾寰�
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);
+ string fullName = DirNameResourse.AutoBackupNotPromptedFile;
if (System.IO.File.Exists(fullName) == false)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -523,7 +439,7 @@
return;
}
BackupNotPrompted info = null;
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupNotPromptedFile);
+ var data = HdlFileLogic.Current.ReadFileByteContent(fullName);
info = JsonConvert.DeserializeObject<BackupNotPrompted>(System.Text.Encoding.UTF8.GetString(data));
if (info.NotPrompted == true)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index 7a1f143..fffeefb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -5,7 +5,6 @@
using System.IO;
using System.Net;
using System.Text;
-using System.Threading.Tasks;
namespace Shared.Phone.UserCenter
{
@@ -46,7 +45,7 @@
/// <param name="ZigbeeUniqueId">缃戝叧鐨勫敮涓�Id,鑾峰彇缃戝叧澶囦唤闇�瑕�</param>
/// <param name="getOptionBackup">鏄惁鑾峰彇鍔熻兘澶囦唤</param>
/// <returns></returns>
- public async Task<List<BackupListNameInfo>> GetBackupListNameFromDB(int ZigbeeBackupType = 0, string ZigbeeUniqueId = null, bool getOptionBackup = false)
+ public List<BackupListNameInfo> GetBackupListNameFromDB(int ZigbeeBackupType = 0, string ZigbeeUniqueId = null, bool getOptionBackup = false)
{
//澶囦唤鍚嶅瓧寰堝皯鐨勫唴瀛橈紝鍙互鐩存帴涓�娆℃�у叏閮ㄥ彇瀹�
var pra = new GetBackupListPra();
@@ -58,8 +57,7 @@
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
//璁块棶鎺ュ彛
- var listNotShow = new List<string>() { "NotSetAgain" };
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomeDataBackupPagger", true, pra, listNotShow);
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomeDataBackupPagger", true, pra);
if (string.IsNullOrEmpty(result) == true)
{
return null;
@@ -91,18 +89,18 @@
/// <param name="IsGatewayAutoBackup">褰撳墠鑾峰彇鏄惁涓虹綉鍏宠嚜鍔ㄥ浠�</param>
/// <param name="ZigbeeUniqueId">ZigbeeUniqueId 缃戝叧鐨勫敮涓�Id(褰揑sGatewayBackup=true鏃讹紝姝ゅ弬鏁板繀椤绘彁渚�</param>
/// <returns></returns>
- public async Task<string> GetBackFileFromDBAndSetToLocation(string BackupClassId, bool IsGatewayAutoBackup = false, string ZigbeeUniqueId = null)
+ public string GetBackFileFromDBAndSetToLocation(string BackupClassId, bool IsGatewayAutoBackup = false, string ZigbeeUniqueId = null)
{
//涓嶅厑璁告寜绯荤粺鐨勮繑鍥為敭
Shared.Common.CommonPage.BackKeyCanClick = false;
UserCenterResourse.AccountOption.AppCanSignout = false;
//棣栧厛鍏堝垱寤轰竴涓复鏃舵枃浠跺す,瀛樺湪鏂囦欢鍒欐竻绌�
- string newDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadBackupTempDirectory);
- Global.CreateEmptyDirectory(newDir, true);
+ string newDir = DirNameResourse.DownLoadBackupTempDirectory;
+ HdlFileLogic.Current.CreateDirectory(newDir, true);
//鑾峰彇杩欎釜澶囦唤涓嬮潰鏈夊灏戜釜鏂囦欢
- List<string> listFile = await GetBackFileIDFromDB(BackupClassId, IsGatewayAutoBackup, ZigbeeUniqueId);
+ List<string> listFile = GetBackFileIDFromDB(BackupClassId, IsGatewayAutoBackup, ZigbeeUniqueId);
if (listFile == null)
{
//鍏抽棴杩涘害鏉�
@@ -138,7 +136,7 @@
//鈽呰缃渶瑕佽幏鍙栫殑鏂囦欢鍚嶅瓧鈽�
pra.BackupFileName = fileName;
- var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("App/DownloadSomeDataBackup", true, pra);
+ var result = UserCenterLogic.GetByteResponseDataByRequestHttps("App/DownloadSomeDataBackup", true, pra, null, true);
if (result == null)
{
//鍏抽棴杩涘害鏉�
@@ -149,7 +147,7 @@
return null;
}
//灏嗚緭鍏ュ啓鍏ユ湰鍦扮殑涓存椂鏂囦欢澶�
- Global.WriteFileToDirectoryByBytes(newDir, fileName, result);
+ HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(newDir, fileName), System.Text.Encoding.UTF8.GetString(result));
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listFileCount);
}
@@ -169,7 +167,7 @@
/// <param name="IsGatewayAutoBackup">褰撳墠鑾峰彇鏄惁涓虹綉鍏宠嚜鍔ㄥ浠�</param>
/// <param name="ZigbeeUniqueId">ZigbeeUniqueId 缃戝叧鐨勫敮涓�Id(褰揑sGatewayBackup=true鏃讹紝姝ゅ弬鏁板繀椤绘彁渚�</param>
/// <returns></returns>
- private async Task<List<string>> GetBackFileIDFromDB(string BackupClassId, bool IsGatewayAutoBackup, string ZigbeeUniqueId)
+ private List<string> GetBackFileIDFromDB(string BackupClassId, bool IsGatewayAutoBackup, string ZigbeeUniqueId)
{
var pra = new LoadBackInfoPra();
pra.BackupClassId = BackupClassId;
@@ -181,8 +179,8 @@
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
//棣栧厛鍏堣幏鍙栦簯绔湁浠�涔堟枃浠�
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomeDataBackupUploadListPagger", true, pra);
- if (result == null)
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomeDataBackupUploadListPagger", true, pra);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -208,7 +206,7 @@
/// <param name="ManualBackupType">鎵嬪姩澶囦唤绫诲瀷(0:App鎵嬪姩澶囦唤,2锛氱綉鍏虫墜鍔ㄥ浠�)</param>
/// <param name="ZigbeeUniqueId">缃戝叧鐨勫敮涓�Id,褰揗anualBackupType=2鏃�,姝ゅ�间笉鑳戒负绌�!</param>
/// <returns></returns>
- public async Task<string> CreatNewBackupNameToDB(string backupName, int ManualBackupType = 0, string ZigbeeUniqueId = null)
+ public string CreatNewBackupNameToDB(string backupName, int ManualBackupType = 0, string ZigbeeUniqueId = null)
{
var pra = new AddBackUpNamePra();
pra.BackupName = backupName;
@@ -217,8 +215,8 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHomeAppGatewayName", true, pra);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("App/AddHomeAppGatewayName", true, pra);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -239,7 +237,7 @@
/// <param name="upPath">鎸囧畾涓婁紶鐨勬槸鍝釜鏂囦欢澶圭殑鏂囦欢(鍏ㄨ矾寰�),涓嶆寚瀹氭椂锛屼笂浼犵殑鏄湰鍦拌矾寰勪笅鐨勬枃浠�</param>
/// <param name="showBar">鏄惁璁剧疆鏄剧ず杩涘害鏉�</param>
/// <returns></returns>
- public async Task<bool> UpLoadBackupFileToDB(string BackupClassId, int ManualBackupType = 0, string upPath = "", bool showBar = true)
+ public bool UpLoadBackupFileToDB(string BackupClassId, int ManualBackupType = 0, string upPath = "", bool showBar = true)
{
List<string> listAllFile = null;
//鏂囦欢澶圭殑鍏ㄨ矾寰�
@@ -247,12 +245,12 @@
if (upPath == string.Empty)
{
//鑾峰彇鏈湴鏂囦欢
- listAllFile = Global.FileListByHomeId();
- fullDir = UserCenterLogic.CombinePath();
+ listAllFile = HdlFileLogic.Current.GetRootPathListFile();
+ fullDir = Common.Config.Instance.FullPath;
}
else
{
- listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ listAllFile = HdlFileLogic.Current.GetFileFromDirectory(upPath);
fullDir = upPath;
}
if (listAllFile.Count == 0)
@@ -267,7 +265,8 @@
foreach (string fileName in listAllFile)
{
- if (fileName.EndsWith(".png") == true)
+ if (fileName.EndsWith(".png") == true
+ || fileName.EndsWith(".bin") == true)
{
//鍥剧墖鏂囦欢
listPicFile.Add(fileName);
@@ -313,13 +312,13 @@
var datainfo = new FileInfoData();
datainfo.BackupFileName = file;
string fullFileName = System.IO.Path.Combine(fullDir, file);
- datainfo.BackupFileContent = Shared.IO.FileUtils.ReadFile(fullFileName);
+ datainfo.BackupFileContent = HdlFileLogic.Current.ReadFileByteContent(fullFileName);
var list = new List<FileInfoData>();
list.Add(datainfo);
//鎵ц涓婁紶
- bool falge = await DoUpLoadInfoToDB(BackupClassId, list, ManualBackupType);
+ bool falge = DoUpLoadInfoToDB(BackupClassId, list, ManualBackupType);
if (falge == false)
{
//鍏抽棴杩涘害鏉�
@@ -381,7 +380,7 @@
/// <param name="listData">涓婁紶鐨勬暟鎹�</param>
/// <param name="ManualBackupType">鎵嬪姩澶囦唤绫诲瀷(0:App鎵嬪姩澶囦唤,2锛氱綉鍏虫墜鍔ㄥ浠�)</param>
/// <returns></returns>
- private async Task<bool> DoUpLoadInfoToDB(string BackupClassId, List<FileInfoData> listData, int ManualBackupType = 0)
+ private bool DoUpLoadInfoToDB(string BackupClassId, List<FileInfoData> listData, int ManualBackupType = 0)
{
var upData = new UpLoadDataPra();
upData.ManualBackupType = ManualBackupType;
@@ -390,7 +389,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
upData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("App/UploadHomeAppGatewaySubFiles", true, upData);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("App/UploadHomeAppGatewaySubFiles", true, upData, null, true);
if (falge == false)
{
return false;
@@ -529,10 +528,10 @@
/// 涓婁紶Log澶囦唤(闅愬尶鍔熻兘)
/// </summary>
/// <returns></returns>
- public async Task<bool> UpLoadLogBackup()
+ public bool UpLoadLogBackup()
{
- string upPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory);
- if (HdlAutoBackupLogic.GetFileFromDirectory(upPath).Count == 0)
+ string upPath = DirNameResourse.LogDirectory;
+ if (HdlFileLogic.Current.GetFileFromDirectory(upPath).Count == 0)
{
//娌℃湁Log鏂囦欢
return true;
@@ -542,7 +541,7 @@
ProgressFormBar.Current.SetMsg("姝ｅ湪涓婁紶Log鏂囦欢");
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(0, null, true);
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(0, null, true);
if (pageData == null)
{
ProgressFormBar.Current.Close();
@@ -561,7 +560,7 @@
if (backId == string.Empty)
{
//鍒涘缓鏂扮殑澶囦唤
- backId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(DirNameResourse.OptionBackupName);
+ backId = HdlBackupLogic.Current.CreatNewBackupNameToDB(DirNameResourse.OptionBackupName);
if (backId == null)
{
ProgressFormBar.Current.Close();
@@ -569,12 +568,12 @@
}
}
//涓婁紶Log鏂囦欢
- bool result = await this.UpLoadBackupFileToDB(backId, 0, upPath, false);
+ bool result = this.UpLoadBackupFileToDB(backId, 0, upPath, false);
if (result == true)
{
try
{
- var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(upPath);
+ var listAllFile = HdlFileLogic.Current.GetFileFromDirectory(upPath);
if (listAllFile.Count > 10)
{
listAllFile.Sort();
@@ -598,6 +597,85 @@
return result;
}
+ /// <summary>
+ /// 涓婁紶涓滆タ鍒伴殣鍖垮姛鑳藉浠�
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="byteData"></param>
+ /// <returns></returns>
+ public bool UpLoadByteDataToOptionBackup(string fileName, byte[] byteData)
+ {
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg("姝ｅ湪涓婁紶鏂囦欢");
+
+ //浠庝簯绔幏鍙栨暟鎹�
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(0, null, true);
+ if (pageData == null)
+ {
+ ProgressFormBar.Current.Close();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鑾峰彇鍔熻兘澶囦唤澶辫触");
+ contr.Show();
+ });
+ return false;
+ }
+ string backId = string.Empty;
+ for (int i = 0; i < pageData.Count; i++)
+ {
+ if (pageData[i].BackupName == DirNameResourse.OptionBackupName)
+ {
+ //鑾峰彇鍔熻兘澶囦唤鐨処D
+ backId = pageData[i].Id;
+ break;
+ }
+ }
+ if (backId == string.Empty)
+ {
+ //鍒涘缓鏂扮殑澶囦唤
+ backId = this.CreatNewBackupNameToDB(DirNameResourse.OptionBackupName);
+ if (backId == null)
+ {
+ ProgressFormBar.Current.Close();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鍒涘缓鍔熻兘澶囦唤澶辫触");
+ contr.Show();
+ });
+ return false;
+ }
+ }
+ //涓婁紶Log鏂囦欢
+ var datainfo = new FileInfoData();
+ datainfo.BackupFileName = fileName;
+ datainfo.BackupFileContent = byteData;
+
+ var list = new List<FileInfoData>();
+ list.Add(datainfo);
+
+ //鎵ц涓婁紶
+ bool falge = DoUpLoadInfoToDB(backId, list, 0);
+ //鍏抽棴杩涘害鏉�
+ ProgressFormBar.Current.Close();
+
+ if (falge == false)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鏂囦欢涓婁紶鎴愬姛");
+ contr.Show();
+ });
+ return false;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var contr = new ShowMsgControl(ShowMsgType.Tip, "鏂囦欢涓婁紶鎴愬姛");
+ contr.Show();
+ });
+
+ return true;
+ }
+
#endregion
#region 鈻� 璇诲彇闅愬尶鍔熻兘閰嶇疆___________________
@@ -606,7 +684,7 @@
/// 璇诲彇闅愬尶鍔熻兘閰嶇疆(涓嶈鍦ㄦ剰杩斿洖鍊�)
/// </summary>
/// <returns></returns>
- public async Task<bool> LoadHideOption()
+ public bool LoadHideOption()
{
//鍏堝垵濮嬪寲
UserCenterResourse.HideOption = new HideOptionInfo();
@@ -618,7 +696,7 @@
//鏃犺閿欒
IMessageCommon.Current.IgnoreError = true;
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await this.GetBackupListNameFromDB(0, null, true);
+ var pageData = this.GetBackupListNameFromDB(0, null, true);
if (pageData == null)
{
//鎭㈠
@@ -642,7 +720,7 @@
return true;
}
//鑾峰彇杩欎釜澶囦唤涓嬮潰鏈夊灏戜釜鏂囦欢
- List<string> listFile = await GetBackFileIDFromDB(backId, false, null);
+ List<string> listFile = GetBackFileIDFromDB(backId, false, null);
if (listFile == null)
{
//鎭㈠
@@ -689,14 +767,14 @@
/// 璇诲彇APP澶囦唤鏂囨。(鍑芥暟鍐呴儴鏈夎繘搴︽潯)
/// </summary>
/// <param name="BackupClassId"></param>
- public async Task<bool> LoadAppBackupInfo(string BackupClassId)
+ public bool LoadAppBackupInfo(string BackupClassId)
{
//鎵撳紑杩涘害鏉� 姝ｅ湪鑾峰彇澶囦唤鏂囦欢鍒楄〃
ProgressFormBar.Current.Start();
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uBackupFileListGetting));
//浠庝簯绔幏鍙栧浠界殑鏂囦欢锛岀劧鍚庡瓨鍏ユ湰鍦扮殑涓存椂鏂囦欢澶�
- string tempDirectory = await GetBackFileFromDBAndSetToLocation(BackupClassId);
+ string tempDirectory = GetBackFileFromDBAndSetToLocation(BackupClassId);
if (tempDirectory == null)
{
//鍏抽棴杩涘害鏉�
@@ -707,10 +785,10 @@
ProgressFormBar.Current.Close();
//濡傛灉璇诲彇鍒扮殑鏂囦欢瀹屽叏娌℃湁闂锛屽垯娓呯悊鏈湴鐨勬枃浠�
- UserCenterLogic.DeleteAllLocationFile(false);
+ HdlFileLogic.Current.DeleteAllLocationFile(false);
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
- Global.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
+ HdlFileLogic.Current.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
//鍒犻櫎鍏ㄩ儴鐨勮嚜鍔ㄥ浠界殑鏈湴鏂囦欢(姝ゅ嚱鏁扮敤浜庤鍙栬嚜鍔ㄥ浠界殑鏃跺�欎娇鐢�)
HdlAutoBackupLogic.DeleteAllAutoBackupFile();
@@ -730,14 +808,14 @@
/// </summary>
/// <param name="BackupClassId">澶囦唤鐨勪富閿�</param>
/// <returns></returns>
- public async Task<bool> DeleteDbBackupData(string BackupClassId)
+ public bool DeleteDbBackupData(string BackupClassId)
{
var Pra = new LoadBackInfoPra();
Pra.BackupClassId = BackupClassId;
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool success = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHomeAppGatewayName", true, Pra);
+ bool success = UserCenterLogic.GetResultStatuByRequestHttps("App/DelHomeAppGatewayName", true, Pra);
return success;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
index dff6a77..5a30994 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
@@ -32,41 +32,6 @@
#endregion
- #region 鈻� 瀛愭帶浠剁殑Y杞村潗鏍嘷___________________
-
- /// <summary>
- /// 鎸囧畾浣嶇疆绫诲瀷鑾峰彇Rowlayout鐨勫瓙鎺т欢鐨刌杞村潗鏍�(璇风‘淇濆瓙鎺т欢涓嶅ぇ浜庣埗瀹瑰櫒)
- /// </summary>
- /// <param name="fatherCtrHeight">鐖舵帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="ctrHeight">瀛愭帶浠剁殑鐪熷疄楂樺害</param>
- /// <param name="alignment">浣嶇疆瀵归綈鏂瑰紡</param>
- /// <param name="Space">涓婁笅闂寸殑绌虹櫧闂磋窛,鐪佺暐鏃讹紝鍙栬鎺т欢鍏遍�氬彉閲忕殑鍊笺�傝缃负-1鏃讹紝涓嶈绠楃┖鐧介棿璺�</param>
- /// <returns></returns>
- public int GetControlChidrenYaxis(int fatherCtrHeight, int ctrHeight, UViewAlignment alignment, int Space = 0)
- {
- if (Space < 0)
- {
- //涓嶈绠楅棿璺濆��
- Space = 0;
- }
-
- if (alignment == UViewAlignment.Center)
- {
- return fatherCtrHeight / 2 - ctrHeight / 2;
- }
- else if (alignment == UViewAlignment.Top)
- {
- return (fatherCtrHeight / 2 - Space / 2) / 2 - ctrHeight / 2;
- }
- else
- {
- int top = fatherCtrHeight / 2 + Space / 2;
- return top + (fatherCtrHeight - top) / 2 - ctrHeight / 2;
- }
- }
-
- #endregion
-
#region 鈻� 璁＄畻鍥剧墖鐪熷疄澶у皬___________________
/// <summary>
@@ -80,5 +45,150 @@
}
#endregion
+
+ #region 鈻� 鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛╛____________
+
+ /// <summary>
+ /// 鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛�(褰撹繕娌℃湁鎴块棿鏃�,浼氳繑鍥瀎alse)
+ /// </summary>
+ /// <param name="RoomKey">榛樿閫夋嫨鐨勬埧闂翠富閿�</param>
+ /// <param name="titleText">鏍囬淇℃伅</param>
+ /// <param name="SelectRoomEvent">纭閫夋嫨鎴块棿鐨勫洖璋冨嚱鏁�(鎴块棿ID,鎴块棿鍚�(浼氭嫾涓婃ゼ灞�))</param>
+ public bool ShowBottomListRoomView(string RoomKey, string titleText, Action<string, string> SelectRoomEvent)
+ {
+ //妤煎眰鍒楄〃鍚嶅瓧
+ var listFloorName = new List<string>();
+ //妤煎眰鍒楄〃涓婚敭
+ var listFloorKeys = new List<string>();
+ //鎴块棿鍚嶅瓧
+ var listRoomName = new List<List<string>>();
+ //鎴块棿涓婚敭
+ var listRoomKeys = new List<List<string>>();
+
+ //鍒濆鍖栨埧闂村垪琛ㄦ暟鎹�
+ bool result = this.InitRoomListData(ref listFloorName, ref listFloorKeys, ref listRoomName, ref listRoomKeys);
+ if (result == false)
+ {
+ return false;
+ }
+
+ var room = HdlRoomLogic.Current.GetRoomById(RoomKey);
+ int index1 = room != null ? listFloorKeys.IndexOf(room.FloorId) : 0;
+ if (index1 == -1) { index1 = 0; }
+ int index2 = listRoomKeys[index1].IndexOf(RoomKey);
+ if (index2 == -1) { index2 = 0; }
+
+ if (listFloorKeys.Count == 0)
+ {
+ //鏃犳ゼ灞傛ā寮�
+ PickerView.Show(listRoomName[0], (value) =>
+ {
+ RoomKey = listRoomKeys[0][value];
+ string roomName = string.Empty;
+ if (RoomKey != string.Empty)
+ {
+ //鎴块棿
+ roomName = listRoomName[0][value];
+ }
+ else
+ {
+ roomName = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+ SelectRoomEvent?.Invoke(RoomKey, roomName);
+
+ }, index2, titleText,
+ Language.StringByID(R.MyInternationalizationString.uFinish),
+ Language.StringByID(R.MyInternationalizationString.uCancel));
+ }
+ else
+ {
+ //鏈夋ゼ灞傛ā寮�
+ PickerView.ShowSecondary(listFloorName, listRoomName, (value1, value2) =>
+ {
+ RoomKey = listRoomKeys[value1][value2];
+ string roomName = string.Empty;
+ if (RoomKey != string.Empty)
+ {
+ //妤煎眰+鎴块棿
+ roomName = listFloorName[value1] + " " + listRoomName[value1][value2];
+ }
+ else
+ {
+ roomName = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
+ }
+ SelectRoomEvent?.Invoke(RoomKey, roomName);
+
+ }, index1, index2, titleText,
+ Language.StringByID(R.MyInternationalizationString.uFinish),
+ Language.StringByID(R.MyInternationalizationString.uCancel));
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨埧闂村垪琛ㄦ暟鎹�
+ /// </summary>
+ /// <param name="listFloorName">妤煎眰鍒楄〃鍚嶅瓧</param>
+ /// <param name="listFloorKeys">妤煎眰鍒楄〃涓婚敭</param>
+ /// <param name="listRoomName">鎴块棿鍚嶅瓧</param>
+ /// <param name="listRoomKeys">鎴块棿涓婚敭</param>
+ private bool InitRoomListData(ref List<string> listFloorName, ref List<string> listFloorKeys, ref List<List<string>> listRoomName, ref List<List<string>> listRoomKeys)
+ {
+ 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);
+ foreach (var myRoom in listRoom)
+ {
+ 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);
+ listFloorKeys.Add("");
+ listFloorName.Add(Language.StringByID(R.MyInternationalizationString.uUndistributed));
+
+ foreach (string fKeys in dicFloor.Keys)
+ {
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);
+ if (listRoom.Count > 0)
+ {
+ //妤煎眰鍚嶅瓧鍜屼富閿敹闆�
+ listFloorKeys.Add(fKeys);
+ listFloorName.Add(dicFloor[fKeys]);
+ //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
+ listName = new List<string>();
+ listKeys = new List<string>();
+ foreach (var myRoom in listRoom)
+ {
+ listName.Add(myRoom.Name);
+ listKeys.Add(myRoom.Id);
+ }
+ listRoomName.Add(listName);
+ listRoomKeys.Add(listKeys);
+ }
+ }
+ }
+ //娌℃湁寤虹珛鎴块棿
+ if (listFloorKeys.Count == 0 && listRoomKeys.Count == 0)
+ {
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index 8ff084f..27d0ccd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -599,7 +599,7 @@
///璇诲彇IRACC妯″潡鍥轰欢鐗堟湰
/// <para>reserve:0-ff</para>
/// </summary>
- public async void UpgradeAsync(CommonDevice device, SendUpgradeData upgradeData)
+ public void UpgradeAsync(CommonDevice device, SendUpgradeData upgradeData)
{
var Gateway = device.Gateway;
if (Gateway == null)
@@ -752,7 +752,7 @@
///璇诲彇IRACC妯″潡鍥轰欢鐗堟湰
/// <para>status:0--鎴愬姛;1--澶辫触;ff--鏃犳晥 .</para>
/// </summary>
- public async void SendFinishAsync(CommonDevice device, int status)
+ public void SendFinishAsync(CommonDevice device, int status)
{
var Gateway = device.Gateway;
if (Gateway == null)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
index 9f21fd5..b3ade01 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs
@@ -42,11 +42,11 @@
/// <param name="NormallyOpenContinuedTime">甯稿紑鎸佺画鏃堕棿(1~72灏忔椂 OtherOpenLockMode=9003鐨勬椂鍊欐湁鏁�)</param>
public void AddDoorHistoryLog(ZigBee.Device.DoorLock i_doorLock, int OtherOpenLockMode, string NormallyOpenContinuedTime)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇闂ㄩ攣鐨勪富閿甀D
- var DoorLockId = await this.GetDoorHistoryDoorLockId(i_doorLock);
- if (DoorLockId == null)
+ var DoorLockId = this.GetDoorHistoryDoorLockId(i_doorLock);
+ if (string.IsNullOrEmpty(DoorLockId) == true)
{
//缃戠粶涓嶉��
return;
@@ -58,9 +58,9 @@
pra.OtherOpenLockMode = OtherOpenLockMode;
pra.NormallyOpenContinuedTime = NormallyOpenContinuedTime;
- //涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
- var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/AddDoorLockHistory", true, pra, listCheck);
+ //涓嶆娴嬮敊璇爜
+ var listCheck = new List<string>() { "NotCheck" };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/AddDoorLockHistory", true, pra, listCheck);
if (result == false)
{
}
@@ -72,15 +72,15 @@
/// </summary>
/// <param name="i_doorLock">闂ㄩ攣瀵硅薄</param>
/// <returns></returns>
- private async System.Threading.Tasks.Task<string> GetDoorHistoryDoorLockId(ZigBee.Device.DoorLock i_doorLock)
+ private string GetDoorHistoryDoorLockId(ZigBee.Device.DoorLock i_doorLock)
{
var pra = new GetDoorIdPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
- //涓嶄簩娆″彂閫�,涓嶆娴嬮敊璇爜
- var listCheck = new List<string>() { "NotSetAgain", "NotCheck" };
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
- if (result == null) { return null; }
+ //涓嶆娴嬮敊璇爜
+ var listCheck = new List<string>() { "NotCheck" };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockPager", true, pra, listCheck);
+ if (string.IsNullOrEmpty(result) == true) { return null; }
//濡傛灉宸茬粡鍒涘缓浜�,鍒欎笉鍐嶅垱寤�
var myData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetListIdResult>(result);
@@ -93,7 +93,7 @@
var pra2 = new AddDoorPra();
pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra2.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;
- var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra2, listCheck);
+ var result2 = UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra2, listCheck);
//浜戠鏄洿鎺ヨ繑鍥炲垱寤虹殑涓婚敭瀛楃涓�
return result2;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index c2b0eba..ff85b85 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -353,6 +353,15 @@
}
return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
}
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_SphericalMotion)
+ {
+ //鐞冨瀷绉诲姩浼犳劅鍣�
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
+ }
else
{
//鍏朵粬浼犳劅鍣�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
index 2ea4709..d1eddb8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
@@ -810,16 +810,9 @@
/// </summary>
/// <param name="panel">骞叉帴鐐瑰璞�</param>
/// <returns></returns>
- public async Task<List<CommonDevice.AttributeDataObj>> GetDryContactConfigureInfo(CommonDevice device)
+ public List<CommonDevice.AttributeDataObj> GetDryContactConfigureInfo(CommonDevice device)
{
- //鍊熺敤瀹冪殑鍑芥暟
- var panel = new Panel();
- panel.DeviceAddr = device.DeviceAddr;
- panel.DeviceEpoint = device.DeviceEpoint;
- panel.CurrentGateWayId = device.CurrentGateWayId;
-
- var result = HdlDeviceBindLogic.Current.ReadPanelConfigureInfoAsync(panel);
- panel = null;
+ var result = HdlDeviceBindLogic.Current.ReadPanelConfigureInfoAsync(device);
//鍏遍�氶敊璇娴�
string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
@@ -1256,10 +1249,7 @@
/// </summary>
private void SaveDryContactFunctionToLocaltion()
{
- var file = Newtonsoft.Json.JsonConvert.SerializeObject(dicDryContactFunction);
-
- var bytes = System.Text.Encoding.UTF8.GetBytes(file);
- Common.Global.WriteFileByBytesByHomeId(DirNameResourse.DryContactFunctionFile, bytes);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.DryContactFunctionFile, dicDryContactFunction);
}
/// <summary>
@@ -1267,12 +1257,13 @@
/// </summary>
private void LoadDryContactFunctionFromLocaltion()
{
- if (Common.Global.IsExistsByHomeId(DirNameResourse.DryContactFunctionFile) == false)
+ this.dicDryContactFunction = new Dictionary<string, DryContactFunctionInfo>();
+
+ byte[] filebyte = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.DryContactFunctionFile);
+ if (filebyte == null)
{
return;
}
-
- byte[] filebyte = Common.Global.ReadFileByHomeId(DirNameResourse.DryContactFunctionFile);
string strvalue = System.Text.Encoding.UTF8.GetString(filebyte);
this.dicDryContactFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, DryContactFunctionInfo>>(strvalue);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 198b656..a73caea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -109,7 +109,7 @@
Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(house.Id);
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- UserCenterLogic.CreatAllUserCenterDirectory();
+ HdlFileLogic.Current.CreatAllUserCenterDirectory();
}
#endregion
@@ -168,8 +168,6 @@
var listFloorKey = this.GetAllFloorKeys();
var dicRoomName = this.GetRoomSampleList();
- //璁剧疆鍒濆妤煎眰
- Config.Instance.Home.CurrentFloorId = listFloorKey[0];
foreach (string floorKey in listFloorKey)
{
foreach (string roomId in dicRoomName.Keys)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
new file mode 100755
index 0000000..ecaf58d
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
@@ -0,0 +1,430 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter
+{
+ /// <summary>
+ /// 鏂囦欢鎿嶄綔鐨勯�昏緫
+ /// </summary>
+ public class HdlFileLogic
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鏂囦欢鎿嶄綔鐨勯�昏緫
+ /// </summary>
+ private static HdlFileLogic m_Current = null;
+ /// <summary>
+ /// 鏂囦欢鎿嶄綔鐨勯�昏緫
+ /// </summary>
+ public static HdlFileLogic Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new HdlFileLogic();
+ }
+ return m_Current;
+ }
+ }
+ #endregion
+
+ #region 鈻� 棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶筥________
+
+ /// <summary>
+ /// 棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
+ /// </summary>
+ public void CreatAllUserCenterDirectory()
+ {
+ //鏈湴缂撳瓨鐨勬牴鐩綍
+ this.CreateDirectory(DirNameResourse.LocalMemoryDirectory);
+
+ //鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
+ this.CreateDirectory(DirNameResourse.AutoBackupDirectory);
+
+ //鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
+ this.CreateDirectory(DirNameResourse.AutoBackupdeleteDirectory);
+
+ //涓嬭浇澶囦唤鐨勬椂鍊欐墍浣跨敤鐨勪复鏃躲�愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.DownLoadBackupTempDirectory);
+
+ //淇濆瓨瀹夐槻璁板綍鐨勩�愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.SafeguardAlarmDirectory);
+
+ //涓嬭浇鍒嗕韩鏂囦欢鐨勪复鏃躲�愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.DownLoadShardDirectory);
+
+ //LOG鍑哄姏銆愭枃浠跺す銆�
+ this.CreateDirectory(DirNameResourse.LogDirectory);
+
+ //鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
+ if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty)
+ {
+ this.CreateDirectory(UserCenterResourse.AccountOption.UserPictruePath);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏂囦欢淇濆瓨鍜岃鍙朹____________________
+
+ /// <summary>
+ /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
+ public void SaveFileContent(string fullName, object obj)
+ {
+ var data = JsonConvert.SerializeObject(obj);
+ this.SaveTextToFile(fullName, data);
+ }
+
+ /// <summary>
+ /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
+ public void SaveTextToFile(string fullName, string textValue)
+ {
+ var byteData = Encoding.UTF8.GetBytes(textValue);
+ //鍐欏叆鍐呭
+ System.IO.FileStream fileStream = null;
+ try
+ {
+ fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Create, System.IO.FileAccess.Write);
+ fileStream.Write(byteData, 0, byteData.Length);
+ fileStream.Flush();
+ }
+ catch { }
+ finally
+ {
+ fileStream?.Close();
+ }
+ }
+
+ /// <summary>
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <returns></returns>
+ public string ReadFileTextContent(string fullName)
+ {
+ //璇诲彇鏂囦欢
+ var varByte = this.ReadFileByteContent(fullName);
+ if (varByte == null)
+ {
+ return null;
+ }
+ return Encoding.UTF8.GetString(varByte);
+ }
+
+ /// <summary>
+ /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�,鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull
+ /// </summary>
+ /// <param name="fullName">鍏ㄨ矾寰�</param>
+ /// <returns></returns>
+ public byte[] ReadFileByteContent(string fullName)
+ {
+ if (System.IO.File.Exists(fullName) == false)
+ {
+ return null;
+ }
+ System.IO.FileStream fileStream = null;
+ try
+ {
+ fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Open, System.IO.FileAccess.Read);
+ byte[] array = new byte[fileStream.Length];
+ fileStream.Read(array, 0, array.Length);
+ return array;
+ }
+ catch
+ {
+ return null;
+ }
+ finally
+ {
+ fileStream?.Close();
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏂囦欢澶规搷浣滃嚱鏁癬____________________
+
+ /// <summary>
+ /// 鍒涘缓涓�涓枃浠跺す
+ /// </summary>
+ /// <param name="fullDirectory">闇�瑕佸垱寤虹殑鏂囦欢澶瑰叏璺緞</param>
+ /// <param name="clear">濡傛灉鏂囦欢澶瑰瓨鍦紝鏄惁闇�瑕佹竻绌烘枃浠跺す</param>
+ public void CreateDirectory(string fullDirectory, bool clear = false)
+ {
+ if (System.IO.Directory.Exists(fullDirectory) == false)
+ {
+ try
+ {
+ System.IO.Directory.CreateDirectory(fullDirectory);
+ }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex, "鍒涘缓鏂囦欢澶瑰け璐�:" + fullDirectory);
+ }
+ }
+ else if (clear == true)
+ {
+ //濡傛灉瀛樺湪锛屽垯娓呯┖鍏ㄩ儴鏂囦欢
+ var files = System.IO.Directory.GetFiles(fullDirectory);
+ foreach (var file in files)
+ {
+ this.DeleteFile(file);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鏂囦欢澶�
+ /// </summary>
+ /// <param name="fullDirectory">鏂囦欢澶瑰叏璺緞</param>
+ public void DeleteDirectory(string fullDirectory)
+ {
+ if (System.IO.Directory.Exists(fullDirectory) == true)
+ {
+ try { System.IO.Directory.Delete(fullDirectory, true); }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex, "鍒犻櫎鏂囦欢澶瑰け璐�:" + fullDirectory);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎸囧畾鏂囦欢澶归噷闈㈢殑鍏ㄩ儴鏂囦欢
+ /// </summary>
+ /// <param name="directory">鏂囦欢璺緞锛堝叏鍚嶏級</param>
+ /// <param name="onlyFileName">鍗曠函鍙槸鑾峰彇鏂囦欢鍚嶅瓧,濡傛灉涓篺alse鏃�,灏嗚繑鍥炴枃浠剁殑鍏ㄨ矾寰�</param>
+ /// <returns></returns>
+ public List<string> GetFileFromDirectory(string directory, bool onlyFileName = true)
+ {
+ if (System.IO.Directory.Exists(directory) == false)
+ {
+ return new List<string>();
+ }
+
+ var list = new List<string>();
+ try
+ {
+ //2020.07.10鐨勬椂鍊�,鍑虹幇杩囪幏鍙栧け璐ュ紓甯� 鎻愮ず:write fault on path
+ var files = System.IO.Directory.GetFiles(directory);
+ foreach (var file in files)
+ {
+ string fileName = file;
+ if (onlyFileName == true)
+ {
+ fileName = fileName.Substring(directory.Length + 1);
+ }
+ list.Add(fileName);
+ }
+ }
+ catch (Exception ex)
+ { HdlLogLogic.Current.WriteLog(ex); }
+
+ return list;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鏍圭洰褰曠殑鍏ㄩ儴鏂囦欢鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<string> GetRootPathListFile()
+ {
+ return this.GetFileFromDirectory(Common.Config.Instance.FullPath);
+ }
+
+ /// <summary>
+ /// 灏嗘寚瀹氭枃浠跺す閲岄潰鐨勫叏閮ㄦ枃浠剁Щ鍔ㄥ埌褰撳墠浣忓畢鐨勬枃浠跺す鍐�
+ /// </summary>
+ /// <param name="fulldirectory">鏂囦欢澶瑰叏璺緞</param>
+ /// <param name="deleteDirectory">澶勭悊瀹屼箣鍚庯紝鏄惁鎶婃枃浠跺す鍒犻櫎</param>
+ public void MoveDirectoryFileToHomeDirectory(string fulldirectory, bool deleteDirectory = false)
+ {
+ if (System.IO.Directory.Exists(fulldirectory) == false)
+ {
+ return;
+ }
+
+ var files = System.IO.Directory.GetFiles(fulldirectory);
+ var listFile = new List<string>();
+ foreach (var file in files)
+ {
+ var f = file.Substring(fulldirectory.Length + 1);
+ listFile.Add(f);
+ }
+
+ var rootPath = Common.Config.Instance.FullPath;
+ foreach (var file in listFile)
+ {
+ string oldFile = System.IO.Path.Combine(fulldirectory, file);
+ string newFile = System.IO.Path.Combine(rootPath, file);
+ //绉诲姩鏂囦欢
+ this.MoveFileToDirectory(oldFile, newFile);
+ }
+ if (deleteDirectory == true)
+ {
+ //鍒犻櫎鏂囦欢澶�
+ this.DeleteDirectory(fulldirectory);
+ }
+ }
+
+ /// <summary>
+ /// 灏嗘寚瀹氭枃浠跺す閲岄潰鐨勫叏閮ㄦ枃浠跺鍒跺埌鎸囧畾鐨勬枃浠跺す鍐�
+ /// </summary>
+ /// <param name="fullDirectory">澶嶅埗鍘熸枃浠跺す鍏ㄨ矾寰�</param>
+ /// <param name="targetDirectory">鐩爣鏂囦欢澶瑰叏璺緞</param>
+ public void CopyDirectoryFileToDirectory(string fullDirectory, string targetDirectory)
+ {
+ if (System.IO.Directory.Exists(targetDirectory) == false)
+ {
+ //鍒涘缓鐩爣鏂囦欢澶�
+ this.CreateDirectory(targetDirectory, false);
+ }
+
+ var listFile = this.GetFileFromDirectory(fullDirectory);
+ foreach (var file in listFile)
+ {
+ string oldFile = System.IO.Path.Combine(fullDirectory, file);
+ string newFile = System.IO.Path.Combine(targetDirectory, file);
+ //澶嶅埗鏂囦欢
+ this.CopyFile(oldFile, newFile);
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏂囦欢鎿嶄綔鍑芥暟_______________________
+
+ /// <summary>
+ /// 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="fullName">鏂囦欢鍏ㄥ悕</param>
+ /// <returns></returns>
+ public bool DeleteFile(string fullName)
+ {
+ if (System.IO.File.Exists(fullName) == true)
+ {
+ try
+ {
+ System.IO.File.Delete(fullName);
+ return true;
+ }
+ catch { return false; }
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 绉诲姩鏂囦欢
+ /// </summary>
+ /// <param name="oldFile">鍘熸枃浠�</param>
+ /// <param name="newFile">鐩爣鏂囦欢</param>
+ public void MoveFileToDirectory(string oldFile, string newFile)
+ {
+ if (System.IO.File.Exists(oldFile) == true)
+ {
+ //濡傛灉鐩爣鏂囦欢瀛樺湪,鍒欏垏鎹负澶嶅埗鏂囦欢
+ if (System.IO.File.Exists(newFile) == true)
+ {
+ this.CopyFile(oldFile, newFile);
+ }
+ try
+ {
+ System.IO.File.Move(oldFile, newFile);
+ }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex, "绉诲姩澶辫触,鍘熸枃浠�:" + oldFile + "\r\n鐩爣鏂囦欢:" + newFile);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 绉诲姩鏂囦欢
+ /// </summary>
+ /// <param name="oldFile">鍘熸枃浠�</param>
+ /// <param name="newFile">鐩爣鏂囦欢</param>
+ public void CopyFile(string oldFile, string newFile)
+ {
+ if (System.IO.File.Exists(oldFile) == true)
+ {
+ try
+ {
+ System.IO.File.Copy(oldFile, newFile, true);
+ }
+ catch (Exception ex)
+ {
+ HdlLogLogic.Current.WriteLog(ex, "澶嶅埗澶辫触,鍘熸枃浠�:" + oldFile + "\r\n鐩爣鏂囦欢:" + newFile);
+ }
+ }
+ }
+
+
+ #endregion
+
+ #region 鈻� 鍒犻櫎鏈湴鏂囦欢_______________________
+
+ /// <summary>
+ /// 鍒犻櫎鏈湴鎵�鏈夋枃浠�
+ /// </summary>
+ /// <param name="all">true:鍏ㄩ儴鍒犻櫎(鐢ㄤ簬浣忓畢鍒犻櫎) false:閲嶈鐨勬枃浠朵笉鍒犻櫎</param>
+ public void DeleteAllLocationFile(bool all = true)
+ {
+ string dPath = Common.Config.Instance.FullPath;
+ if (System.IO.Directory.Exists(dPath) == false)
+ {
+ return;
+ }
+
+ //鐒跺悗鑾峰彇鍏ㄩ儴鐨勬枃浠�
+ List<string> listFile = this.GetFileFromDirectory(dPath);
+ foreach (string file in listFile)
+ {
+ if (all == false && IsNotDeleteFile(file) == true)
+ {
+ //杩欐槸涓嶈兘鍒犻櫎鐨勬枃浠�
+ continue;
+ }
+ //鍒犻櫎鏂囦欢
+ this.DeleteFile(System.IO.Path.Combine(dPath, file));
+ }
+ //濡傛灉鏄妸鏂囦欢鍏ㄩ儴鍒犻櫎鐨勮瘽锛岄偅涔堟枃浠跺す涔熶竴璧峰垹闄ゆ帀
+ if (all == true)
+ {
+ //鍒犻櫎鏂囦欢澶�
+ System.IO.Directory.Delete(dPath, true);
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鏄笉鏄笉搴旇鍒犻櫎鐨勬枃浠�
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <returns></returns>
+ private bool IsNotDeleteFile(string fileName)
+ {
+ if (fileName == "Config.json")
+ {
+ //涓嶈兘鍒犻櫎Config鏂囦欢
+ return true;
+ }
+ else if (fileName.StartsWith("House_") == true)
+ {
+ //涓嶈兘鍒犻櫎浣忓畢鏂囦欢
+ return true;
+ }
+ return false;
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index d98fca7..0f70087 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
namespace Shared.Phone.UserCenter
{
@@ -66,18 +65,18 @@
#region 鈻� 娣诲姞鍗囩骇鍥轰欢淇℃伅___________________
/// <summary>
- /// 娣诲姞鍗囩骇鍥轰欢淇℃伅
+ /// 娣诲姞鍗囩骇鍥轰欢淇℃伅 1:姝ｅ父 -1:娌＄綉,鑾峰彇涓嶅埌涓滆タ
/// </summary>
/// <param name="levelType">鍥轰欢闃剁骇鍒嗙被</param>
/// <param name="HardwareVersion">纭欢鐗堟湰</param>
/// <param name="imgType">闀滃儚绫诲瀷</param>
/// <returns></returns>
- public async static Task<bool> AddFirmwareVersionInfo(FirmwareLevelType levelType, string HardwareVersion, string imgType)
+ public static int AddFirmwareVersionInfo(FirmwareLevelType levelType, string HardwareVersion, string imgType)
{
//妫�娴嬫湰鍦版槸鍚﹀凡缁忔湁杩欎釜缂撳瓨浜�
if (IsEsixtFirmwareVersionInfo(levelType, HardwareVersion, imgType) == true)
{
- return true;
+ return 1;
}
var Pra = new GetFirmwareVersionPra();
Pra.PageSetting.Page = 1;
@@ -90,7 +89,7 @@
Pra.FirmwareManaSecondType = 0;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Linux, Pra);
return result;
}
else if (levelType == FirmwareLevelType.Coordinator)
@@ -100,7 +99,7 @@
Pra.FirmwareManaSecondType = 1;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.Coordinator, Pra);
return result;
}
else if (levelType == FirmwareLevelType.VirtualDevice)
@@ -110,7 +109,7 @@
Pra.FirmwareManaSecondType = 2;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.VirtualDevice, Pra);
return result;
}
else
@@ -120,29 +119,29 @@
Pra.FirmwareManaSecondType = null;
Pra.HardwareVersion = HardwareVersion;
Pra.DeviceType = imgType;
- var result = await GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
+ var result = GetFirmwareVersionAndSetToMemmory(FirmwareLevelType.ZigbeeDevice, Pra);
return result;
}
}
/// <summary>
- /// 鑾峰彇浜戠鐨勫浐浠讹紝鐒跺悗瀛樺叆缂撳瓨涓�
+ /// 鑾峰彇浜戠鐨勫浐浠讹紝鐒跺悗瀛樺叆缂撳瓨涓� 1:姝ｅ父 -1:娌＄綉,鑾峰彇涓嶅埌涓滆タ
/// </summary>
/// <param name="levelType"></param>
/// <param name="pra"></param>
/// <returns></returns>
- private async static Task<bool> GetFirmwareVersionAndSetToMemmory(FirmwareLevelType levelType, GetFirmwareVersionPra pra)
+ private static int GetFirmwareVersionAndSetToMemmory(FirmwareLevelType levelType, GetFirmwareVersionPra pra)
{
- var listNotShow = new List<string>() { "NotSetAgain" };
- string resultValue = await UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra, listNotShow);
+ var listCheck = new List<string> { "NotCheck" };
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra, listCheck);
if (string.IsNullOrEmpty(resultValue) == true)
{
- return false;
+ return -1;
}
var verResult = Newtonsoft.Json.JsonConvert.DeserializeObject<FirmwareVersionResult>(resultValue);
if (verResult.PageData.Count == 0)
{
- return true;
+ return 1;
}
//纭欢鐗堟湰
@@ -199,7 +198,7 @@
catch { continue; }
}
- return true;
+ return 1;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
index c7706df..c39db25 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayBackupLogic.cs
@@ -40,16 +40,16 @@
/// </summary>
/// <param name="realGateway">鐪熷疄鐗╃悊缃戝叧瀵硅薄</param>
/// <param name="backupName">闇�瑕佸垱寤虹殑澶囦唤鐨勫悕瀛�</param>
- public async void DoBackupGateway(ZbGateway realGateway, string backupName)
+ public void DoBackupGateway(ZbGateway realGateway, string backupName)
{
//灞曞紑杩涘害鏉�
ProgressFormBar.Current.Start();
//鍒涘缓澶囦唤鏂囦欢
ProgressFormBar.Current.SetMsg(Language.StringByID(R.MyInternationalizationString.uCreatBackupFile));
- await System.Threading.Tasks.Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
//鍒涘缓涓�涓浠藉悕瀛�
- string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, realGateway.GwId);
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backupName, 2, realGateway.GwId);
if (backupClassId == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,7 +84,7 @@
if (result == false)
{
//濡傛灉涓婁紶澶辫触鐨勮瘽锛屽氨鎶婂畠鍒犻櫎
- await HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
+ HdlBackupLogic.Current.DeleteDbBackupData(backupClassId);
//鍏抽棴杩涘害鏉�
ProgressFormBar.Current.Close();
return;
@@ -653,7 +653,7 @@
//缃戝叧宸茬粡鎺ユ敹鍒伴噸鍚懡浠�,鎺ヤ笅鏉ュ幓鍒ゆ柇缃戝叧鏄惁閲嶅惎瀹屾垚
bool gatewatAction = false;
bool threadAction = true;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
timeOut = 0;
while (gatewatAction == false)
@@ -662,7 +662,7 @@
if (timeOut >= 65 && timeOut % 5 == 0)
{
//5绉掍竴娆�,鍘昏幏鍙栫増鏈�
- var data = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(realGateway, ShowErrorMode.NO);
+ var data = HdlGatewayLogic.Current.GetGatewayInfo(realGateway, ShowErrorMode.NO);
if (data != null)
{
gatewatAction = true;
@@ -670,7 +670,7 @@
break;
}
}
- await System.Threading.Tasks.Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
timeOut++;
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(timeOut, 180);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 26ed638..22eced4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -82,7 +82,7 @@
GatewayResourse.AppOldSelectGatewayId = string.Empty;
//浠庢枃浠朵腑鑾峰彇涓婁竴娆￠�夋嫨鐨勭綉鍏砳d
- byte[] data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AppOldSelectGatewayFile);
+ byte[] data = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.AppOldSelectGatewayFile);
if (data != null)
{
string strvalue = System.Text.Encoding.UTF8.GetString(data);
@@ -118,7 +118,7 @@
}
List<string> listBackupGwId = new List<string>();
- var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
+ var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
if (fileData != null)
{
//鏂板锛氳櫧鐒舵鐜囦綆锛屼絾鏄‘瀹炲彂鐢熶簡銆傚鏋滄湁缃戠粶鏃讹紝App閲嶆柊缁戝畾璁板綍鐨勭綉鍏冲け璐ョ殑璇�
@@ -149,26 +149,10 @@
//鍒犻櫎缃戝叧鏂囦欢
this.DeleteGatewayFile(gatewayId);
}
- //LOG杈撳嚭
- if (listDelete.Count > 0)
+ //濡傛灉缃戝叧閮芥病浜嗙殑璇�,鎶婂満鏅叏閮ㄥ垹浜�
+ if (listDelete.Count > 0 && this.GetAllLocalGateway().Count == 0)
{
- string msg = "鏈湴鎷ユ湁鐨勭綉鍏筹細";
- foreach (var gatewayId in this.dicGateway.Keys)
- {
- msg += gatewayId + ",";
- }
- msg += "\r\n琚垹闄ょ殑缃戝叧锛�";
- foreach (var gatewayId in listDelete)
- {
- msg += gatewayId + ",";
- }
- msg += "\r\n姝ゆ椂浜戠杩斿洖褰撳墠璐﹀彿鎵�缁戝畾鏈夌殑缃戝叧锛�";
- foreach (var gatewayId in result.Keys)
- {
- msg += gatewayId + ",";
- }
- var bytes = System.Text.Encoding.UTF8.GetBytes(msg);
- Common.Global.WriteFileByBytesByHomeId("GatewayDeleteLog.txt", bytes);
+ HdlSceneLogic.Current.DeleteAllLocalScene();
}
}
@@ -241,6 +225,9 @@
{
return false;
}
+ //娣诲姞缃戝叧鐨勮瘽,寮哄埗涓婚〉鍒锋柊
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
return true;
}
@@ -324,7 +311,7 @@
}
//鏇存柊浜戠鏁版嵁搴�
- int flage1 = await this.SetGatewayIdToDataBase(zbGateway);
+ int flage1 = this.SetGatewayIdToDataBase(zbGateway);
//寮傚父涔熶笉楦熷畠,0鏄壒娈婂惈涔�
if (flage1 == 0)
{
@@ -396,7 +383,7 @@
/// </summary>
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
/// <returns></returns>
- private async Task<int> SetGatewayIdToDataBase(ZbGateway zbGateway)
+ private int SetGatewayIdToDataBase(ZbGateway zbGateway)
{
//璋冪敤鎺ュ彛锛岀粦瀹氱綉鍏�(鍗充娇澶辫触锛屼篃杩斿洖true寰�涓嬭蛋)
var bindGateway = new BindGatewayPra();
@@ -404,10 +391,8 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- //涓嶆樉绀哄凡缁忚缁戝畾杩囩殑淇℃伅,NotSetAgain:鍋囧鏂綉鏃�,涓嶄簩娆″彂閫�
- List<string> listNotShow = new List<string>() { "NotSetAgain" };
- var result = await UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, listNotShow);
- if (result == "Error" || result == "ErrorEx")
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
+ if (result == "Error")
{
return -1;
}
@@ -479,7 +464,7 @@
}
//鏇存柊浜戠鏁版嵁搴�
- int flage1 = await this.SetGatewayIdToDataBase(zbGateway);
+ int flage1 = this.SetGatewayIdToDataBase(zbGateway);
//寮傚父涔熶笉楦熷畠,0鏄壒娈婂惈涔�
if (flage1 == 0)
{
@@ -507,7 +492,19 @@
await Task.Delay(8000);
//鑾峰彇缃戝叧鐨勪俊鎭�
- var result = await zbGateway.GetZbGwInfoAsync();
+ ZbGatewayData.GetGwAllData result = null;
+ int count = 5;
+ while (count >= 0)
+ {
+ result = await zbGateway.GetZbGwInfoAsync();
+ if (result != null && result.getGwData != null)
+ {
+ break;
+ }
+ count--;
+ //鏈�澶氬啀绛�20绉�
+ await Task.Delay(4000);
+ }
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
@@ -547,6 +544,10 @@
//娣诲姞澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(this.dicGateway[gwID].FilePath);
}
+
+ //娣诲姞缃戝叧鐨勮瘽,寮哄埗涓婚〉鍒锋柊
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
return 1;
}
@@ -559,42 +560,30 @@
/// </summary>
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
/// <param name="gatewayName">缃戝叧鍚�</param>
- public async Task<bool> ReName(ZbGateway zbGateway, string gatewayName)
+ public bool ReName(ZbGateway zbGateway, string gatewayName)
{
- ZbGateway realWay = null;
- if (this.GetRealGateway(ref realWay, zbGateway) == false)
+ //鍙彇32涓猙yte
+ var bytes = new byte[32];
+ var reamarkGwBytes = System.Text.Encoding.UTF8.GetBytes(gatewayName);
+ System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 32 < reamarkGwBytes.Length ? 32 : reamarkGwBytes.Length);
+ gatewayName = System.Text.Encoding.UTF8.GetString(bytes);
+
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 91 } };
+ var data = new Newtonsoft.Json.Linq.JObject { { "GwName", gatewayName } };
+ jObject.Add("Data", data);
+ var result = this.SendJobjectDataToGateway(zbGateway, "GwReName", jObject.ToString(), "GwReName_Respon");
+ if (result.ErrorMsg != null)
{
- //鑾峰彇缃戝叧瀵硅薄澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGetGatewayTagartFail);
- this.ShowErrorMsg(msg);
+ this.ShowTipMsg(result.ErrorMsg);
return false;
}
-
- var result = await realWay.GwReNameAsync(gatewayName);
- //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
- if (error != null)
- {
- this.ShowErrorMsg(error);
- return false;
- }
-
- if (result == null)
+ if (result.ErrorMsgDiv == 0)
{
//缃戝叧鍚嶇О淇敼澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uGatewayReNameFail);
-
- this.ShowErrorMsg(msg);
- return false;
- }
-
- //缃戝叧淇敼澶辫触
- if (result.gwReNameData == null)
- {
- //缃戝叧鍚嶇О淇敼澶辫触
- string msg = Language.StringByID(R.MyInternationalizationString.uGatewayReNameFail);
-
- this.ShowErrorMsg(msg);
+ //缃戝叧鍥炲瓒呮椂
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, null, "鍥炲瓒呮椂");
+ this.ShowTipMsg(msg);
return false;
}
@@ -632,7 +621,7 @@
//鍒囨崲缃戝叧,淇濆瓨缂撳瓨
this.SaveGatewayIdToLocation(gatewayId);
//鍒囨崲缃戝叧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
return true;
}
@@ -677,7 +666,7 @@
if (getGatewayInfo == true)
{
//鑾峰彇缃戝叧淇℃伅
- var info = await this.GetGatewayNewInfoAsync(realWay);
+ var info = this.GetGatewayInfo(realWay);
if (info == null)
{
//鍏抽棴杩涘害鏉�
@@ -704,8 +693,7 @@
public void SaveGatewayIdToLocation(string gatewayId)
{
GatewayResourse.AppOldSelectGatewayId = gatewayId;
- byte[] data = System.Text.Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(GatewayResourse.AppOldSelectGatewayId));
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AppOldSelectGatewayFile, data);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.AppOldSelectGatewayFile, GatewayResourse.AppOldSelectGatewayId);
}
#endregion
@@ -746,7 +734,7 @@
}
//鍒犻櫎浜戠鐨勭綉鍏�
- await this.DeleteDataBaseGateway(zbGatewayID);
+ this.DeleteDataBaseGateway(zbGatewayID);
//鍒犻櫎缃戝叧鏂囦欢
this.DeleteGatewayFile(zbGatewayID);
@@ -995,7 +983,7 @@
public List<string> GetAllGatewayFile()
{
List<string> list = new List<string>();
- List<string> listFile = Global.FileListByHomeId();
+ List<string> listFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string file in listFile)
{
//鍙幏鍙栫綉鍏宠澶�
@@ -1317,9 +1305,8 @@
/// 鑾峰彇缃戝叧鍔犵壒鏁堢殑鍚嶇О
/// </summary>
/// <param name="zbGateway"></param>
- /// <param name="mode"></param>
/// <returns></returns>
- public string GetGatewayName(ZbGateway zbGateway, GetNameMode mode = GetNameMode.SpecialGateway)
+ public string GetGatewayName(ZbGateway zbGateway)
{
string gwId = zbGateway.GwId;
if (this.dicGateway.ContainsKey(gwId) == false)
@@ -1334,14 +1321,11 @@
return name;
}
- if (mode == GetNameMode.SpecialGateway)
+ string keyName = Common.LocalDevice.deviceModelIdName + localWay.LinuxImageType;
+ if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
{
- string keyName = Common.LocalDevice.deviceModelIdName + localWay.LinuxImageType;
- if (LocalDevice.Current.dicDeviceAllNameID.ContainsKey(keyName) == true)
- {
- //娌℃湁鍚嶇О鏃讹紝鍒欎娇鐢≧鏂囦欢閲岄潰璁剧疆鐨勯粯璁よ澶囧悕绉�
- return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);
- }
+ //娌℃湁鍚嶇О鏃讹紝鍒欎娇鐢≧鏂囦欢閲岄潰璁剧疆鐨勯粯璁よ澶囧悕绉�
+ return Language.StringByID(LocalDevice.Current.dicDeviceAllNameID[keyName] + 20000);
}
return string.Empty;
@@ -1388,9 +1372,9 @@
else
{
//缁欎竴涓嚎绋嬪幓鑾峰彇瀹冪殑闀滃儚绫诲瀷
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
+ var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
if (result != null)
{
//灏嗙綉鍏崇殑鏁版嵁璁剧疆鍒版湰鍦扮紦瀛樹腑
@@ -1430,32 +1414,13 @@
/// <param name="zbGateway"></param>
/// <param name="mode"></param>
/// <returns></returns>
- public async Task<ZbGatewayData.GetGwData> GetGatewayNewInfoAsync(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
+ public ZbGatewayData.GetGwData GetGatewayInfo(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
{
- ZbGateway realWay = null;
- if (this.GetRealGateway(ref realWay, zbGateway) == false)
- {
- if (mode == ShowErrorMode.YES)
- {
- string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
- this.ShowTipMsg(msg);
- }
- return null;
- }
//鑾峰彇缃戝叧鐗堟湰淇℃伅
- var imageTypeResult = await realWay.GetZbGwInfoAsync();
- //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckCommonErrorCode(imageTypeResult);
- if (error != null)
- {
- if (mode == ShowErrorMode.YES)
- {
- this.ShowTipMsg(error);
- }
- return null;
- }
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 95 } };
+ var result = this.SendJobjectDataToGateway(zbGateway, "GetZbGwInfo", jObject.ToString(), "GetZbGwInfo_Respon");
- if (imageTypeResult == null || imageTypeResult.getGwData == null)
+ if (result.ErrorMsgDiv != 1)
{
if (mode == ShowErrorMode.YES)
{
@@ -1467,42 +1432,19 @@
}
return null;
}
-
+ var getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGatewayData.GetGwData>(result.ReceiptData);
string gwID = zbGateway.GwId;
if (this.dicGateway.ContainsKey(gwID) == true)
{
//鍒锋柊缂撳瓨
ZbGateway localWay = this.dicGateway[gwID];
//灏嗙綉鍏崇殑鏁版嵁璁剧疆鍒版湰鍦扮紦瀛樹腑
- this.SetGatewayDataToLocalMemmory(localWay, imageTypeResult.getGwData);
+ this.SetGatewayDataToLocalMemmory(localWay, getGwInfo);
}
//椤轰究杩欎釜鍙橀噺涔熻缃竴涓�
- this.SetGatewayDataToLocalMemmory(zbGateway, imageTypeResult.getGwData, false);
+ this.SetGatewayDataToLocalMemmory(zbGateway, getGwInfo, false);
- return imageTypeResult.getGwData;
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧淇℃伅,闈炲紓姝�,浼氱瓑寰�(鐗堟湰淇℃伅,闀滃儚绫诲瀷,鍩烘湰淇℃伅绛夈�傚彧鍒锋柊鏈湴缃戝叧鐨勭紦瀛�)
- /// </summary>
- /// <param name="zbGateway"></param>
- /// <param name="mode"></param>
- /// <returns></returns>
- public ZbGatewayData.GetGwData GetGatewayNewInfo(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
- {
- bool bolBreak = false;
- ZbGatewayData.GetGwData result = null;
- HdlThreadLogic.Current.RunThread(async () =>
- {
- result = await this.GetGatewayNewInfoAsync(zbGateway, mode);
- bolBreak = true;
- });
-
- while (bolBreak == false)
- {
- System.Threading.Thread.Sleep(500);
- }
- return result;
+ return getGwInfo;
}
/// <summary>
@@ -1563,11 +1505,11 @@
/// <summary>
/// 鍙樻洿缃戝叧鎴块棿
/// </summary>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
+ /// <param name="gwId">缃戝叧Id</param>
/// <param name="roomId">鎴块棿ID</param>
- public void ChangedGatewayRoom(ZbGateway zbGateway, string roomId)
+ public void ChangedGatewayRoom(string gwId, string roomId)
{
- var localGateway = this.GetLocalGateway(zbGateway.GwId);
+ var localGateway = this.GetLocalGateway(gwId);
if (localGateway != null)
{
localGateway.RoomId = roomId;
@@ -1609,10 +1551,10 @@
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
/// <param name="mode">閿欒鏃讹紝鏄惁鏄剧ず閿欒</param>
/// <returns></returns>
- public async Task<List<FirmwareVersionInfo>> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
+ public List<FirmwareVersionInfo> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
- var result = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(zbGateway, mode);
+ var result = this.GetGatewayInfo(zbGateway, mode);
if (result == null)
{
return null;
@@ -1629,10 +1571,14 @@
localWay.LinuxHardVersion.ToString(),
localWay.LinuxImageType.ToString());
- //娣诲姞鍗忚皟鍣ㄧ殑鍗囩骇鍥轰欢(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- flage = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,
- localWay.CoordinatorHardVersion.ToString(),
- localWay.CoordinatorImageId.ToString());
+ //娣诲姞鍗忚皟鍣ㄧ殑鍗囩骇鍥轰欢(鎴愪笉鎴愬姛閮芥棤鎵�璋�) 蹇呴』鑳藉鑱旂綉鎵嶈
+ if (flage == 1)
+ {
+ //娌＄綉鐨勬椂鍊欎笉鍐嶅鐞�
+ HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.Coordinator,
+ localWay.CoordinatorHardVersion.ToString(),
+ localWay.CoordinatorImageId.ToString());
+ }
//缃戝叧鐨勭増鏈�
var gatewayFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.Linux,
@@ -1656,10 +1602,13 @@
//铏氭嫙椹卞姩鍙�
foreach (var data in localWay.DriveCodeList)
{
- //娣诲姞铏氭嫙椹卞姩鐨勫崌绾у浐浠�(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- flage = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
- data.DriveHwVersion.ToString(),
- data.DriveImageType.ToString());
+ //娣诲姞铏氭嫙椹卞姩鐨勫崌绾у浐浠�(鎴愪笉鎴愬姛閮芥棤鎵�璋�) 蹇呴』鑳藉鑱旂綉鎵嶈
+ if (flage == 1)
+ {
+ HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.VirtualDevice,
+ data.DriveHwVersion.ToString(),
+ data.DriveImageType.ToString());
+ }
//铏氭嫙椹卞姩
var virtualFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.VirtualDevice,
@@ -1753,9 +1702,9 @@
else
{
//缁欎竴涓嚎绋嬪幓鑾峰彇瀹冪殑闀滃儚绫诲瀷
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
+ var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
if (result != null)
{
//灏嗙綉鍏崇殑鏁版嵁璁剧疆鍒版湰鍦扮紦瀛樹腑
@@ -1791,9 +1740,9 @@
else
{
//缁欎竴涓嚎绋嬪幓鑾峰彇瀹冪殑闀滃儚绫诲瀷
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- var result = await this.GetGatewayNewInfoAsync(zbGateway, ShowErrorMode.NO);
+ var result = this.GetGatewayInfo(zbGateway, ShowErrorMode.NO);
if (result != null)
{
//灏嗙綉鍏崇殑鏁版嵁璁剧疆鍒版湰鍦扮紦瀛樹腑
@@ -1885,9 +1834,9 @@
}
bool canBreak = false;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- List<string> list = new List<string>() { "NotSetAgain", "NotCheck" };
+ List<string> list = new List<string>() { "NotCheck" };
//璁剧疆璁块棶鎺ュ彛鐨勫弬鏁�
var pra = new GetGatewayPra();
@@ -1896,7 +1845,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
pra.ReqDto.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);
if (string.IsNullOrEmpty(result) == true)
{
canBreak = true;
@@ -2019,16 +1968,16 @@
/// 瑙ｇ粦浜戠缁戝畾鐨勭綉鍏�
/// </summary>
/// <param name="strWayId"></param>
- public async Task<bool> DeleteDataBaseGateway(string strWayId)
+ public bool DeleteDataBaseGateway(string strWayId)
{
var Pra = new DeleteGatewayPra();
Pra.BindGateways.Add(strWayId);
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotSetAgain" };
+ List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotCheck" };
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
if (result == false)
{
return false;
@@ -2052,9 +2001,7 @@
listBackupGwId.Add(strId);
//澶囦唤
- var strData = Newtonsoft.Json.JsonConvert.SerializeObject(listBackupGwId);
- var byteData = System.Text.Encoding.UTF8.GetBytes(strData);
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile, byteData);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
}
}
@@ -2063,9 +2010,9 @@
/// </summary>
public void ResetComandToBindBackupGateway()
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- var fileData = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
+ var fileData = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.BackupGatewayIdFile);
if (fileData == null)
{
return;
@@ -2074,8 +2021,6 @@
var listTempId = new List<string>();
listTempId.AddRange(this.listBackupGwId);
- //涓嶆樉绀哄凡缁忚缁戝畾杩囩殑淇℃伅,NotSetAgain:鍋囧鏂綉鏃�,涓嶄簩娆″彂閫�
- List<string> listNotShow = new List<string>() { "NotSetAgain" };
//璋冪敤鎺ュ彛锛岀粦瀹氱綉鍏�
var bindGateway = new BindGatewayPra();
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
@@ -2085,12 +2030,12 @@
{
bindGateway.BindGateways.Clear();
bindGateway.BindGateways.Add(gwId);
- var result = await UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, listNotShow);
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
if (result == "Success")
{
this.listBackupGwId.Remove(gwId);
}
- if (result == "Error" || result == "ErrorEx")
+ if (result == "Error")
{
break;
}
@@ -2099,7 +2044,7 @@
if (this.listBackupGwId.Count == 0)
{
//濡傛灉娌℃湁浜嗗唴瀹�,鍒欏垹闄ゆ枃浠�
- string file = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile);
+ string file = DirNameResourse.BackupGatewayIdFile;
if (System.IO.File.Exists(file) == true)
{
System.IO.File.Delete(file);
@@ -2108,9 +2053,7 @@
else
{
//澶囦唤
- var strData = Newtonsoft.Json.JsonConvert.SerializeObject(listBackupGwId);
- var byteData = System.Text.Encoding.UTF8.GetBytes(strData);
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.BackupGatewayIdFile, byteData);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.BackupGatewayIdFile, listBackupGwId);
}
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index 36fc2e9..9b65233 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -977,7 +977,7 @@
/// <returns></returns>
private void StartGetGatewayVersionThread()
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鍏堢瓑涓�120绉掑惂锛岀綉鍏冲崌绾у拰缃戝叧瀹屽叏閲嶅惎闇�瑕佸緢闀挎椂闂�
int count = 12;
@@ -991,12 +991,12 @@
//杩欎釜鏃跺�欙紝涓嶅簲璇ユ彁绀鸿秴鏃�
this.UpdateTimeOutRefresh();
- await Task.Delay(10000);
+ System.Threading.Thread.Sleep(10000);
}
while (this.IsFinishUpdate == false)
{
//鑾峰彇鐗堟湰
- var result = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(this.upDatezbGateway, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.GetGatewayInfo(this.upDatezbGateway, ShowErrorMode.NO);
if (result != null)
{
break;
@@ -1004,7 +1004,7 @@
//杩欎釜鏃跺�欙紝涓嶅簲璇ユ彁绀鸿秴鏃�
this.UpdateTimeOutRefresh();
- await Task.Delay(5000);
+ System.Threading.Thread.Sleep(5000);
}
//宸茬粡鑳藉鑾峰彇鏁版嵁
this.ShowFinishMsg();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
index 5ad7ed1..21fed47 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlLogLogic.cs
@@ -56,13 +56,13 @@
/// <summary>
/// Log鍑哄姏
/// </summary>
- /// <param name="div">1:鏅�歀og,-1:鑷村懡閿欒Log</param>
+ /// <param name="div">1:鏅�歀og,-1:鑷村懡閿欒Log,2,3:鐗规畩Log</param>
/// <param name="strLog">Log鍐呭</param>
public void WriteLog(int div, string strLog)
{
lock (objLock)
{
- if (div != -1 && UserCenterResourse.HideOption.DetailedLog == 0)
+ if (div == 1 && UserCenterResourse.HideOption.DetailedLog == 0)
{
//鏆傛椂鍙褰曞紓甯镐俊鎭�
return;
@@ -71,9 +71,21 @@
System.IO.StreamWriter sw = null;
try
{
- string fileName = this.GetLogFile(div);
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.LogDirectory, fileName);
- strLog = "[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog + "\r\n";
+ string fullName = string.Empty;
+ if (div == 1 || div == -1)
+ {
+ string fileName = this.GetLogFile(div);
+ fullName = System.IO.Path.Combine(DirNameResourse.LogDirectory, fileName);
+ }
+ else if (div == 2)
+ {
+ fullName = DirNameResourse.SendAndReceveDataLog;
+ }
+ else if (div == 3)
+ {
+ fullName = DirNameResourse.SocketReceiveDataLog;
+ }
+ strLog = "\r\n[" + DateTime.Now.ToString("yyyyMMdd HH:mm:ss") + "] " + strLog + "\r\n";
sw = new System.IO.StreamWriter(fullName, true, Encoding.UTF8);
sw.WriteLine(strLog);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index c60d868..64b64c5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -39,13 +39,13 @@
/// 鍒涘缓鏂扮殑浣忓畢(杩斿洖浣忓畢id,null浠ｈ〃澶辫触)
/// </summary>
/// <param name="residenceName">浣忓畢鍚嶇О</param>
- public async System.Threading.Tasks.Task<string> CreatNewResidence(string residenceName)
+ public string CreatNewResidence(string residenceName)
{
var Pra = new AddResidencePra();
Pra.Name = residenceName;
//娣诲姞浣忓畢
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
- if (resultData == null)
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
+ if (string.IsNullOrEmpty(resultData) == true)
{
return null;
}
@@ -96,7 +96,7 @@
/// </summary>
/// <param name="residenceId"></param>
/// <returns></returns>
- public async System.Threading.Tasks.Task SwitchResidence(string residenceId)
+ public void SwitchResidence(string residenceId)
{
//鎵撳紑杩涘害鏉�
ProgressBar.Show();
@@ -106,7 +106,7 @@
Config.Instance.Home = this.GetHouseByHouseId(residenceId);
Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
+ UserCenterLogic.InitUserCenterMenmoryAndThread(false);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
@@ -122,7 +122,7 @@
/// <param name="residenceId">浣忓畢id</param>
/// <param name="residenceName">浣忓畢鍚嶇О</param>
/// <returns></returns>
- public async System.Threading.Tasks.Task<bool> EditorResidenceName(string residenceId, string residenceName)
+ public bool EditorResidenceName(string residenceId, string residenceName)
{
var Pra = new EditorResidencePra();
Pra.HomeId = residenceId;
@@ -131,7 +131,7 @@
Pra.LoginAccessToken = Config.Instance.Token;
//缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra, new List<string> { "NotCheck" });
if (flage == true)
{
//鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
@@ -160,7 +160,7 @@
home.Name = residenceName;
home.Save();
//浣忓畢淇敼鍚嶇О鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
@@ -176,7 +176,7 @@
public House GetHouseByHouseId(string houseId)
{
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, houseId, $"House_{houseId}.json");
- var file = Shared.IO.FileUtils.ReadFile(path);
+ var file = HdlFileLogic.Current.ReadFileByteContent(path);
if (file == null)
{
return null;
@@ -192,7 +192,7 @@
public House GetHouseByFilePath(string filePath)
{
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, GetHouseIdByFilePath(filePath), filePath);
- var file = Shared.IO.FileUtils.ReadFile(path);
+ var file = HdlFileLogic.Current.ReadFileByteContent(path);
if (file == null)
{
return null;
@@ -206,27 +206,26 @@
/// <summary>
/// 鑾峰彇浜戠浣忓畢鍒楄〃
/// </summary>
- public async System.Threading.Tasks.Task<List<string>> GetHomeListsFromDb()
+ public List<string> GetHomeListsFromDb()
{
- var pageSetting = new SendDataToServer.ResidenceListPageSettingObj()
+ if (HdlWifiLogic.Current.CanAccessHttp == false)
{
- PageSize = CommonPage.PageSize
- };
-
- var reqDto = new SendDataToServer.ResidenceListObj()
- {
- LoginAccessToken = Config.Instance.Token,
- PageSetting = pageSetting
- };
+ //褰撳墠鏃犳硶鑱旂綉
+ return Config.Instance.HomeFilePathList;
+ }
var requestObj = new SendDataToServer.ResidenceListReqDto()
{
- ReqDto = reqDto,
RequestVersion = CommonPage.RequestVersion,
+ ReqDto = new SendDataToServer.ResidenceListObj()
+ {
+ LoginAccessToken = Config.Instance.Token,
+ PageSetting = new SendDataToServer.ResidenceListPageSettingObj { PageSize = 999 }
+ }
};
try
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("App/GetHomePager", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (revertObj == null)
{
return null;
@@ -234,7 +233,7 @@
if (revertObj.StateCode.ToUpper() == "SUCCESS")
{
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResidenceRes>(revertObj.ResponseData.ToString());
- if(responseDataObj.TotalCount>0)
+ if (responseDataObj.TotalCount > 0)
{
//娓呯┖褰撳墠浣忓畢鍒楄〃
Config.Instance.HomeFilePathList.Clear();
@@ -317,7 +316,7 @@
var listHome = new List<Common.House>();
foreach (var housePath in Common.Config.Instance.HomeFilePathList)
{
- var home =this.GetHouseByFilePath(housePath);
+ var home = this.GetHouseByFilePath(housePath);
if (home == null)
{
continue;
@@ -351,7 +350,7 @@
if (arryHouse.Length > 0)
{
//璇诲彇鏂囦欢鍐呭
- var textValue = UserCenterLogic.LoadFileContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
+ var textValue = HdlFileLogic.Current.ReadFileTextContent(System.IO.Path.Combine(nowPath, arryHouse[0]));
if (textValue == null)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index 75af7bc..38c531b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -61,18 +61,20 @@
this.dicRooms.Clear();
//妫�娴嬫垜鐨勫枩鐖辫繖涓埧闂村璞�
this.CheckLoveRoom();
-
- foreach (var roomId in Config.Instance.Home.ListRooms)
+
+ var listFile = HdlFileLogic.Current.GetRootPathListFile();
+ foreach (var fileName in listFile)
{
- //浠庢枃浠堕噷闈㈣幏鍙栨埧闂村璞�
- var room = this.GetRoomByFilePath($"Room_{roomId}.json");
- if (room != null)
+ if (fileName.StartsWith("Room_") == true)
{
- this.dicRooms[room.Id] = (room);
+ //浠庢枃浠堕噷闈㈣幏鍙栨埧闂村璞�
+ var room = this.GetRoomByFilePath(fileName);
+ if (room != null)
+ {
+ this.dicRooms[room.Id] = (room);
+ }
}
}
- //璁剧疆褰撳墠妤煎眰鐨処D
- Config.Instance.Home.SetCurrentFloorId();
//椤轰究鍒锋柊鍦烘櫙
HdlSceneLogic.Current.ReFreshByLocal();
//鍒锋柊鎴块棿瑙嗗浘鍒楄〃
@@ -84,17 +86,13 @@
/// </summary>
public void RefreshAllRoomByLocation()
{
- var homeTemp = Config.Instance.Home;
- homeTemp.ListRooms.Clear();
-
- var listFile = Global.FileListByHomeId();
+ var listFile = HdlFileLogic.Current.GetRootPathListFile();
//鎴戠殑鍠滅埍鐨勬埧闂村繀椤昏鍦ㄧ0浣嶆墠琛�
string fRoom = "Room_Favorite.json";
if (listFile.Contains(fRoom) == true)
{
listFile.Remove(fRoom);
- homeTemp.ListRooms.Add("Favorite");
}
var listRoomFile = new List<string>();
@@ -103,7 +101,6 @@
if (fileName.StartsWith("Room_"))
{
string roomId = fileName.Replace("Room_", string.Empty).Replace(".json", string.Empty);
- homeTemp.ListRooms.Add(roomId);
listRoomFile.Add(fileName);
}
}
@@ -117,8 +114,7 @@
this.CheckAdminFloorData(listRoomFile);
}
- homeTemp.Save(false);
- InitAllRoom();
+ this.InitAllRoom();
}
/// <summary>
@@ -128,7 +124,7 @@
{
Application.RunOnMainThread(() =>
{
- MainPage.ListRoomViewFrom.Instance?.RefreshListRoom();
+ MainPage.LeftListRoomViewFrom.Instance?.RefreshListRoom();
});
}
@@ -215,15 +211,12 @@
/// <param name="rorefreshRoomViewom">鏄惁鍒锋柊鎴块棿瑙嗗浘鍒楄〃鐣岄潰</param>
public void AddRoom(Room room, bool refreshRoomView = true)
{
- if (Global.IsExistsByHomeId(room.FileName) == true
- || Config.Instance.Home.ListRooms.Contains(room.Id) == true)
+ if (Global.IsExistsByHomeId(room.FileName) == true)
{
return;
}
//娣诲姞鍒扮紦瀛�
this.dicRooms[room.Id] = room;
- //鎶婃埧闂碔D娣诲姞鍒颁綇瀹�
- Config.Instance.Home.AddRoomId(room.Id);
//鐢熸垚鏂囦欢
room.Save();
//澶囦唤
@@ -243,9 +236,21 @@
/// 鍒犻櫎鎴块棿
/// </summary>
/// <param name="roomId">鎴块棿ID</param>
+ /// <param name="refreshLeftView">鏄惁鍒锋柊宸︽粦鐣岄潰(姝ゅ彉閲忕洰鍓嶆槸缁欏垹闄ゅ叏閮ㄦ埧闂寸敤鐨�)</param>
/// <returns></returns>
- public void RemoveRoom(string roomId)
+ public void RemoveRoom(string roomId, bool refreshLeftView = true)
{
+ if (this.NowMainPageRoom != null && this.NowMainPageRoom.Id == roomId)
+ {
+ //褰撳垹闄ょ殑鏄富椤电殑鎴块棿鐨勬椂鍊�
+ this.NowMainPageRoom = this.GetLoveRoom();
+ }
+ if (this.NowCategoryRoom != null && this.NowCategoryRoom.Id == roomId)
+ {
+ //褰撳垹闄ょ殑鏄垎绫荤殑鎴块棿鐨勬椂鍊�
+ this.NowCategoryRoom = this.GetLoveRoom();
+ }
+
//鏍规嵁鎴块棿Id锛岃幏鍙栨埧闂村璞�
var room = this.GetRoomById(roomId);
if (room == null)
@@ -279,8 +284,6 @@
}
loveRoom.Save(false);
}
-
- Config.Instance.Home.RemoveRoomId(roomId);
this.dicRooms.Remove(roomId);
string roomFilePath = room.FileName;
@@ -293,9 +296,31 @@
//鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
Common.LocalDevice.Current.DeleteRealDeviceByRoomId(roomId);
+ if (refreshLeftView == true)
+ {
+ //HdlAutoBackupLogic.DeleteFile(roomFilePath);
+ //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+ this.RefreshRoomListView();
+ }
+ }
- //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
- this.RefreshRoomListView();
+ /// <summary>
+ /// 鍒犻櫎鍏ㄩ儴鐨勬埧闂�
+ /// </summary>
+ public void DeleteAllRoom()
+ {
+ var listRoomId = new List<string>();
+ foreach (var room in this.dicRooms.Values)
+ {
+ if (room.IsLove == false)
+ {
+ listRoomId.Add(room.Id);
+ }
+ }
+ foreach (var roomId in listRoomId)
+ {
+ this.RemoveRoom(roomId, false);
+ }
}
#endregion
@@ -357,7 +382,7 @@
public string GetRoomNameByDevice(CommonDevice device)
{
var room = this.GetRoomByDevice(device);
- return this.GetFloorRoomName(room);
+ return this.GetRoomName(room);
}
/// <summary>
@@ -365,7 +390,7 @@
/// </summary>
/// <returns>鎴块棿鍚�</returns>
/// <param name="room">鎴块棿瀵硅薄</param>
- public string GetFloorRoomName(Room room)
+ public string GetRoomName(Room room)
{
if (room == null)
{
@@ -466,7 +491,7 @@
}
}
}
- return listRoom;
+ return this.SortRoom(listRoom);
}
/// <summary>
@@ -480,36 +505,7 @@
{
listRoom.Add(room);
}
- return listRoom;
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂村悕绉�
- /// </summary>
- /// <param name="id"></param>
- /// <returns></returns>
- public List<string> GetRoomNamesByFloorId(string id)
- {
- var listName = new List<string>();
- if (Config.Instance.Home.FloorDics.Count == 0)
- {
- //娌℃湁妤煎眰
- foreach (var room in this.dicRooms.Values)
- {
- listName.Add(room.Name);
- }
- }
- else
- {
- foreach (var room in this.dicRooms.Values)
- {
- if (room.FloorId == id)
- {
- listName.Add(room.Name);
- }
- }
- }
- return listName;
+ return this.SortRoom(listRoom);
}
/// <summary>
@@ -541,17 +537,10 @@
}
}
}
+ listRoom = this.SortRoom(listRoom);
+
listRoom.Insert(0, GetLoveRoom());
return listRoom;
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠妤煎眰鐨勬埧闂�(鎷兼帴浜嗐�愬父鐢ㄣ�戝湪绗竴浣�)
- /// </summary>
- /// <returns></returns>
- public List<Room> GetRoomsByCurrentFloorIdAppendLoveRoom()
- {
- return this.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);
}
#endregion
@@ -574,7 +563,7 @@
//绉婚櫎鎴戠殑鍠滅埍
this.DeleteLoveDevice(device);
//璁惧鏀瑰彉鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
return;
}
//鎴块棿鏄惁淇敼
@@ -592,7 +581,7 @@
this.AddDevice(room, device, saveRealRoom);
}
//璁惧鏀瑰彉鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
/// <summary>
@@ -609,25 +598,6 @@
return true;
}
return false;
- }
-
- /// <summary>
- /// 鑾峰彇鎴块棿鎵�鍦ㄥ尯鍩�
- /// 妤煎眰,鎴块棿鍚�
- /// </summary>
- /// <returns></returns>
- public string GetZoneName(Room i_room)
- {
- if (string.IsNullOrEmpty(i_room.FloorId))
- {
- return i_room.Name;
- }
- var floorName = HdlResidenceLogic.Current.GetFloorNameById(i_room.FloorId);
- if (floorName == null)
- {
- return i_room.Name;
- }
- return $"{floorName}锛寋i_room.Name}";
}
#endregion
@@ -684,6 +654,8 @@
//淇濆瓨鍒版湰鍦�
loveRoom.ListDevice.Add(mainkeys);
loveRoom.Save();
+ //娣诲姞鏀惰棌璁惧鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
}
@@ -747,6 +719,8 @@
loveRoom.Save();
//鏇存敼鑷姩澶囦唤
HdlAutoBackupLogic.AddOrEditorFile(loveRoom.FileName);
+ //娣诲姞鏀惰棌璁惧鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
@@ -935,85 +909,87 @@
{
i_floorKeys = string.Empty;
}
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
- {
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
- }
-
- var listRoomSort = new List<string>();
- if (dicAllSort.ContainsKey(i_floorKeys) == true)
- {
- listRoomSort = dicAllSort[i_floorKeys];
- }
- else
- {
- dicAllSort[i_floorKeys] = listRoomSort;
- }
-
- var dicRoom = new Dictionary<string, Common.Room>();
+ var listRoom = new List<Room>();
foreach (var room in this.dicRooms.Values)
{
- if (room.FloorId != i_floorKeys && i_floorKeys != string.Empty)
+ if (room.FloorId != i_floorKeys && i_floorKeys != string.Empty
+ || room.IsLove == true)
{
- //涓嶆槸鍚屼竴涓ゼ灞�
+ //涓嶆槸鍚屼竴涓ゼ灞�,涓嶈鎴戠殑鍠滅埍
continue;
- }
- if (room.IsLove == true)
- {
- //涓嶈鎴戠殑鍠滅埍
- continue;
- }
- if (listRoomSort.Contains(room.Id) == false)
- {
- //鏂版坊鍔犵殑鎴块棿
- listRoomSort.Add(room.Id);
}
if (getShard == false && room.IsSharedRoom == true)
{
//涓嶈鍒嗕韩鐨勬埧闂�
continue;
}
- dicRoom[room.Id] = room;
+ listRoom.Add(room);
}
-
- var listSortRoom = new List<Room>();
- for (int i = 0; i < listRoomSort.Count; i++)
- {
- if (dicRoom.ContainsKey(listRoomSort[i]) == true)
- {
- listSortRoom.Add(dicRoom[listRoomSort[i]]);
- }
- }
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- return listSortRoom;
+ return this.SortRoom(listRoom);
}
/// <summary>
- /// 淇濆瓨鎴块棿鐨勯『搴�
+ /// 鎺掑簭鎴块棿瀵硅薄
/// </summary>
- /// <param name="i_floorKeys">妤煎眰涓婚敭</param>
- /// <param name="listSort">鎴块棿椤哄簭(鎴块棿鐨勪富閿�)</param>
- public void SaveRoomSort(string i_floorKeys, List<string> listSort)
+ /// <param name="listRoom"></param>
+ /// <returns></returns>
+ public List<Room> SortRoom(List<Room> listRoom)
{
- Dictionary<string, List<string>> dicAllSort = new Dictionary<string, List<string>>();
- //璇诲彇鎴块棿椤哄簭
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.RoomSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
+ //浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ var listName = new List<string>();
+ foreach (var room in listRoom)
{
- dicAllSort = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(strData);
+ listName.Add(room.Name);
}
+ int numberLength = this.GetNumberMaxLength(listName);
- //淇濆瓨椤哄簭
- dicAllSort[i_floorKeys] = listSort;
- UserCenterLogic.SaveFileContent(fullName, dicAllSort);
- dicAllSort.Clear();
+ var listSort = new List<string[]>();
+ foreach (var room in listRoom)
+ {
+ var strArry = new string[2];
+ strArry[0] = room.Id;
+ strArry[1] = string.Empty;
+
+ string value = string.Empty;
+ foreach (var c in room.Name)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //濡傛灉鎴块棿鍚嶅瓧甯︽湁鏁板瓧鐨勮瘽,鍒欏乏杈瑰姞闆�,鍥犱负杩欓噷鏈変釜鎺掑簭鐨勯棶棰�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ value = string.Empty;
+ }
+ strArry[1] += c.ToString();
+ }
+ if (value != string.Empty)
+ {
+ //浠ユ暟瀛楃粨灏剧殑璇�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ }
+ listSort.Add(strArry);
+ }
+ //鎺掑簭
+ listSort.Sort((obj1, obj2) =>
+ {
+ if (obj1[1].CompareTo(obj2[1]) > 0)
+ {
+ return 1;
+ }
+ return -1;
+ });
+ var listSortRoom = new List<Room>();
+ foreach (var strArry in listSort)
+ {
+ var room = this.GetRoomById(strArry[0]);
+ listSortRoom.Add(room);
+ }
+ return listSortRoom;
}
/// <summary>
@@ -1022,46 +998,66 @@
/// <returns></returns>
public Dictionary<string, string> GetFloorSortList()
{
- //璇诲彇妤煎眰椤哄簭
- var listFloorSort = new List<string>();
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- var strData = UserCenterLogic.LoadFileContent(fullName);
- if (strData != null)
+ //娌℃湁妤煎眰
+ if (Config.Instance.Home.FloorDics.Count == 0)
{
- listFloorSort = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(strData);
+ return new Dictionary<string, string>();
}
- foreach (string keys in Common.Config.Instance.Home.FloorDics.Keys)
+ //浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ var listName = new List<string>();
+ foreach (var floorName in Config.Instance.Home.FloorDics.Values)
{
- if (listFloorSort.Contains(keys) == false)
- {
- //鏂版坊鍔犵殑妤煎眰
- listFloorSort.Add(keys);
- }
+ listName.Add(floorName);
}
+ int numberLength = this.GetNumberMaxLength(listName);
+ var listSort = new List<string[]>();
+ foreach (var floorId in Config.Instance.Home.FloorDics.Keys)
+ {
+ var strArry = new string[2];
+ strArry[0] = floorId;
+ strArry[1] = string.Empty;
+
+ string value = string.Empty;
+ string floorName = Config.Instance.Home.FloorDics[floorId];
+ foreach (var c in floorName)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //濡傛灉鎴块棿鍚嶅瓧甯︽湁鏁板瓧鐨勮瘽,鍒欏乏杈瑰姞闆�,鍥犱负杩欓噷鏈変釜鎺掑簭鐨勯棶棰�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ value = string.Empty;
+ }
+ strArry[1] += c.ToString();
+ }
+ if (value != string.Empty)
+ {
+ //浠ユ暟瀛楃粨灏剧殑璇�
+ strArry[1] += value.PadLeft(numberLength, '0');
+ }
+ listSort.Add(strArry);
+ }
+ //妤煎眰鎺掑簭
+ listSort.Sort((obj1, obj2) =>
+ {
+ if (obj1[1].CompareTo(obj2[1]) > 0)
+ {
+ return 1;
+ }
+ return -1;
+ });
var dic = new Dictionary<string, string>();
- for (int i = 0; i < listFloorSort.Count; i++)
+ foreach (var strArry in listSort)
{
- if (Config.Instance.Home.FloorDics.ContainsKey(listFloorSort[i]) == true)
- {
- dic[listFloorSort[i]] = Config.Instance.Home.FloorDics[listFloorSort[i]];
- }
+ dic[strArry[0]] = Config.Instance.Home.FloorDics[strArry[0]];
}
-
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listFloorSort);
return dic;
- }
-
- /// <summary>
- /// 淇濆瓨妤煎眰鐨勯『搴�
- /// </summary>
- /// <param name="listSort">妤煎眰鐨勪富閿�</param>
- public void SaveFloorSort(List<string> listSort)
- {
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.FloorSortFile);
- //淇濆瓨椤哄簭
- UserCenterLogic.SaveFileContent(fullName, listSort);
}
#endregion
@@ -1094,24 +1090,78 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
+ /// 鑾峰彇鎴块棿鎬绘暟
+ /// </summary>
+ /// <returns></returns>
+ public int GetRoomCount()
+ {
+ return this.dicRooms.Count;
+ }
+
+ /// <summary>
/// 妫�娴嬫垜鐨勫枩鐖辫繖涓埧闂村璞�
/// </summary>
private void CheckLoveRoom()
{
- if (Config.Instance.Home.ListRooms.Contains("Favorite") == false)
+ if (this.dicRooms.ContainsKey("Favorite") == true)
+ {
+ return;
+ }
+ //璇诲彇鏈湴鎴戠殑鍠滅埍鏂囦欢
+ string favoriteFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, "Room_Favorite.json");
+ var fileContent = HdlFileLogic.Current.ReadFileTextContent(favoriteFile);
+ if (fileContent != null)
+ {
+ var love = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(fileContent);
+ this.dicRooms["Favorite"] = love;
+ }
+ else
{
//榛樿娣诲姞鍠滅埍鐨勬埧闂�--绂佹淇敼鎴块棿鍚�
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;
- currentHome.ListRooms.Insert(0, love.Id);
- currentHome.Save(false);
-
this.dicRooms["Favorite"] = love;
}
}
+ /// <summary>
+ /// 浠庝竴鍫嗘枃瀛椾腑,鑾峰彇杩欎竴鍫嗘枃瀛楅噷闈㈡暟瀛楀瓧绗︿覆鐨勬渶闀块暱搴�
+ /// </summary>
+ /// <param name="listText"></param>
+ /// <returns></returns>
+ private int GetNumberMaxLength(List<string> listText)
+ {
+ int maxLength = 0;
+ foreach (var text in listText)
+ {
+ string value = string.Empty;
+ foreach (var c in text)
+ {
+ if (char.IsNumber(c) == true)
+ {
+ //鏁板瓧
+ value += c.ToString();
+ continue;
+ }
+ else if (value != string.Empty)
+ {
+ //鍒ゆ柇鏁板瓧闀垮害
+ if (maxLength <= value.Length)
+ {
+ maxLength = value.Length;
+ }
+ value = string.Empty;
+ }
+ }
+ //鍒ゆ柇鏁板瓧闀垮害
+ if (maxLength <= value.Length)
+ {
+ maxLength = value.Length;
+ }
+ }
+ return maxLength;
+ }
+
#endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index afe0b4c..32f3a09 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -1366,7 +1366,7 @@
if (this.UserPassword == null)
{
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword);
+ var data = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.SafeguardUserPassword);
if (data != null)
{
this.UserPassword = System.Text.Encoding.UTF8.GetString(data);
@@ -1384,7 +1384,7 @@
if (result != GarrisonMode.None && result != GarrisonMode.RemoveGarrison)
{
//淇濆瓨鍔犲瘑鐨勫瘑鐮佸埌鏈湴
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result;
}
@@ -1473,7 +1473,7 @@
if (result2 != GarrisonMode.None && result2 != GarrisonMode.RemoveGarrison)
{
//淇濆瓨鍔犲瘑瀵嗙爜鍒版湰鍦�
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result2;
}
@@ -1588,7 +1588,7 @@
if (result2 != -1)
{
//淇濆瓨鍒板姞瀵嗗瘑鐮佹湰鍦�
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result2;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index b7c17d8..402cf70 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -166,6 +166,7 @@
//瓒呮椂鏃堕棿
int TimeOut = 0;
bool receiptAll = false;
+ bool canReceve = false;
var listScene = new List<Scene.GetSceneAllInfo>();
Action<string, string> action = (topic, message) =>
@@ -178,6 +179,8 @@
var sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene.GetSceneAllInfo>(jobject["Data"].ToString());
listScene.Add(sceneGetAllInfo);
+ //鏇村鎺ユ敹寰楀埌鍦烘櫙
+ canReceve = true;
if (sceneGetAllInfo.ScenesNum == sceneGetAllInfo.ScenesSum)
{
//鎺ユ敹瀹屾垚
@@ -200,7 +203,13 @@
}
mainGateway.Actions -= action;
action = null;
- if (receiptAll == false)
+ if (canReceve == false)
+ {
+ //鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+ this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uGetSceneListFailAndTimeOut));
+ return null;
+ }
+ else if (receiptAll == false)
{
//缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndSceneInfoIsNotFull));
@@ -394,6 +403,8 @@
{
nowRoom.ListSceneId.Add(scene.Id);
nowRoom.Save();
+ //娣诲姞鏀惰棌鍦烘櫙鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
@@ -607,6 +618,24 @@
HdlAutoBackupLogic.DeleteFile(sceneUI.IconPath);
}
}
+ //鍒犻櫎鍦烘櫙鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
+ }
+
+ /// <summary>
+ /// 娓呯┖鏈湴鍏ㄩ儴鐨勫満鏅暟鎹�
+ /// </summary>
+ public void DeleteAllLocalScene()
+ {
+ var listScene = new List<SceneUI>();
+ foreach (var scene in this.dicScenes.Values)
+ {
+ listScene.Add(scene);
+ }
+ foreach (var scene in listScene)
+ {
+ this.DeleteLocalScene(scene);
+ }
}
/// <summary>
@@ -635,12 +664,28 @@
{
nowRoom.ListSceneId.Remove(scene.Id);
nowRoom.Save();
+ //鍙栨秷鏀惰棌鍦烘櫙鏃�,闇�瑕佸埛鏂颁富椤�
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
}
#endregion
#region 鈻� 鑾峰彇鍦烘櫙___________________________
+
+ /// <summary>
+ /// 鑾峰彇鏈湴鍏ㄩ儴鐨勫満鏅�(鍖呭惈鏈垎閰�)
+ /// </summary>
+ /// <returns></returns>
+ public List<SceneUI> GetAllLocalScene()
+ {
+ //鎴块棿鐨勫満鏅斁鍦ㄥ墠闈�
+ var listScene = this.GetAllRoomSceneList();
+ //鏈垎閰嶇殑鍦烘櫙
+ var listUnalloctScene = this.GetUnalloctedScenes();
+ listScene.AddRange(listUnalloctScene);
+ return listScene;
+ }
/// <summary>
/// 閫氳繃鍦烘櫙id鑾峰彇鍦烘櫙
@@ -921,7 +966,7 @@
public List<string> GetAllSceneFile()
{
List<string> listSceneFile = new List<string>();
- List<string> listAllFile = Global.FileListByHomeId();
+ List<string> listAllFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string file in listAllFile)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 4244dad..9091b23 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -5,7 +5,6 @@
using System.IO;
using System.Net;
using System.Text;
-using System.Threading.Tasks;
using ZigBee.Device;
namespace Shared.Phone.UserCenter
@@ -53,7 +52,7 @@
/// </summary>
/// <param name="listDistributedMark"></param>
/// <returns></returns>
- private async Task<List<string>> SetShardFileToLocation(List<string> listDistributedMark)
+ private List<string> SetShardFileToLocation(List<string> listDistributedMark)
{
if (listDistributedMark.Count == 0)
{
@@ -63,7 +62,7 @@
List<string> listFile = new List<string>();
//鏂囦欢澶�
- string strDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory);
+ string strDir = DirNameResourse.DownLoadShardDirectory;
//涓嶅厑璁告寜绯荤粺鐨勮繑鍥為敭
Shared.Common.CommonPage.BackKeyCanClick = false;
@@ -73,8 +72,8 @@
{
string keys = listDistributedMark[i];
var dataPra = new { DistributedMark = keys, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetOneShareData", false, dataPra);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetOneShareData", false, dataPra, null, true);
+ if (string.IsNullOrEmpty(result) == true)
{
//鍏佽鎸夌郴缁熺殑杩斿洖閿�
Shared.Common.CommonPage.BackKeyCanClick = true;
@@ -85,7 +84,7 @@
//鏂囦欢鍚嶅瓧
listFile.Add(dataResult.ShareName);
//淇濆瓨鍒版寚瀹氭枃浠跺す涓�
- Global.WriteFileToDirectoryByBytes(strDir, dataResult.ShareName, dataResult.ShareDataBytes);
+ HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(strDir, dataResult.ShareName), System.Text.Encoding.UTF8.GetString(dataResult.ShareDataBytes));
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listMarkCount);
}
@@ -104,13 +103,13 @@
/// <returns></returns>
public byte[] GetShardFileContent(string fileName)
{
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
if (System.IO.File.Exists(fullName) == false)
{
return null;
}
- string path = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory);
- var varByte = Global.ReadFileByDirectory(path, fileName);
+ string path = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
+ var varByte = HdlFileLogic.Current.ReadFileByteContent(path);
return varByte;
}
@@ -120,10 +119,7 @@
/// <returns></returns>
public List<string> GetLocalAllShardFile()
{
- string path = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory);
- var listFile = HdlAutoBackupLogic.GetFileFromDirectory(path);
-
- return listFile;
+ return HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.DownLoadShardDirectory);
}
/// <summary>
@@ -133,7 +129,7 @@
/// <returns></returns>
public bool IsFileExists(string fileName)
{
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
if (System.IO.File.Exists(fullName) == false)
{
return false;
@@ -155,9 +151,9 @@
{
return;
}
- string oldName = UserCenterLogic.CombinePath(fileName);
- string newName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
- System.IO.File.Copy(oldName, newName, true);
+ string oldName = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
+ string newName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
+ HdlFileLogic.Current.CopyFile(oldName, newName);
}
/// <summary>
@@ -167,12 +163,9 @@
public void AddShardFile(Common.Room room)
{
room.IsSharedRoom = true;
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(room);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, room.FileName);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, room.FileName);
//鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
+ HdlFileLogic.Current.SaveFileContent(fullName, room);
}
/// <summary>
@@ -182,12 +175,9 @@
public void AddShardFile(Common.SceneUI scene)
{
scene.IsSharedScene = true;
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(scene);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, scene.FileName);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, scene.FileName);
//鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
+ HdlFileLogic.Current.SaveFileContent(fullName, scene);
}
/// <summary>
@@ -196,12 +186,9 @@
/// <param name="dic">妤煎眰</param>
public void AddShardFile(Dictionary<string, string> dic)
{
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(dic);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, DirNameResourse.ShardFloorFile);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, DirNameResourse.ShardFloorFile);
//鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
+ HdlFileLogic.Current.SaveFileContent(fullName, dic);
}
#endregion
@@ -214,11 +201,8 @@
/// <param name="fileName">鎸囧畾鏂囦欢鍚嶅瓧</param>
public void DeleteShardFile(string fileName)
{
- fileName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
- if (System.IO.File.Exists(fileName) == true)
- {
- System.IO.File.Delete(fileName);
- }
+ fileName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
+ HdlFileLogic.Current.DeleteFile(fileName);
}
/// <summary>
@@ -228,8 +212,7 @@
{
this.dicShardDeviceFile.Clear();
//鍒涘缓鏂囦欢澶�
- string strDir = System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory);
- Global.CreateEmptyDirectory(strDir, true);
+ HdlFileLogic.Current.CreateDirectory(DirNameResourse.DownLoadShardDirectory, true);
}
#endregion
@@ -239,7 +222,7 @@
/// <summary>
/// 鍚屾鏈嶅姟鍣ㄧ殑鍒嗕韩鍐呭(閲岄潰鍙礋璐ｆ妸涓滆タ瀛樺叆鏈湴)
/// </summary>
- public async Task<bool> SynchronizeDbSharedContent()
+ public bool SynchronizeDbSharedContent()
{
if (UserCenterResourse.UserInfo.AuthorityNo != 3)
{
@@ -249,8 +232,7 @@
//鑾峰彇涓讳汉鍒嗕韩缁欐垚鍛樼殑鏂囦欢鍒楄〃
var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };
- var listNotShow = new List<string>() { "NotSetAgain" };
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra, listNotShow);
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra);
if (string.IsNullOrEmpty(result) == true)
{
return false;
@@ -291,7 +273,7 @@
//灏嗗垎浜殑鏁版嵁瀛樺叆鏈湴(鑾峰彇鐨勬槸鏈湴娌℃湁鐨�)
this.ClearShardDirectory();
- var listDbFile = await this.SetShardFileToLocation(listAddMark);
+ var listDbFile = this.SetShardFileToLocation(listAddMark);
if (listDbFile == null)
{
//鍏抽棴
@@ -302,22 +284,16 @@
//鐢熸垚鏂囦欢
foreach (string fileName in listDbFile)
{
- var oldPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
+ var oldPath = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
var newPath = System.IO.Path.Combine(Config.Instance.FullPath, fileName);
- System.IO.File.Copy(oldPath, newPath, true);
-
- if (fileName.StartsWith("Room_") == true)
- {
- //鎴块棿鏂囦欢鐗规畩澶勭悊
- Config.Instance.Home.AddRoomId(fileName.Replace("Room_", string.Empty).Replace(".json", string.Empty));
- }
+ HdlFileLogic.Current.CopyFile(oldPath, newPath);
}
//娓呯┖鍏变韩鏂囦欢澶�
this.ClearShardDirectory();
}
//鍚屾鏈嶅姟鍣ㄧ殑鍙栨秷浜嗙殑鍒嗕韩鍐呭
- return await this.SynchronizeDeleteSharedContent(listShardFile, dicUpdateTime);
+ return this.SynchronizeDeleteSharedContent(listShardFile, dicUpdateTime);
}
/// <summary>
@@ -326,7 +302,7 @@
/// <param name="listShardFile">浜戠涓婇潰鍒嗕韩鐨勬枃浠�,涓篘ull鏃朵粠鏂拌幏鍙�</param>
/// <param name="dicUpdateTime">鍒嗕韩鏂囦欢鐨勬洿鏂版椂闂�,涓篘ull鏃朵粠鏂拌幏鍙�</param>
/// <returns></returns>
- public async Task<bool> SynchronizeDeleteSharedContent(HashSet<string> listShardFile = null, Dictionary<string, string> dicUpdateTime = null)
+ public bool SynchronizeDeleteSharedContent(HashSet<string> listShardFile = null, Dictionary<string, string> dicUpdateTime = null)
{
if (UserCenterResourse.UserInfo.AuthorityNo != 3)
{
@@ -349,8 +325,7 @@
listShardFile = new HashSet<string>();
//鑾峰彇涓讳汉鍒嗕韩缁欐垚鍛樼殑鏂囦欢鍒楄〃
var infoPra = new { DistributedMark = Config.Instance.Guid, HouseDistributedMark = Common.Config.Instance.Home.Id, IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare };
- var listNotShow = new List<string>() { "NotSetAgain" };
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra, listNotShow);
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra);
if (string.IsNullOrEmpty(result) == true)
{
//鍏抽棴
@@ -368,7 +343,7 @@
//娓呯┖妤煎眰鏁版嵁
Common.Config.Instance.Home.FloorDics.Clear();
//鐒跺悗妫�娴嬫湰鍦扮殑鏂囦欢
- var listLocalFile = Global.FileListByHomeId();
+ var listLocalFile = HdlFileLogic.Current.GetRootPathListFile();
foreach (string fileName in listLocalFile)
{
if (fileName == DirNameResourse.ShardFloorFile)
@@ -408,8 +383,6 @@
//鍒犻櫎鎺夎繖涓埧闂存枃浠�
Global.DeleteFilebyHomeId(fileName);
dicUpdateTime.Remove(fileName);
-
- Config.Instance.Home.RemoveRoomId(nowRoom.Id);
}
//妫�娴嬫湰鍦板満鏅枃浠�,鏄惁瀛樺湪宸茬粡鍙栨秷浜嗗叡浜簡鐨�
else if (fileName.StartsWith("Scene_") == true)
@@ -451,7 +424,7 @@
private Dictionary<string, string> GetAllShardFileAgoUpdateTime()
{
var dicTime = new Dictionary<string, string>();
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateTimeFile);
+ var data = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.ShardFileUpdateTimeFile);
if (data == null)
{
//鐩爣鏂囦欢涓嶅瓨鍦�
@@ -467,9 +440,7 @@
/// <param name="dicTime"></param>
private void SaveAllShardFileAgoUpdateTime(Dictionary<string, string> dicTime)
{
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(dicTime);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.ShardFileUpdateTimeFile, byteData);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.ShardFileUpdateTimeFile, dicTime);
}
#endregion
@@ -487,7 +458,7 @@
/// <para>New鐨勬椂鍊欒寰楀SubAccountDistributedMark璧嬪��,瀹冩槸鎴愬憳鍒楄〃鎺ュ彛杩斿洖鐨凷ubAccountDistributedMark</para>
/// </param>
/// <returns></returns>
- public async Task<bool> GetMemberShardContentListAndSetToLocation(MemberShardInfoData memberShardInfo)
+ public bool GetMemberShardContentListAndSetToLocation(MemberShardInfoData memberShardInfo)
{
if (memberShardInfo.Refresh == false)
{
@@ -507,8 +478,8 @@
HouseDistributedMark = Shared.Common.Config.Instance.HomeId,
IsOtherAccountControl = Common.Config.Instance.Home.IsOthreShare
};
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/GetShareDataBySubAccount", false, infoPra);
+ if (string.IsNullOrEmpty(result) == true)
{
//鍏抽棴杩涘害鏉�
ProgressFormBar.Current.Close();
@@ -542,7 +513,7 @@
}
//灏嗗垎浜殑鏁版嵁瀛樺叆鏈湴,杩斿洖鐨勬槸鏂囦欢鍚嶅瓧(寮傚父鏃惰繑鍥瀗ull)
- var listFile = await this.SetShardFileToLocation(listMark);
+ var listFile = this.SetShardFileToLocation(listMark);
if (listFile == null)
{
//鍏抽棴杩涘害鏉�
@@ -736,7 +707,7 @@
/// <param name="listScene">閫夋嫨涓婁紶鐨勫満鏅�(涓嶈鑾峰彇瀹冮噷闈㈢殑缁戝畾鍒楄〃)</param>
/// <param name="BarMaxValue">杩涘害鏉＄殑鏈�澶у��,濡傛灉涓嶄负-1,鍒欏唴閮ㄤ笉浼氳嚜鍔ㄥ脊鍑鸿繘搴︽潯</param>
/// <param name="listCheckFile">鏂囦欢閲嶅涓婁紶妫�娴�</param>
- public async Task<bool> DoUploadSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
+ public bool DoUploadSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
List<CommonDevice> listDevice, List<Common.SceneUI> listScene, int BarMaxValue = -1, HashSet<string> listCheckFile = null)
{
if (listDevice.Count == 0 && listScene.Count == 0)
@@ -790,11 +761,11 @@
}
//涓婁紶鍒嗕韩
- var result = await this.DoUploadShardContent(memberShardInfo, listFile, listCheckFile);
+ var result = this.DoUploadShardContent(memberShardInfo, listFile, listCheckFile);
if (result == true)
{
//鍒犻櫎鎸囧畾鑷畾涔夊浘鐗�
- result = await this.DoDeleteSharedContent(memberShardInfo, listDelPic);
+ result = this.DoDeleteSharedContent(memberShardInfo, listDelPic);
}
if (BarMaxValue == -1)
{
@@ -1008,7 +979,7 @@
/// <param name="listFile">涓婁紶鐨勬枃浠跺悕</param>
/// <param name="listCheckFile">閲嶅鏂囦欢涓婁紶妫�娴�</param>
/// <returns></returns>
- private async Task<bool> DoUploadShardContent(MemberShardInfoData memberShardInfo, List<string> listFile, HashSet<string> listCheckFile)
+ private bool DoUploadShardContent(MemberShardInfoData memberShardInfo, List<string> listFile, HashSet<string> listCheckFile)
{
var dicKeys = new Dictionary<string, string>();
for (int i = 0; i < listFile.Count; i++)
@@ -1043,8 +1014,8 @@
//杩藉姞鍏变韩
if (memberShardInfo.dicAllShardKeys.ContainsKey(fileName) == false)
{
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/AddShareData", false, info);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeDataShare/AddShareData", false, info, null, true);
+ if (string.IsNullOrEmpty(result) == true)
{
return false;
}
@@ -1054,7 +1025,7 @@
else
{
info.DistributedMark = memberShardInfo.dicAllShardKeys[fileName];
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info, null, true);
if (result == false)
{
return false;
@@ -1082,7 +1053,7 @@
/// <returns></returns>
private string UpLoadBigBackupFileToDB(MemberShardInfoData memberShardInfo, string fileName)
{
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.DownLoadShardDirectory, fileName);
+ string fullName = System.IO.Path.Combine(DirNameResourse.DownLoadShardDirectory, fileName);
if (System.IO.File.Exists(fullName) == false)
{
return null;
@@ -1275,7 +1246,7 @@
/// <param name="listDevice">瑕佸彇娑堢殑璁惧</param>
/// <param name="listSceneUI">瑕佸彇娑堢殑鍦烘櫙</param>
/// <returns></returns>
- public async Task<bool> DoDeleteSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
+ public bool DoDeleteSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
List<CommonDevice> listDevice, List<SceneUI> listSceneUI)
{
var roomTemp = memberShardInfo.dicShardRoom[nowRoom.FileName];
@@ -1312,7 +1283,6 @@
}
listDeleteFile.Add(device.FilePath);
}
-
//鍐嶅紕鍦烘櫙
foreach (var sceneUI in listSceneUI)
{
@@ -1404,12 +1374,12 @@
}
//鎵ц绉婚櫎鍒嗕韩鏁版嵁
- var result = await this.DoDeleteSharedContent(memberShardInfo, nowRoom, listMark, listDeleteFile);
+ var result = this.DoDeleteSharedContent(memberShardInfo, nowRoom, listMark, listDeleteFile);
//鍚屾鎴块棿鏂囦欢
if (result == true && listDeleteFile.Contains(roomTemp.FileName) == false)
{
//鎵ц涓婁紶鎴块棿瀵硅薄
- result = await this.DoUploadRoomObject(memberShardInfo, roomTemp);
+ result = this.DoUploadRoomObject(memberShardInfo, roomTemp);
}
//鍚屾妤煎眰鏁版嵁
if (result == true && listDeleteFile.Contains(roomTemp.FileName) == true)
@@ -1428,7 +1398,7 @@
//濡傛灉璇ユゼ灞傚凡缁忓垹瀹屾埧闂翠簡,鍒欐洿鏂版ゼ灞�
memberShardInfo.dicShardFloor.Remove(roomTemp.FloorId);
//鎵ц涓婁紶瀵硅薄
- result = await this.DoUploadFloorObject(memberShardInfo);
+ result = this.DoUploadFloorObject(memberShardInfo);
}
}
@@ -1456,7 +1426,7 @@
/// <param name="listMark">瑕佺Щ闄ょ殑涓婚敭</param>
/// <param name="listDeleteFile">瑕佸垹闄ょ殑鏂囦欢(鎴块棿鏂囦欢闇�瑕佸垹闄ょ殑璇�,蹇呴』鏀惧湪鏈�鍚�)</param>
/// <returns></returns>
- private async Task<bool> DoDeleteSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
+ private bool DoDeleteSharedContent(MemberShardInfoData memberShardInfo, Common.Room nowRoom,
List<string> listMark, List<string> listDeleteFile)
{
if (listMark.Count == 0)
@@ -1477,7 +1447,7 @@
info.DistributedMark = markKeys;
//鎵ц鍒犻櫎
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/DeleteShareData", false, info);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/DeleteShareData", false, info, null, true);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -1508,7 +1478,7 @@
/// <param name="memberShardInfo">鎴愬憳鐨勫垎浜唴瀹�</param>
/// <param name="listDelFile">鍒犻櫎鐨勬枃浠�</param>
/// <returns></returns>
- private async Task<bool> DoDeleteSharedContent(MemberShardInfoData memberShardInfo, List<string> listDelFile)
+ private bool DoDeleteSharedContent(MemberShardInfoData memberShardInfo, List<string> listDelFile)
{
if (listDelFile.Count == 0)
{
@@ -1526,7 +1496,7 @@
info.DistributedMark = memberShardInfo.dicAllShardKeys[fileName];
//鎵ц鍒犻櫎
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/DeleteShareData", false, info);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/DeleteShareData", false, info, null, true);
if (result == false)
{
return false;
@@ -1552,7 +1522,7 @@
/// <param name="memberShardInfo">鎴愬憳鐨勫叡浜唴瀹�</param>
/// <param name="upDateRoom">闇�瑕佷笂浼犲埌浜戠鐨勬埧闂村璞�</param>
/// <returns></returns>
- private async Task<bool> DoUploadRoomObject(MemberShardInfoData memberShardInfo, Common.Room upDateRoom)
+ private bool DoUploadRoomObject(MemberShardInfoData memberShardInfo, Common.Room upDateRoom)
{
if (upDateRoom.Id == "Other")
{
@@ -1566,7 +1536,7 @@
var data = Newtonsoft.Json.JsonConvert.SerializeObject(upDateRoom);
var byteData = System.Text.Encoding.UTF8.GetBytes(data);
info.ShareDataBytes = byteData;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info, null, true);
if (result == false)
{
return false;
@@ -1586,7 +1556,7 @@
/// </summary>
/// <param name="memberShardInfo">鎴愬憳鐨勫叡浜唴瀹�</param>
/// <returns></returns>
- private async Task<bool> DoUploadFloorObject(MemberShardInfoData memberShardInfo)
+ private bool DoUploadFloorObject(MemberShardInfoData memberShardInfo)
{
var info = new EditorShardContent();
info.DistributedMark = memberShardInfo.dicAllShardKeys[DirNameResourse.ShardFloorFile];
@@ -1596,7 +1566,7 @@
var data = Newtonsoft.Json.JsonConvert.SerializeObject(memberShardInfo.dicShardFloor);
var byteData = System.Text.Encoding.UTF8.GetBytes(data);
info.ShareDataBytes = byteData;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeDataShare/EditShareData", false, info, null, true);
if (result == false)
{
return false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
index 5b405df..417d083 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlThreadLogic.cs
@@ -56,6 +56,8 @@
//鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
alert.Show();
+ //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+ ProgressBar.Close();
});
}
//Log鍑哄姏
@@ -93,6 +95,8 @@
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
HdlLogLogic.Current.WriteLog(ex, msg);
+ //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+ ProgressBar.Close();
}
});
@@ -126,6 +130,8 @@
//Log鍑哄姏
string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + nowFormId + "]";
HdlLogLogic.Current.WriteLog(ex, msg);
+ //鍑虹幇寮傚父,鍒欏叧闂繘搴︽潯
+ ProgressBar.Close();
}
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index 0f40b6d..ce24a39 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -114,7 +114,6 @@
/// </summary>
private Com.Mediatek.Elian.ElianNative hdlWiFi = null;
#endif
-
/// <summary>
/// TCP鍗忚
/// </summary>
@@ -127,6 +126,40 @@
/// Ap妯″紡缃戝叧杩斿洖鐨勭閽�
/// </summary>
private string randDesKey = null;
+ /// <summary>
+ /// 鏄惁宸茬粡娣诲姞缃戠粶鍙樺寲鐩戝惉
+ /// </summary>
+ private bool hadAddListenNetWork = false;
+
+ /// <summary>
+ /// 鑳藉惁璁块棶http
+ /// </summary>
+ private bool m_CanAccessHttp = true;
+ /// <summary>
+ /// 涓婁竴娆¤闂甴ttp鐨勬椂闂�
+ /// </summary>
+ private DateTime oldAccessHttpTime = DateTime.Now;
+ /// <summary>
+ /// 鑳藉惁璁块棶http
+ /// </summary>
+ public bool CanAccessHttp
+ {
+ set
+ {
+ m_CanAccessHttp = value;
+ oldAccessHttpTime = DateTime.Now;
+ }
+ get
+ {
+ //8绉掑悗鍏佽鍐嶆璁块棶
+ if (m_CanAccessHttp == true || (DateTime.Now - oldAccessHttpTime).TotalMilliseconds > 8 * 1000)
+ {
+ oldAccessHttpTime = DateTime.Now;
+ return true;
+ }
+ return false;
+ }
+ }
#endregion
@@ -286,6 +319,97 @@
#endregion
+ #region 鈻� 鐩戝惉缃戠粶鍙樺寲_______________________
+
+ /// <summary>
+ /// 寮�鍚洃鍚綉缁�
+ /// </summary>
+ public void StartListenNetWork()
+ {
+ if (hadAddListenNetWork == true)
+ {
+ return;
+ }
+ hadAddListenNetWork = true;
+
+#if Android
+ //寮�鍚洃鍚畨鍗撶綉缁滃彉鍖�
+ BaseActivity.NetworkStateChanged += (value) =>
+ {
+ //缃戠粶鍙樺寲
+ this.NetworkStateChanged(value);
+ };
+#endif
+
+#if iOS
+ //寮�鍚洃鍚琁OS缃戠粶鍙樺寲
+ GateWay.Ios.Reachability.ReachabilityChanged += (sender, e) =>
+ {
+ var internetStatus = GateWay.Ios.Reachability.InternetConnectionStatus();
+ if (internetStatus == GateWay.Ios.NetworkStatus.NotReachable)//娌℃湁缃戠粶杩炴帴 0
+ {
+ //缃戠粶鍙樺寲
+ this.NetworkStateChanged(0);
+ }
+ else if (internetStatus == GateWay.Ios.NetworkStatus.ReachableViaCarrierDataNetwork)//3,4G鐨勭綉缁滆繛鎺� 1
+ {
+ //缃戠粶鍙樺寲
+ this.NetworkStateChanged(1);
+ }
+ else if (internetStatus == GateWay.Ios.NetworkStatus.ReachableViaWiFiNetwork) //wifi鐨勭綉缁滆繛鎺� 2
+ {
+ //缃戠粶鍙樺寲
+ this.NetworkStateChanged(2);
+ }
+ };
+#endif
+ }
+
+ /// <summary>
+ /// 鐩戝惉瀹夊崜缃戠粶鍙樺寲
+ /// </summary>
+ /// <param name="value">0:娌℃湁缃戠粶 1:4G 2:wifi</param>
+ private void NetworkStateChanged(int value)
+ {
+ //娌℃湁缃戠粶
+ if (value == 0)
+ {
+ this.CanAccessHttp = false;
+ //鍏抽棴Socket
+ ZigBee.Common.Application.FindGateWaySocket.Stop();
+ }
+ //WIFI鎴栬��4G鏃�
+ if (value == 1 || value == 2)
+ {
+ //鍏佽鑱旂綉
+ this.CanAccessHttp = true;
+
+ //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
+ if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false
+ && Common.Config.Instance.HomeId != string.Empty)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ ProgressBar.Show();
+ //閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
+ UserCenterLogic.ReInitUserAccoutInfo();
+ ProgressBar.Close();
+
+ }, ShowErrorMode.NO);
+ }
+ //閲嶆柊鍒濆鍖朣ocket
+ ZigBee.Common.Application.FindGateWaySocket.Stop();
+ if (value == 2)
+ {
+ ZigBee.Common.Application.FindGateWaySocket.Start();
+ }
+ //鏂帀鏈湴杩炴帴
+ HdlGatewayLogic.Current.ClearAllRealGateway();
+ }
+ }
+
+ #endregion
+
#region 鈻� 涓�鑸柟娉昣__________________________
#if Android
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 3542581..bf5c4b9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -2,8 +2,6 @@
using Shared.Common;
using Newtonsoft.Json;
using Shared.Common.ResponseEntity;
-using System.Threading.Tasks;
-using System.Text.RegularExpressions;
using System.Collections.Generic;
using System.Text;
@@ -23,30 +21,28 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖銆恌alse銆�</pra>
- /// </param>
- public static async Task<bool> GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
- //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
- if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
{
- //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
return false;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
- if (byteData == null)
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
+ if (byteData == null && setAgain == true)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
+ //涓嶆寚瀹氶噸鍙�
return false;
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return false;
@@ -64,31 +60,30 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�怱uccess銆�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖銆怑rrorEx銆�</pra>
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static async Task<string> GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
- //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
- if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
{
- //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
return "Error";
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
if (byteData == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
- return "ErrorEx";
+ //涓嶆寚瀹氶噸鍙�
+ return "Error";
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return "Error";
@@ -109,30 +104,29 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炵┖瀛楃涓�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖绌哄瓧绗︿覆</pra>
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static async Task<string> GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
- //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
- if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
{
- //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var byteData = await GettByteResponsePack(RequestName, connectMode, obj);
+ var byteData = GettByteResponsePack(RequestName, connectMode, obj);
if (byteData == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
- return string.Empty;
+ //涓嶆寚瀹氶噸鍙�
+ return null;
}
- byteData = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (byteData == null)
{
return null;
@@ -159,32 +153,29 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
- /// <param name="listNotShowError">
- /// <pra>涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炵┖瀛楃涓�</pra>
- /// <pra>濡傛灉鎸囧畾鏈塏otSetAgain,鍒欎笉浜屾鍙戦��(姣斿鏂綉),鐒跺悗杩斿洖null</pra>
- /// </param>
- public static async Task<byte[]> GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null)
+ /// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
- //妫�娴嬫槸鍚﹀凡缁忓畬鎴愯处鍙蜂俊鎭垵濮嬪寲
- if (UserCenterResourse.UserInfo.InitUserInfoSuccess == false)
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
{
- //涓嶇缁撴灉鎬庝箞鏍�,濡傛灉璋冪敤浜嗚繖涓嚱鏁�,闇�瑕侀噸澶磋幏鍙朤oken,鎵�浠ュ繀椤昏繑鍥炲け璐�
- await ReInitUserAccoutInfo(listNotShowError);
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
return null;
}
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
- var revertObj = await GettByteResponsePack(RequestName, connectMode, obj);
+ var revertObj = GettByteResponsePack(RequestName, connectMode, obj);
if (revertObj == null)
{
- if (listNotShowError != null && listNotShowError.Contains("NotSetAgain") == true)
+ if (setAgain == false)
{
+ //涓嶆寚瀹氶噸鍙�
return null;
}
- //閲嶆柊鍙戦��
- revertObj = await ResetByteRequestHttps(RequestName, checkAuthority, obj);
+ revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);
if (revertObj == null)
{
return null;
@@ -216,7 +207,7 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <returns></returns>
- private static async Task<byte[]> ResetByteRequestHttps(string RequestName, bool checkAuthority, object obj)
+ private static byte[] ResetByteRequestHttps(string RequestName, bool checkAuthority, object obj)
{
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
@@ -225,9 +216,9 @@
int count = 0;
while (true)
{
- await Task.Delay(1000);
+ System.Threading.Thread.Sleep(1000);
//璋冪敤鎺ュ彛
- responsePack = await GettByteResponsePack(RequestName, connectMode, obj);
+ responsePack = GettByteResponsePack(RequestName, connectMode, obj);
if (responsePack != null)
{
break;
@@ -235,13 +226,8 @@
count++;
if (count == 3)
{
- Application.RunOnMainThread(() =>
- {
- //缃戠粶涓嶇ǔ瀹�,璇风◢鍚庡啀璇�
- string msg = Language.StringByID(R.MyInternationalizationString.uNetIsUnStabilityAndDoAgain);
- var control = new ShowMsgControl(ShowMsgType.Tip, msg);
- control.Show();
- });
+ //鏄剧ず娌℃湁缃戠粶鐨凪sg
+ ShowNotNetMsg(null);
break;
}
}
@@ -255,7 +241,7 @@
/// <param name="RequestName">璁块棶鍦板潃</param>
/// <param name="connectMode">鎺ュ彛鐨勮繛鎺ユā寮�</param>
/// <param name="obj">涓�涓被</param>
- private static async Task<byte[]> GettByteResponsePack(string RequestName, HttpConnectMode connectMode, object obj)
+ private static byte[] GettByteResponsePack(string RequestName, HttpConnectMode connectMode, object obj)
{
try
{
@@ -266,12 +252,12 @@
if (connectMode == HttpConnectMode.Normal)
{
//鏅�氳闂�
- result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, Encoding.UTF8.GetBytes(requestJson));
+ result = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, Encoding.UTF8.GetBytes(requestJson));
}
else if (connectMode == HttpConnectMode.Admin)
{
//浠ョ鐞嗗憳鐨勮韩浠借闂紝鑷韩鏄垚鍛�
- result = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, Encoding.UTF8.GetBytes(requestJson));
+ result = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, Encoding.UTF8.GetBytes(requestJson));
}
return result;
}
@@ -299,13 +285,13 @@
}
if (revertObj == null)
{
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//缃戠粶涓嶇ǔ瀹�,璇风◢鍚庡啀璇�
string msg = Language.StringByID(R.MyInternationalizationString.uNetIsUnStabilityAndDoAgain);
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
control.Show();
- });
+ }, ShowErrorMode.NO);
return false;
}
@@ -316,7 +302,7 @@
//涓嶆樉绀洪敊璇�,鐒跺悗杩斿洖true
return true;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (HdlCheckLogic.Current.IsAccountLoginOut() == true)
{
@@ -332,10 +318,10 @@
//鏃犳晥鐧诲綍Token
if (revertObj.StateCode == "NoLogin")
{
- UserCenterLogic.ReLoginAgain(Config.Instance.Account, false);
+ ReLoginAgain(Config.Instance.Account, false);
}
}
- });
+ }, ShowErrorMode.NO);
return false;
}
@@ -358,6 +344,25 @@
return HttpConnectMode.Admin;
}
return HttpConnectMode.Normal;
+ }
+
+ /// <summary>
+ /// 鏄剧ず娌℃湁缃戠粶鐨凪sg
+ /// </summary>
+ private static void ShowNotNetMsg(List<string> listNotShowError)
+ {
+ if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
+ {
+ //涓嶆娴�
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ // 褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
+ string msg = Language.StringByID(R.MyInternationalizationString.uNowIsDonotNetworkAndCheckNetwork);
+ var control = new ShowMsgControl(ShowMsgType.Tip, msg);
+ control.Show();
+ }, ShowErrorMode.NO);
}
#endregion
@@ -529,6 +534,12 @@
HdlGatewayLogic.Current.SynchronizeDbGateway();
//浠庢湰鍦伴噸鏂板姞杞藉叏閮ㄧ殑鎴块棿
HdlRoomLogic.Current.RefreshAllRoomByLocation();
+ //鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ HdlGatewayLogic.Current.ClearAllRealGateway();
+ await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+ }, ShowErrorMode.NO);
}
/// <summary>
@@ -551,62 +562,6 @@
Config.Instance.Home.Longitude = Longitude;
Config.Instance.Home.Latitude = Latitude;
Config.Instance.Home.Save(false);
- }
-
- #endregion
-
- #region 鈻� 鍒犻櫎鏈湴鏂囦欢_______________________
-
- /// <summary>
- /// 鍒犻櫎鏈湴鎵�鏈夋枃浠�
- /// </summary>
- /// <param name="all">true:鍏ㄩ儴鍒犻櫎(鐢ㄤ簬浣忓畢鍒犻櫎) false:閲嶈鐨勬枃浠朵笉鍒犻櫎</param>
- public static void DeleteAllLocationFile(bool all = true)
- {
- string dPath = Config.Instance.FullPath;
- if (System.IO.Directory.Exists(dPath) == false)
- {
- return;
- }
-
- //鐒跺悗鑾峰彇鍏ㄩ儴鐨勬枃浠�
- List<string> listFile = Global.FileListByHomeId();
- foreach (string file in listFile)
- {
- if (all == false && IsNotDeleteFile(file) == true)
- {
- //杩欐槸涓嶈兘鍒犻櫎鐨勬枃浠�
- continue;
- }
- //鍒犻櫎鏂囦欢
- Global.DeleteFilebyHomeId(file);
- }
- //濡傛灉鏄妸鏂囦欢鍏ㄩ儴鍒犻櫎鐨勮瘽锛岄偅涔堟枃浠跺す涔熶竴璧峰垹闄ゆ帀
- if (all == true)
- {
- //鍒犻櫎鏂囦欢澶�
- System.IO.Directory.Delete(dPath, true);
- }
- }
-
- /// <summary>
- /// 鍒ゆ柇鏄笉鏄笉搴旇鍒犻櫎鐨勬枃浠�
- /// </summary>
- /// <param name="fileName"></param>
- /// <returns></returns>
- public static bool IsNotDeleteFile(string fileName)
- {
- if (fileName == "Config.json")
- {
- //涓嶈兘鍒犻櫎Config鏂囦欢
- return true;
- }
- else if (fileName.StartsWith("House_") == true)
- {
- //涓嶈兘鍒犻櫎浣忓畢鏂囦欢
- return true;
- }
- return false;
}
#endregion
@@ -648,12 +603,12 @@
//娓呴櫎鍗囩骇鍒楄〃
FirmwareUpdateResourse.dicUpdateList.Clear();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//妫�娴婣PP鏄惁鑳藉閫�鍑�
while (UserCenterResourse.AccountOption.AppCanSignout == false)
{
- await Task.Delay(500);
+ System.Threading.Thread.Sleep(500);
}
//璁惧畾涓�涓椂闂�
Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
@@ -685,7 +640,7 @@
if (noticeDb == true)
{
//閫氱煡浜戠锛屽凡缁忛��鍑虹櫥闄�
- var result = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
+ var result = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/SignOut", null, "GET");
}
});
}
@@ -746,29 +701,6 @@
#endregion
#region 鈻� 鎷兼帴淇℃伅___________________________
-
- /// <summary>
- /// 鎷兼帴璺緞(鍏ㄨ矾寰�)锛屼互浣忓畢ID鐨勬枃浠跺す涓鸿捣鐐癸紝褰撴病鏈夋寚瀹氬弬鏁版椂锛屽垯杩斿洖銆愪綇瀹匢D鐨勬枃浠跺す銆戠殑鍏ㄨ矾寰�
- /// </summary>
- /// <param name="listNames">瑕佹嫾鎺ョ殑璺緞</param>
- /// <returns></returns>
- public static string CombinePath(params object[] listNames)
- {
- string rootPath = Config.Instance.FullPath;
- if (listNames == null || listNames.Length == 0)
- {
- return rootPath;
- }
- foreach (var file in listNames)
- {
- if (file == null)
- {
- continue;
- }
- rootPath = System.IO.Path.Combine(rootPath, file.ToString());
- }
- return rootPath;
- }
/// <summary>
/// 鎷兼帴缃戝叧鍥炲瓒呮椂鐨勪俊鎭�
@@ -835,10 +767,13 @@
/// </summary>
/// <param name="ShowPrompted">鏂拌拷鍔犲彉閲忥細鏄惁鏄剧ず鎻愮ず鑷姩澶囦唤鐨勭晫闈�</param>
/// <returns></returns>
- public async static Task<bool> InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
+ public static bool InitUserCenterMenmoryAndThread(bool ShowPrompted = true)
{
//璋冪敤杩欎釜鏂规硶,閮介渶瑕侀噸鏂板埛鏂颁富椤�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
+
+ //娣诲姞缃戠粶鐘舵�佺洃鍚�
+ HdlWifiLogic.Current.StartListenNetWork();
//濡傛灉鏄櫄鎷熶綇瀹�
if (Config.Instance.Home.IsVirtually == true)
@@ -857,12 +792,6 @@
if (Common.Config.Instance.HomeId != UserCenterResourse.AccountOption.OldHomeStringId
|| Common.Config.Instance.Account != UserCenterResourse.AccountOption.OldAccountId)
{
- //鏂紑杩滅▼Mqtt杩炴帴
- HdlThreadLogic.Current.RunThread(async () =>
- {
- await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
- }, ShowErrorMode.NO);
-
//娓呯┖鎵�鏈夋垚鍛樼紦瀛�
ClearAllMemberMemory();
@@ -870,27 +799,23 @@
var optionInfo = UserCenterResourse.AccountOption.Load();
UserCenterResourse.AccountOption = optionInfo;
//鍙樻洿鏍圭敤鎴峰浘鐗囩洰褰曡矾寰�
- UserCenterResourse.AccountOption.UserPictruePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, DirNameResourse.UserPictrueDirectory);
+ UserCenterResourse.AccountOption.UserPictruePath = DirNameResourse.UserPictrueDirectory;
//鍔犺浇浣忓畢閰嶇疆淇℃伅
UserCenterResourse.ResidenceOption = UserCenterResourse.ResidenceOption.Load();
//鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅
- var hadNet = await InitUserAccoutInfo(true);
+ var hadNet = InitUserAccoutInfo(true);
//濡傛灉鏈夌綉缁滅殑璇�
if (hadNet == 1)
{
//閲嶆柊鍙戦�佸懡浠ゅ幓缁戝畾鏂綉鎯呭喌涓嬪浠界殑缃戝叧
HdlGatewayLogic.Current.ResetComandToBindBackupGateway();
//璇诲彇闅愬尶閰嶇疆
- await HdlBackupLogic.Current.LoadHideOption();
+ HdlBackupLogic.Current.LoadHideOption();
}
-
- //鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅
- InitLocalMemberListInfo();
-
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- CreatAllUserCenterDirectory();
+ HdlFileLogic.Current.CreatAllUserCenterDirectory();
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
@@ -907,7 +832,7 @@
int result = -1;
if (hadNet == 1)
{
- result = await HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
+ result = HdlAutoBackupLogic.SynchronizeDbAutoBackupData();
}
//鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
@@ -923,6 +848,13 @@
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
HdlGatewayLogic.Current.SynchronizeDbGateway();
}
+
+ //鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ HdlGatewayLogic.Current.ClearAllRealGateway();
+ await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
+ }, ShowErrorMode.NO);
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
@@ -951,7 +883,7 @@
//娓呯┖鎵�鏈夋垚鍛樼紦瀛�
ClearAllMemberMemory();
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- CreatAllUserCenterDirectory();
+ HdlFileLogic.Current.CreatAllUserCenterDirectory();
//鍏抽棴鎵�鏈夋帴鏀�
HdlGatewayReceiveLogic.Current.RemoveAllEvent();
//鍒濆鍖栨湰鍦扮殑缃戝叧淇℃伅
@@ -996,7 +928,7 @@
/// </summary>
/// <param name="reLoad">鏄惁浠庢柊浠庢湰鍦板姞杞�(閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅,涓嶉渶瑕侀噸鏂板姞杞�)</param>
/// <returns></returns>
- private async static Task<int> InitUserAccoutInfo(bool reLoad)
+ private static int InitUserAccoutInfo(bool reLoad)
{
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = false;
@@ -1006,13 +938,18 @@
UserCenterResourse.UserInfo = GetUserInformationFromLocation();
UserCenterResourse.UserInfo.UserIconFile = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, "Admin.png");
}
+ if (HdlWifiLogic.Current.CanAccessHttp == false)
+ {
+ //鏃犳硶杩炴帴澶栫綉
+ return -1;
+ }
//鑾峰彇鐧诲綍璐﹀彿鐨勪俊鎭�
var pra = new AccountInfoPra();
//搴忓垪鍖栧璞�
var requestJson = JsonConvert.SerializeObject(pra);
//璁块棶鎺ュ彛
- byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson));
+ byte[] byteData = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("ZigbeeUsers/GetAccountInfo", Encoding.UTF8.GetBytes(requestJson), "POST", 4);
if (byteData == null)
{
return -1;
@@ -1051,29 +988,27 @@
userInfo.AuthorityText = Language.StringByID(R.MyInternationalizationString.uMember);
}
- if (UserCenterResourse.UserInfo.AuthorityNo != userInfo.AuthorityNo)
+ //UserInfo.AuthorityNo==0浠ｈ〃鏈湴杩樻病鏈夌敓鎴愭枃浠�,杩欎釜鏃跺�欎笉闇�瑕佸鐞�
+ if (UserCenterResourse.UserInfo.AuthorityNo != userInfo.AuthorityNo
+ && UserCenterResourse.UserInfo.AuthorityNo != 0)
{
//濡傛灉鐧婚檰鐨勮处鍙风殑鏉冮檺鍜屼笂涓�娆＄殑涓嶄竴鏍�,鍒欏垹闄ゆ湰鍦拌繖涓綇瀹呭叏閮ㄧ殑鏂囦欢,浠庡ご鍐嶆潵
- string dirPath = CombinePath();
+ string dirPath = Config.Instance.FullPath;
if (System.IO.Directory.Exists(dirPath) == true)
{
try
{
//鍚屾鏁版嵁鐨勫垽鏂枃浠�(浠ラ槻涓囦竴鍒犻櫎鏁翠釜鏂囦欢澶瑰け璐ョ殑鏃跺��,杩欎釜鏂囦欢琚垹鐨勮瘽,搴旇娌′粈涔堝ぇ闂)
- string SynchronizeFile = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoDownLoadBackupCheckFile);
+ string SynchronizeFile = DirNameResourse.AutoDownLoadBackupCheckFile;
//濡傛灉鏈湴宸茬粡鎷ユ湁浜嗚繖涓枃浠讹紝鍒欒鏄庝笉鏄柊鎵嬫満锛屼笉鍐嶈嚜鍔ㄨ繕鍘�
- if (System.IO.File.Exists(SynchronizeFile) == true)
- {
- System.IO.File.Delete(SynchronizeFile);
- }
- //鍒犻櫎鏁翠釜鏂囦欢澶�
- System.IO.Directory.Delete(dirPath, true);
+ HdlFileLogic.Current.DeleteFile(SynchronizeFile);
+ HdlFileLogic.Current.DeleteDirectory(dirPath);
}
catch { }
//鍒涘缓浣忓畢鏂囦欢澶�
Global.CreateHomeDirectory(Config.Instance.HomeId);
//棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- CreatAllUserCenterDirectory();
+ HdlFileLogic.Current.CreatAllUserCenterDirectory();
}
}
if (string.IsNullOrEmpty(userInfo.UserName) == true)
@@ -1096,9 +1031,11 @@
//瀵嗙爜楠岃瘉
UserCenterResourse.AccountOption.PswAuthentication = UserCenterResourse.UserInfo.StringPwd == null ? string.Empty : UserCenterResourse.UserInfo.StringPwd;
UserCenterResourse.UserInfo.StringPwd = null;
+ //淇濆瓨缂撳瓨
+ UserCenterResourse.AccountOption.Save();
//鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
- var flage = await InitAdminConnectMainInfo();
+ var flage = InitAdminConnectMainInfo();
//鍒濆鍖栦釜浜轰俊鎭殑鏍囪瘑
UserCenterResourse.UserInfo.InitUserInfoSuccess = flage == 1;
@@ -1111,8 +1048,7 @@
/// <returns></returns>
private static UserInformation GetUserInformationFromLocation()
{
- string fileName = CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.UserInfoFile);
- var value = LoadFileContent(fileName);
+ var value = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.UserInfoFile);
if (value == null)
{
return new UserInformation();
@@ -1125,26 +1061,10 @@
/// 閲嶆柊鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅(鏃ㄥ湪瀵瑰簲閭ｄ竴鐬棿,缃戠粶涓嶅ソ,瀵艰嚧璇垽鐨勬儏鍐�)
/// </summary>
/// <returns></returns>
- private async static Task<bool> ReInitUserAccoutInfo(List<string> listNotShowError)
+ public static bool ReInitUserAccoutInfo()
{
//閲嶆柊鍒濆鍖栬处鍙蜂俊鎭�
- var result = await InitUserAccoutInfo(false);
- //杩炴帴涓嶄簡澶栫綉鐨勬椂鍊�
- if (result == -1)
- {
- if (listNotShowError != null &&
- (listNotShowError.Contains("NotSetAgain") == true || listNotShowError.Contains("NotCheck") == true))
- {
- //鏈夎繖涓や釜鏍囪瘑鏃�,涓嶆彁绀洪敊璇�
- return false;
- }
- Application.RunOnMainThread(() =>
- {
- //褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
- var alert = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uNowIsDonotNetworkAndCheckNetwork));
- alert.Show();
- });
- }
+ var result = InitUserAccoutInfo(false);
if (result == 1)
{
//鍚屾浜戠鐨勭綉鍏砳d锛屽鏋滄湰鍦版嫢鏈変簯绔笉瀛樺湪鐨刬d锛屽垯琛ㄧず搴旇琚崲缁戜簡锛岀洿鎺ュ垹闄�
@@ -1162,9 +1082,8 @@
/// </summary>
private static void SaveUserInformationToLocation()
{
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.UserInfoFile);
//鍐欏叆鍐呭
- SaveFileContent(fullName, UserCenterResourse.UserInfo);
+ HdlFileLogic.Current.SaveFileContent(DirNameResourse.UserInfoFile, UserCenterResourse.UserInfo);
//鎼炰竴涓嬩富浜虹殑榛樿澶村儚
string defultFile = IO.FileUtils.GetImageFilePath("Center/Admin.png");
@@ -1188,7 +1107,7 @@
/// 鍒濆鍖栫鐞嗗憳鏉冮檺杩滅▼杩炴帴涓讳汉鐨勪俊鎭� -1:鏃犵綉 1:姝ｅ父 2:鍏朵粬閿欒
/// </summary>
/// <returns></returns>
- private static async Task<int> InitAdminConnectMainInfo()
+ private static int InitAdminConnectMainInfo()
{
if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)
{
@@ -1206,7 +1125,7 @@
//搴忓垪鍖栧璞�
var requestJson = JsonConvert.SerializeObject(pra);
//璁块棶鎺ュ彛
- byte[] byteData = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
+ byte[] byteData = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync("App/GetSharedHomeApiControl", Encoding.UTF8.GetBytes(requestJson));
if (byteData == null)
{
return -1;
@@ -1224,87 +1143,6 @@
Config.Instance.AdminRequestToken = info.RequestToken;
return 1;
- }
-
- #endregion
-
- #region 鈻� 鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅_______________
-
- /// <summary>
- /// 鍒濆鍖栫紦瀛樻垚鍛樼殑淇℃伅
- /// </summary>
- private static void InitLocalMemberListInfo()
- {
- //鍏堟竻绌�
- UserCenterResourse.ListMemberInfo.Clear();
- string fileName = CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.MemberListInfoFile);
- if (System.IO.File.Exists(fileName) == false)
- {
- return;
- }
- var varByte = Shared.IO.FileUtils.ReadFile(fileName);
- UserCenterResourse.ListMemberInfo = JsonConvert.DeserializeObject<List<MemberInfoRes>>(System.Text.Encoding.UTF8.GetString(varByte));
- }
-
- /// <summary>
- /// 淇濆瓨缂撳瓨鎴愬憳鐨勪俊鎭�
- /// </summary>
- public static void SaveLocalMemberListInfo()
- {
- var data = Newtonsoft.Json.JsonConvert.SerializeObject(UserCenterResourse.ListMemberInfo);
- var byteData = System.Text.Encoding.UTF8.GetBytes(data);
-
- string fullName = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, DirNameResourse.MemberListInfoFile);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, byteData);
- }
-
- #endregion
-
- #region 鈻� 棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶筥________
-
- /// <summary>
- /// 棰勫垱寤轰釜浜轰腑蹇冨叏閮ㄧ殑鏂囦欢澶�
- /// </summary>
- public static void CreatAllUserCenterDirectory()
- {
- //鏈湴缂撳瓨鐨勬牴鐩綍
- string LocalDirectory = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory);
- Global.CreateEmptyDirectory(LocalDirectory);
-
- //鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
- string directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.AutoBackupDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.AutoBackupdeleteDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //涓嬭浇澶囦唤鐨勬椂鍊欐墍浣跨敤鐨勪复鏃躲�愭枃浠跺す銆�
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.DownLoadBackupTempDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //淇濆瓨瀹夐槻璁板綍鐨勩�愭枃浠跺す銆�
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.SafeguardAlarmDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //涓婁紶缃戝叧澶囦唤鏂囦欢鍒颁簯绔殑涓存椂銆愭枃浠跺す銆�
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.GatewayBackupDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //涓嬭浇鍒嗕韩鏂囦欢鐨勪复鏃躲�愭枃浠跺す銆�
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.DownLoadShardDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //LOG鍑哄姏銆愭枃浠跺す銆�
- directory = System.IO.Path.Combine(LocalDirectory, DirNameResourse.LogDirectory);
- Global.CreateEmptyDirectory(directory);
-
- //鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
- if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty && !System.IO.Directory.Exists(UserCenterResourse.AccountOption.UserPictruePath))
- {
- System.IO.Directory.CreateDirectory(UserCenterResourse.AccountOption.UserPictruePath);
- }
}
#endregion
@@ -1335,7 +1173,7 @@
/// <param name="result">鍚屾缁撴灉 -1锛氬紓甯� 0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝� 1锛氭甯稿悓姝� 2:娌℃湁鑷姩澶囦唤鏁版嵁</param>
private static void ShowGuideForm(int result)
{
- var checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, DirNameResourse.GuideFile);
+ var checkFile = DirNameResourse.GuideFile;
if (System.IO.File.Exists(checkFile) == true)
{
//涓嶉渶瑕佹樉绀�
@@ -1478,89 +1316,6 @@
{
var utcTime = Convert.ToDateTime(timeText);
return TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
- }
-
- #endregion
-
- #region 鈻� 鏂囦欢淇濆瓨鍜岃鍙朹____________________
-
- /// <summary>
- /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
- /// </summary>
- /// <param name="fullName">鍏ㄨ矾寰�</param>
- /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
- public static void SaveFileContent(string fullName, object obj)
- {
- var data = JsonConvert.SerializeObject(obj);
- SaveTexToFile(fullName, data);
- }
-
- /// <summary>
- /// 鏂囦欢淇濆瓨(鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
- /// </summary>
- /// <param name="fullName">鍏ㄨ矾寰�</param>
- /// <param name="obj">闇�瑕佸簭鍒楀寲鐨勪笢瑗�</param>
- public static void SaveTexToFile(string fullName, string textValue)
- {
- var byteData = Encoding.UTF8.GetBytes(textValue);
- //鍐欏叆鍐呭
- System.IO.FileStream fileStream = null;
- try
- {
- fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Create, System.IO.FileAccess.Write);
- fileStream.Write(byteData, 0, byteData.Length);
- fileStream.Flush();
- }
- catch { }
- finally
- {
- fileStream?.Close();
- }
- }
-
- /// <summary>
- /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�(鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull,鏁村ぉ蹇樿,鎵�浠ュ缓涓�涓嚱鏁版潵鐜╃帺)
- /// </summary>
- /// <param name="fullName">鍏ㄨ矾寰�</param>
- /// <returns></returns>
- public static string LoadFileContent(string fullName)
- {
- //璇诲彇鏂囦欢
- var varByte = ReadFileContent(fullName);
- if (varByte == null)
- {
- return null;
- }
- return Encoding.UTF8.GetString(varByte);
- }
-
- /// <summary>
- /// 璇诲彇鏂囦欢,涓嶉檺鍒朵綇瀹�,鏂囦欢涓嶅瓨鍦ㄨ繑鍥瀗ull
- /// </summary>
- /// <param name="fullName">鍏ㄨ矾寰�</param>
- /// <returns></returns>
- public static byte[] ReadFileContent(string fullName)
- {
- if (System.IO.File.Exists(fullName) == false)
- {
- return null;
- }
- System.IO.FileStream fileStream = null;
- try
- {
- fileStream = new System.IO.FileStream(fullName, System.IO.FileMode.Open, System.IO.FileAccess.Read);
- byte[] array = new byte[fileStream.Length];
- fileStream.Read(array, 0, array.Length);
- return array;
- }
- catch
- {
- return null;
- }
- finally
- {
- fileStream?.Close();
- }
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index 876de3c..b1d5862 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -13,124 +13,177 @@
/// <summary>
/// 鏈湴缂撳瓨鐨勬牴鐩綍銆愭枃浠跺す銆戯紝涓嶉渶瑕佸浠斤紝涔熶笉闇�瑕佷笂浼狅紝鍙敤浜庡綋鍓嶆墜鏈虹殑缂撳瓨
/// </summary>
- public const string LocalMemoryDirectory = "43ae770b6035427b21bddd7e6a1eeb88";
+ public static string LocalMemoryDirectory
+ {
+ get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "43ae770b6035427b21bddd7e6a1eeb88"); }
+ }
/// <summary>
/// 鑷姩澶囦唤銆愭枃浠跺す銆�(缂栬緫,杩藉姞)
/// </summary>
- public const string AutoBackupDirectory = "d560f44a32930569c0328bfe0c7d3beaf6a58bcb2d5f1d3b";
+ public static string AutoBackupDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "d560f44a32930569c0328bfe0c7d3beaf6a58bcb2d5f1d3b"); }
+ }
/// <summary>
/// 鑷姩澶囦唤銆愭枃浠跺す銆�(鍒犻櫎)
/// </summary>
- public const string AutoBackupdeleteDirectory = "eced1a7b88bb9776ff31c79f6e7a48d69eac74ee0c447d6b";
- /// <summary>
- /// 鏄惁鑷姩涓嬭浇浜戠鐨勫浠芥暟鎹殑銆愬垽鏂枃浠躲��
- /// </summary>
- public const string AutoDownLoadBackupCheckFile = "93ee2d7241c3d19d7d94317f51a94d7fab1400f8f4f37a5a";
+ public static string AutoBackupdeleteDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "eced1a7b88bb9776ff31c79f6e7a48d69eac74ee0c447d6b"); }
+ }
/// <summary>
/// 涓嬭浇澶囦唤鐨勬椂鍊欐墍浣跨敤鐨勪复鏃躲�愭枃浠跺す銆�
/// </summary>
- public const string DownLoadBackupTempDirectory = "2492bc79ce8b87b49beaea261f87d52efc5dd3dfae2c6811be65781d5faccd40";
+ public static string DownLoadBackupTempDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "2492bc79ce8b87b49beaea261f87d52efc5dd3dfae2c6811be65781d5faccd40"); }
+ }
/// <summary>
/// 淇濆瓨APP鏈�鍚庨�夋嫨鐨勭綉鍏矷D鐨勩�愭枃浠跺悕瀛椼��(涓嶉渶瑕佸浠藉強涓婁紶)
/// </summary>
- public const string AppOldSelectGatewayFile = "1f2d13116b051b76b111b99246bb23f1";
+ public static string AppOldSelectGatewayFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "1f2d13116b051b76b111b99246bb23f1"); }
+ }
/// <summary>
/// 淇濆瓨瀹夐槻璁板綍鐨勩�愭枃浠跺す銆�
/// </summary>
- public const string SafeguardAlarmDirectory = "b101c307ddc2fae59a133a31604304560180c5748135de81";
+ public static string SafeguardAlarmDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "b101c307ddc2fae59a133a31604304560180c5748135de81"); }
+ }
/// <summary>
/// 淇濆瓨闂ㄩ攣璁板綍鐨勩�愭枃浠跺す銆�
/// </summary>
- public const string DoorLockAlarmDirectory = "4662b1f6eb97dbe44395a2546fd47c273a3def89f56951c6";
+ public static string DoorLockAlarmDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "4662b1f6eb97dbe44395a2546fd47c273a3def89f56951c6"); }
+ }
/// <summary>
/// 瀹夐槻鐢ㄦ埛瀵嗙爜鐨勭紦瀛樺瘑鐮併�愭枃浠躲��
/// </summary>
- public const string SafeguardUserPassword = "b101c307ddc2fae587d864275bb8a23478b37ce3bd5c5db1";
- /// <summary>
- /// 涓婁紶缃戝叧澶囦唤鏂囦欢鍒颁簯绔殑涓存椂銆愭枃浠跺す銆�
- /// </summary>
- public const string GatewayBackupDirectory = "99a6644e29e7bdcd65d85219312eb4f4cf013d26f4e12925";
+ public static string SafeguardUserPassword
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "b101c307ddc2fae587d864275bb8a23478b37ce3bd5c5db1"); }
+ }
/// <summary>
/// 涓嬭浇鍒嗕韩鏂囦欢鐨勪复鏃躲�愭枃浠跺す銆�
/// </summary>
- public const string DownLoadShardDirectory = "98f878a57c59bb6538677bc55187ffab6e8def815981fdbe";
+ public static string DownLoadShardDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "98f878a57c59bb6538677bc55187ffab6e8def815981fdbe"); }
+ }
/// <summary>
/// 璁板綍鍒嗕韩鏂囦欢鏇存柊鏃堕棿鐨勩�愭枃浠躲��
/// </summary>
- public const string ShardFileUpdateTimeFile = "b4137733cb527d033a3f63d2b32cd6e0f886eef3cee19601";
- /// <summary>
- /// 璁板綍鑷姩澶囦唤鏂囦欢鏇存柊鏃堕棿鐨勩�愭枃浠躲��
- /// </summary>
- public const string AutoBackFileUpdateTimeFile = "9479e724666d970f1a2df4fa67cc456b74b31c4d3fce3b4f8c8eef2f2c0559ec";
+ public static string ShardFileUpdateTimeFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "b4137733cb527d033a3f63d2b32cd6e0f886eef3cee19601"); }
+ }
/// <summary>
/// 淇濆瓨鐢ㄦ埛涓汉淇℃伅鐨勩�愭枃浠躲��
/// </summary>
- public const string UserInfoFile = "c24d43aab01bbe521535c9fae517ffab";
+ public static string UserInfoFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "c24d43aab01bbe521535c9fae517ffab"); }
+ }
/// <summary>
/// 淇濆瓨鏂綉鏃跺�欙紝澶囦唤缃戝叧id鐢ㄧ殑銆愭枃浠躲��
/// </summary>
- public const string BackupGatewayIdFile = "5f7fdfe4258d4cd19a433412468a586834643bed528cdba1";
+ public static string BackupGatewayIdFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "5f7fdfe4258d4cd19a433412468a586834643bed528cdba1"); }
+ }
/// <summary>
/// 鑷姩澶囦唤涓嶉渶瑕佸啀娆℃彁閱掔殑銆愭枃浠跺悕銆�(涓嶉渶瑕佸浠藉強涓婁紶)
/// </summary>
- public const string AutoBackupNotPromptedFile = "9479e724666d970fb9ae5dff2b739cf1bc8c1a95d63bf182dc8f290cac98592f";
+ public static string AutoBackupNotPromptedFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "9479e724666d970fb9ae5dff2b739cf1bc8c1a95d63bf182dc8f290cac98592f"); }
+ }
/// <summary>
/// 骞叉帴鐐圭鏈夊睘鎬х殑淇濆瓨鏂囦欢
/// </summary>
- public const string DryContactFunctionFile = "10afbada0199511de13edc60259ed03e6ebc817d8a53adce";
- /// <summary>
- /// 淇濆瓨鎴愬憳鍒楄〃淇℃伅鐨勩�愭枃浠躲��
- /// </summary>
- public const string MemberListInfoFile = "84cee4c17e97d9af86e4778aeecae01cc0ab6d9f3409478c";
+ public static string DryContactFunctionFile
+ {
+ get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "10afbada0199511de13edc60259ed03e6ebc817d8a53adce"); }
+ }
/// <summary>
/// 瀛樻斁鐢ㄦ埛鍥剧墖鐨勩�愭枃浠跺す銆�
/// </summary>
- public const string UserPictrueDirectory = "e3263f227598072fef2a204fb1656cd2";
+ public static string UserPictrueDirectory
+ {
+ get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, "e3263f227598072fef2a204fb1656cd2"); }
+ }
/// <summary>
/// 淇濆瓨璐﹀彿閰嶇疆鐨勩�愭枃浠躲��
/// </summary>
- public const string AccountOptionFile = "d33690329dfdf2e5dcce0280893b95a0db47b5be13b46aa0";
+ public static string AccountOptionFile
+ {
+ get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, "d33690329dfdf2e5dcce0280893b95a0db47b5be13b46aa0"); }
+ }
/// <summary>
/// 淇濆瓨浣忓畢閰嶇疆鐨勩�愭枃浠躲��
/// </summary>
- public const string ResidenceOptionFile = "b79583bed6909a52849eaea268449aee15f29d3bdf8b5ca3";
- /// <summary>
- /// 淇濆瓨妤煎眰椤哄簭鐨勩�愭枃浠躲��
- /// </summary>
- public const string FloorSortFile = "2b156ce95c29de53578282f4d7228f60";
- /// <summary>
- /// 淇濆瓨鎴块棿椤哄簭鐨勩�愭枃浠躲��
- /// </summary>
- public const string RoomSortFile = "b1b9f1a50064016f62dea3f160703de2";
+ public static string ResidenceOptionFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "b79583bed6909a52849eaea268449aee15f29d3bdf8b5ca3"); }
+ }
/// <summary>
/// 淇濆瓨Log鐨勩�愭枃浠跺す銆�
/// </summary>
- public const string LogDirectory = "820c65b54b6f3f2a";
+ public static string LogDirectory
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "820c65b54b6f3f2a"); }
+ }
/// <summary>
- /// 鍒嗕韩妤煎眰鐨勩�愭枃浠躲��
+ /// 鏄惁鑷姩涓嬭浇浜戠鐨勫浠芥暟鎹殑銆愬垽鏂枃浠躲��
/// </summary>
- public const string ShardFloorFile = "5f05f7a6f26c51d1b096dc777f6c02f2";
+ public static string AutoDownLoadBackupCheckFile
+ {
+ get { return System.IO.Path.Combine(LocalMemoryDirectory, "93ee2d7241c3d19d7d94317f51a94d7fab1400f8f4f37a5a"); }
+ }
/// <summary>
/// 鐗╃悊璁惧灞炰簬鍝釜鎴块棿鐨勩�愭枃浠躲��
/// </summary>
- public const string DeviceRoomIdFile = "020945dd7966a7550090d3c04a04d93cd2278eb4e6aebcf6";
+ public static string DeviceRoomIdFile
+ {
+ get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "020945dd7966a7550090d3c04a04d93cd2278eb4e6aebcf6"); }
+ }
/// <summary>
/// 淇濆瓨鎰忚鍙嶉娆℃暟鐨勩�愭枃浠躲��
/// </summary>
- public const string SuggestionFile = "f782709778b751ef2b3840f17e407ead";
+ public static string SuggestionFile
+ {
+ get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, "f782709778b751ef2b3840f17e407ead"); }
+ }
/// <summary>
/// 妫�娴嬪紩瀵肩殑銆愭枃浠躲��
/// </summary>
- public const string GuideFile = "cad1afb384fb482de753fc37ebe84f9e";
+ public static string GuideFile
+ {
+ get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, "cad1afb384fb482de753fc37ebe84f9e"); }
+ }
/// <summary>
- /// 鎵撳紑Gbs鐨勫垽鏂�愭枃浠躲��(涓存椂)
+ /// 璁板綍鍙戦�佸拰鎺ユ敹鐨勬暟鎹甃og
/// </summary>
- public const string OpenGbsFile = "cd8f75492cb65ef0951442460336db62";
+ public static string SendAndReceveDataLog
+ {
+ get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, LocalMemoryDirectory, "SendAndReceveLog.log"); }
+ }
+ /// <summary>
+ /// 璁板綍SocketReceive鏁版嵁Log
+ /// </summary>
+ public static string SocketReceiveDataLog
+ {
+ get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, LocalMemoryDirectory, "SocketReceiveDataLog.log"); }
+ }
+ /// <summary>
+ /// 鍒嗕韩妤煎眰鐨勩�愭枃浠跺悕銆�
+ /// </summary>
+ public const string ShardFloorFile = "5f05f7a6f26c51d1b096dc777f6c02f2";
- /// <summary>
- /// 璁板綍鑷姩澶囦唤涓婁紶鏃ユ湡鐨勩�愭枃浠躲��,涓嶅姞瀵�
- /// </summary>
- public const string UpLoadAutoBackDayFile = "UpLoadAutoBackDayFile";
+ //------------------------浠ヤ笅涓鸿緟鍔╂枃浠�------------------------
/// <summary>
/// 鏄剧ず鍔熻兘鑿滃崟鐨勩�愭爣璇嗘枃浠躲��,涓嶅姞瀵�
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 5ee5159..38bb2ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -14,11 +14,7 @@
/// 鐢婚潰鎵撳紑鏃讹紝浼氳嚜鍔ㄨ拷鍑伙紝鐢婚潰鍏抽棴鏃讹紝鑷姩绉婚櫎銆�
/// Key:鐢婚潰鐨処D锛屽垪濡傦細UserMainForm
/// </summary>
- public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
- /// <summary>
- /// 鎴愬憳鍒楄〃鐨勪俊鎭�
- /// </summary>
- public static List<MemberInfoRes> ListMemberInfo = new List<MemberInfoRes>();
+ public static Dictionary<string, CommonFormBase> DicActionForm = new Dictionary<string, CommonFormBase>();
/// <summary>
/// 褰撳墠姝ｅ湪鎿嶄綔鐨勭敾闈D(姝ゅ彉閲忓涓存椂鏂綉鏃�,闈炲父閲嶈,娌′汉浼氭噦瀹冧负浣曡瀛樺湪)
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index 3463398..e96f1f3 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -148,7 +148,7 @@
/// <summary>
/// 娣诲姞妤煎眰UI
- /// </summary>
+ /// </summary>
public void BindDownFrameLayout(FrameLayout frameLayout, Panel curControlDev, Dictionary<string, string> dicFloorList, ref Button btnFloorText)
{
var btnAddFrameLayout = new FrameLayout
@@ -300,7 +300,7 @@
return;
}
curControlDev.currentSelectFloorId = floorId;
- curControlDev.ReSave();
+
if (!btnMethodText.IsSelected)
{
if (oldbutton != null)
@@ -342,4 +342,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index a99acac..5b945de 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -529,6 +529,10 @@
{
btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
}
+ else
+ {
+ btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+ }
devicePic.UnSelectedImagePath = tempDev.IconPath;
devicePic.Text = "";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
index 1412e6a..c654ee7 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -15,7 +15,7 @@
/// </summary>
public class MutilfunctionPanelMethod
{
- #region 鍙橀噺鐢虫槑
+ #region 鍙橀噺鐢虫槑
/// <summary>
/// 寮�鍏崇殑涓暟聽[姣忔杩涘叆鍒板鍔熻兘缁戝畾鐣岄潰锛岄兘瑕佽閲嶆柊鍙栧�糫
/// </summary>
@@ -540,7 +540,7 @@
/// <param name="currentPanelSupportBindDeviceList"></param>
/// <param name="supportRoomList"></param>
/// <param name="curDeviceBindType">褰撳墠璁惧缁戝畾绫诲瀷 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
- /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param>
+ /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param>
/// <returns></returns>
public static List<CommonDevice> GetAllRoomSupportDeviceList(List<CommonDevice> currentPanelSupportBindDeviceList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
{
@@ -636,7 +636,7 @@
/// </summary>
/// <param name="currentPanelSupportBindSceneList"></param>
/// <param name="supportRoomList"></param>
- /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param>
+ /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param>
/// <param name="curDeviceBindType">褰撳墠璁惧缁戝畾绫诲瀷 0:鍦烘櫙</param>
/// <returns></returns>
public static List<SceneUI> GetAllRoomSupportSceneList(List<SceneUI> currentPanelSupportBindSceneList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType = 0)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
index 2bc736f..159013b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/AutoOpenDirectionAndLimitSettionForm.cs
@@ -176,7 +176,7 @@
listText.Add(Language.StringByID(R.MyInternationalizationString.uReverseDirection));//鍙嶅悜
var form = new BottomItemSelectForm();
- form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, null, nowSelectNo);
form.FinishSelectEvent += (index) =>
{
//鍙樻洿鏂瑰悜
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
index 2c022f5..e78ed9b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
@@ -120,7 +120,7 @@
listText.Add(Language.StringByID(R.MyInternationalizationString.uReverseDirection));//鍙嶅悜
var form = new BottomItemSelectForm();
- form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, null, nowSelectNo);
form.FinishSelectEvent += (index) =>
{
//鍙樻洿鏂瑰悜
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
index 5080f98..9c7b1f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceAddSuccessForm.cs
@@ -46,7 +46,7 @@
}
//娣诲姞鏂拌澶囩殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
//璁剧疆鏍囬淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
@@ -60,6 +60,8 @@
this.SetDoorTime();
//鏂板叆缃戠殑璁惧,娓呯┖鎺夊畠鐨勬埧闂�
this.ClearDeviceFromRoom();
+ //娣诲姞璁惧鐨勬椂鍊�,鍏抽棴宸﹀垝鑿滃崟鐨勬湭鍒嗛厤鐣岄潰
+ MainPage.LeftListRoomViewFrom.Instance?.CloseUnallocatedRoomForm();
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
index 3f9f949..2a11755 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceDryContactSettionForm.cs
@@ -196,7 +196,7 @@
//杩欓噷鍏堝幓鑾峰彇瀹冪殑骞叉帴鐐圭被鍨�
this.ShowProgressBar();
//鑾峰彇绗竷鍥炶矾鐨勯厤缃俊鎭�
- listRelayInfo7 = await HdlDevicePanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);
+ listRelayInfo7 = HdlDevicePanelLogic.Current.GetDryContactConfigureInfo(nowSelectDevice);
if (listRelayInfo7 == null)
{
//鍏抽棴杩涘害鏉�
@@ -324,7 +324,7 @@
var title = Language.StringByID(R.MyInternationalizationString.uSelectDryContactFunction);
var form = new BottomItemSelectForm();
- form.AddForm(title, listText, nowSelectNo);
+ form.AddForm(title, listText, null, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
index 2575716..86eabac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
@@ -129,11 +129,15 @@
rowMac.AddBottomLine();
//鍒堕�犲晢
- string strProtuct = listDevice[0].DriveCode > 0 ? "HDL" : listDevice[0].ManufacturerName;
+ string strProtuct = listDevice[0].ManufacturerName;
+ if (listDevice[0].DriveCode > 0 || Common.LocalDevice.Current.IsHdlDevice(listDevice[0]) == true)
+ {
+ strProtuct = "骞垮窞娌充笢绉戞妧鏈夐檺鍏徃";
+ }
var rowProtuct = new FrameRowControl(listView.rowSpace / 2);
rowProtuct.UseClickStatu = false;
listView.AddChidren(rowProtuct);
- rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 400);
+ rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 600);
rowProtuct.AddMostRightView(strProtuct, 600);
listView.AdjustRealHeight(Application.GetRealHeight(23));
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 3683150..1c30f0e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -151,7 +151,7 @@
listView.BeginHeaderRefreshingAction += () =>
{
//鍒锋柊璁惧鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
HdlThreadLogic.Current.RunThread(() =>
{
@@ -826,18 +826,31 @@
string gwId = GatewayResourse.NowSelectGatewayId;
HdlThreadLogic.Current.RunThread(() =>
{
- System.Threading.Thread.Sleep(2000);
- //杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵��
- var list = LocalDevice.Current.GetDeviceOnlineList(gwId);
- HdlThreadLogic.Current.RunMain(() =>
+ if (this.Parent == null) { return; }
+ //鑾峰彇璁惧鍒楄〃
+ var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(gwId);
+ var listCheck = new List<string>();
+ foreach (var device in listDevice)
{
- for (int i = 0; i < list.Count; i++)
+ if (this.Parent == null) { return; }
+ if (listCheck.Contains(device.DeviceAddr) == false)
{
- //璁剧疆璁惧鍦ㄧ嚎鐘舵��
- this.ReceiveDeviceStatu(list[i]);
+ //鍙涓�涓洖璺嵆鍙�
+ listCheck.Add(device.DeviceAddr);
+ var deviceInfo = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ if (deviceInfo != null)
+ {
+ //鍙樻洿鍦ㄧ嚎鐘舵��
+ device.IsOnline = deviceInfo.IsOnline;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆璁惧鍦ㄧ嚎鐘舵��
+ this.ReceiveDeviceStatu(device);
+ }, ShowErrorMode.NO);
+ }
+ System.Threading.Thread.Sleep(30);
}
-
- }, ShowErrorMode.NO);
+ }
});
}
@@ -861,13 +874,8 @@
var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
if (localDevice != null)
{
- //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- if (localDevice.IsOnline != device.IsOnline)
- {
- //淇濆瓨鐘舵��
- localDevice.IsOnline = device.IsOnline;
- localDevice.ReSave();
- }
+ //淇濆瓨鐘舵��
+ localDevice.IsOnline = device.IsOnline;
}
rowInfo.MenuRow.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
@@ -936,9 +944,9 @@
/// <param name="list">ota璁惧</param>
private void CheckDeviceNewVersion(List<OTADevice> list)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await System.Threading.Tasks.Task.Delay(2000);
+ System.Threading.Thread.Sleep(2000);
foreach (var ota in list)
{
if (this.Parent == null)
@@ -946,7 +954,7 @@
return;
}
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, ota.HwVersion.ToString(), ota.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
@@ -960,7 +968,7 @@
}
//鎷ユ湁鏂扮増鏈�
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.dicRowInfo.ContainsKey(ota.DeviceAddr) == true)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 9e51971..87fda05 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -13,7 +13,7 @@
/// </summary>
public class DeviceMacInfoEditorForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 璁惧瀵硅薄
/// </summary>
@@ -296,7 +296,7 @@
}
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
{
- //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
+ //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
this.AddSimplePanelSettionRow();
}
else
@@ -712,7 +712,8 @@
private void AddPirSensorWorkModeRow()
{
if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
- || deviceEnumInfo.IsHdlDevice == false)
+ || deviceEnumInfo.IsHdlDevice == false
+ || this.listNewDevice.Count != 2)
{
return;
}
@@ -741,7 +742,8 @@
/// </summary>
private void AddPirSensorBindRow()
{
- if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)
+ if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
+ || this.listNewDevice.Count != 2)
{
return;
}
@@ -1406,7 +1408,7 @@
/// <param name="oTADevice">ota璁惧</param>
private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
bool receiveImageInfo = false;
//璁剧疆璁惧鍏ㄩ儴鐨勯暅鍍忎俊鎭�
@@ -1418,7 +1420,7 @@
while (receiveImageInfo == false && count > 0)
{
//绛夊緟璁惧闀滃儚鐨勫弽棣�
- await Task.Delay(300);
+ System.Threading.Thread.Sleep(300);
count--;
}
//绉婚櫎浜嬩欢
@@ -1426,7 +1428,7 @@
oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
//娣诲姞鍗囩骇鍥轰欢淇℃伅(鎴愪笉鎴愬姛閮芥棤鎵�璋�)
- var result = await HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
+ var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
//鑾峰彇璁惧鏈�鏂扮増鏈�
var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
@@ -1505,16 +1507,16 @@
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘(鎷跨鐐规渶灏忕殑閭ｄ釜鍥炶矾鍘诲畾浣�)
bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
- TopRightMenuControl frame = null;
-
- if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
- {
- frame = new TopRightMenuControl(3, 1);
- }
- else
- {
- frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
- }
+ TopRightMenuControl frame = null;
+
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ frame = new TopRightMenuControl(3, 1);
+ }
+ else
+ {
+ frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
+ }
string deviceMenu = string.Empty;
if (canTest == true)
@@ -1561,6 +1563,23 @@
//鍚屾鎸囧畾璁惧
this.SynchronizationDevice();
});
+ }
+
+ //鍚屾
+ deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
+ {
+ frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
+ {
+ //濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ return;
+ }
+
+ //鍚屾鎸囧畾璁惧
+ this.SynchronizationDevice();
+ });
}
}
@@ -1616,6 +1635,27 @@
});
});
}
+
+ /// <summary>
+ /// 鍚屾鎸囧畾璁惧
+ /// </summary>
+ private void SynchronizationDevice()
+ {
+ HdlThreadLogic.Current.RunThread(async () =>
+ {
+ //鎵撳紑杩涘害鏉�
+ this.ShowProgressBar();
+
+ //鍚屾璁惧
+ bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
+ if (result == false)
+ {
+ return;
+ }
+ });
+ }
#endregion
#region 鈻� 鍏抽棴鐣岄潰___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
index c096739..85edc36 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -183,6 +183,11 @@
objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName23);
unSelectPic = "Device/SensorTemperatureHumidity.png";
this.AddMenuRow(objectText, unSelectPic, "SensorTemperatureHumidityForm");
+
+ //鐞冨瀷绉诲姩浼犳劅鍣�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName30);
+ unSelectPic = "Device/SensorSphericalMotion.png";
+ this.AddMenuRow(objectText, unSelectPic, "SensorSphericalMotionDirectionForm");
//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName27);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorSphericalMotionDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorSphericalMotionDirectionForm.cs
new file mode 100755
index 0000000..fc75ee2
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorSphericalMotionDirectionForm.cs
@@ -0,0 +1,87 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.DeviceDirection
+{
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
+ /// </summary>
+ public class SensorSphericalMotionDirectionForm: DirectionCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = this.GetPictrueRealSize(879);
+ framePic.Height = this.GetPictrueRealSize(753);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(153);
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+ btnPic.UnSelectedImagePath = "Instruct/SensorSphericalMotion.png";
+ framePic.AddChidren(btnPic);
+
+ //鎸囩ず鐏彉缁裤�侀棯鐑�
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(506), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.Y = this.GetPictrueRealSize(370);
+ btnGreanLinght.TextAlignment = TextAlignment.Center;
+ btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnGreanLinght.TextSize = 10;
+ btnGreanLinght.TextID = R.MyInternationalizationString.uPilotLinghtInCreanAndLinght;
+ framePic.AddChidren(btnGreanLinght);
+
+ //闀挎寜{0}绉�(鎸夐敭)
+ var btnButton = new NormalViewControl(this.GetPictrueRealSize(250), this.GetPictrueRealSize(90), false);
+ btnButton.X = this.GetPictrueRealSize(757);
+ btnButton.Y = this.GetPictrueRealSize(148);
+ btnButton.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnButton.TextSize = 10;
+ btnButton.Text = Language.StringByID(R.MyInternationalizationString.uLongClickSomeSecond).Replace("{0}", "5");
+ btnButton.Width = btnButton.GetRealWidthByText();
+ btnButton.IsMoreLines = true;
+ btnButton.TextAlignment = TextAlignment.Center;
+ framePic.AddChidren(btnButton);
+ btnButton.Text += "\r\n(" + Language.StringByID(R.MyInternationalizationString.uPanelButton) + ")";
+
+ //闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑�
+ //杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddSensorSphericalMotionMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+
+ var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg1.Y = Application.GetRealHeight(1037);
+ msg1.Text = msgArry[0];
+ msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg1.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg1);
+ var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg2.Y = msg1.Bottom;
+ if (msgArry.Length > 1)
+ {
+ msg2.Text = msgArry[1];
+ }
+ msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg2.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg2);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index dc06e7d..6fff409 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
-using System.Threading.Tasks;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DeviceDoorLock
@@ -223,12 +222,12 @@
this.listHistoryInfo = null;
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鎴愬憳鍒楄〃
- var result = await this.GetMemberListInfo();
+ var result = this.GetMemberListInfo();
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -242,7 +241,7 @@
dicMemberName.Add(listMenberInfo[i].SubAccountDistributedMark, string.IsNullOrEmpty(listMenberInfo[i].UserName) == false ? listMenberInfo[i].UserName : listMenberInfo[i].Account);
}
//鍘嗗彶璁板綍
- var historyLog = await this.GetHistoryLogInfo(dicMemberName);
+ var historyLog = this.GetHistoryLogInfo(dicMemberName);
if (historyLog == null)
{
//鍏抽棴杩涘害鏉�
@@ -276,7 +275,7 @@
/// 鑾峰彇鎴愬憳鍒楄〃淇℃伅
/// </summary>
/// <returns></returns>
- private async Task<bool> GetMemberListInfo()
+ private bool GetMemberListInfo()
{
if (listMenberInfo != null)
{
@@ -299,8 +298,8 @@
}
var pra = new MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- if (result == null)
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+ if (string.IsNullOrEmpty(result) == true)
{
return false;
}
@@ -585,7 +584,7 @@
/// 鑾峰彇鍘嗗彶璁板綍
/// </summary>
/// <returns></returns>
- private async Task<List<HistoryInfo>> GetHistoryLogInfo(Dictionary<string, string> dicMemberName)
+ private List<HistoryInfo> GetHistoryLogInfo(Dictionary<string, string> dicMemberName)
{
if (this.listHistoryInfo != null)
{
@@ -596,9 +595,9 @@
var pra = this.GetReadHistoryPra();
//鑾峰彇闂ㄩ攣鐨勬墦寮�鍜屽叧闂褰�
- var listAllLog = await this.GetDoorOpenHistoryLog(pra);
+ var listAllLog = this.GetDoorOpenHistoryLog(pra);
//鑾峰彇闂ㄩ攣鐨勫叾浠栬褰�
- var listOtherLog = await this.GetDoorOtherHistoryLog(pra.UnlockTimeBegin, pra.UnlockTimeEnd);
+ var listOtherLog = this.GetDoorOtherHistoryLog(pra.UnlockTimeBegin, pra.UnlockTimeEnd);
listAllLog.AddRange(listOtherLog);
//鎺掑簭涓�涓�
@@ -632,7 +631,7 @@
/// </summary>
/// <param name="i_pra"></param>
/// <returns></returns>
- private async Task<List<HistoryInfo>> GetDoorOpenHistoryLog(GetHistoryDataPra i_pra)
+ private List<HistoryInfo> GetDoorOpenHistoryLog(GetHistoryDataPra i_pra)
{
var listLog = new List<HistoryInfo>();
@@ -640,8 +639,8 @@
while (true)
{
//璁块棶浜戠
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockHistoryPager", true, i_pra);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/GetDoorLockHistoryPager", true, i_pra);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -680,7 +679,7 @@
/// 鑾峰彇闂ㄩ攣鐨勫叾浠栬褰�
/// </summary>
/// <returns></returns>
- private async Task<List<HistoryInfo>> GetDoorOtherHistoryLog(string beginTime, string endTime)
+ private List<HistoryInfo> GetDoorOtherHistoryLog(string beginTime, string endTime)
{
var listLog = new List<HistoryInfo>();
@@ -690,8 +689,8 @@
pra2.EndTime = endTime;
pra2.Topic = "/Alarms/SendAlarmInform";
pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -699,8 +698,8 @@
//浠庤嚜鍔ㄥ寲涓�,鑾峰彇甯稿紑妯″紡璁板綍
pra2.Topic = "/Logic/Execute_Respon";
- result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
+ result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -708,8 +707,8 @@
//鑾峰彇闂ㄩ攣涓存椂瀵嗙爜寮�閿佽褰�
pra2.Topic = "/DoorLock/DoorLockOperatingEventNotificationCommand";
- result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
- if (result == null)
+ result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra2);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
@@ -868,14 +867,14 @@
/// <summary>
/// 娓呯┖鎵�鏈夎褰�
/// </summary>
- private async void ClearAllHistoryLog()
+ private void ClearAllHistoryLog()
{
//鑾峰彇璁块棶浜戠鎺ュ彛鐨勫惎鍔ㄥ弬鏁�(2020.05.08:鍏ㄩ儴娓呯┖)
var pra = this.GetDeleteDataPra();
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/ClearDoorLockHistory", true, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("DoorLock/ClearDoorLockHistory", true, pra);
if (result == false)
{
return;
@@ -889,7 +888,7 @@
for (int i = 0; i < listOtherMsgId.Count; i++)
{
pra2.Id = listOtherMsgId[i];
- result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra2);
+ result = 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 37db0f1..0b347a9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -7,7 +7,7 @@
{
public class PanelBackLighWithSensorForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
@@ -51,7 +51,7 @@
set { btnSleepTime.Text = value; }
}
/// <summary>
- ///鐫＄湢鏃堕棿
+ ///鐫＄湢鏃堕棿
/// </summary>
public NormalViewControl btnSleepTime = null;
@@ -123,7 +123,7 @@
#endregion
- #region 鈻� 鑺傝兘妯″紡琛宊________________________
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
/// </summary>
@@ -219,7 +219,7 @@
//娣诲姞鎺ヨ繎鎰熷簲
this.AddProximitySensorsRow(frameBack);
- //搴曠嚎
+ //搴曠嚎
var btnLine = new NormalViewControl(965, 5, true);
btnLine.Height = 1;
btnLine.X = Application.GetRealWidth(52);
@@ -326,7 +326,7 @@
}
#endregion
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
+ #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
/// <summary>
/// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
/// </summary>
@@ -342,7 +342,7 @@
var form = new BottomItemSelectForm();
form.CancelCallEvent = false;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
+ form.AddForm(title, listText, null, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo)
@@ -448,7 +448,7 @@
int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
+ //棰滆壊澶栨
var btnColorLine = new FrameLayoutStatuControl();
btnColorLine.Width = Application.GetRealHeight(79);
btnColorLine.Height = this.GetPictrueRealSize(79);
@@ -775,7 +775,7 @@
#endregion
- #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+ #region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
@@ -814,6 +814,6 @@
return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
}
- #endregion
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
index ce40ff6..052c20c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
@@ -54,7 +54,7 @@
set { btnSleepTime.Text = value; }
}
/// <summary>
- ///鐫＄湢鏃堕棿
+ ///鐫＄湢鏃堕棿
/// </summary>
public NormalViewControl btnSleepTime = null;
#endregion
@@ -133,7 +133,7 @@
#endregion
- #region 鈻� 灞忓箷浜害绾у埆_______________________
+ #region 鈻� 灞忓箷浜害绾у埆_______________________
/// <summary>
/// 娣诲姞灞忓箷浜害绾у埆鎺т欢
/// </summary>
@@ -346,7 +346,7 @@
int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
+ //棰滆壊澶栨
var btnColorLine = new FrameLayoutStatuControl();
btnColorLine.Width = Application.GetRealHeight(79);
btnColorLine.Height = this.GetPictrueRealSize(79);
@@ -414,7 +414,7 @@
#endregion
- #region 鈻� 鑺傝兘妯″紡琛宊________________________
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
/// </summary>
@@ -513,7 +513,7 @@
}
//娣诲姞鎺ヨ繎鎰熷簲
this.AddProximitySensorsRow(frameBack);
- //搴曠嚎
+ //搴曠嚎
var btnLine = new NormalViewControl(965, 5, true);
btnLine.Height = 1;
btnLine.X = Application.GetRealWidth(52);
@@ -619,7 +619,7 @@
};
}
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
+ #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
/// <summary>
/// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
/// </summary>
@@ -635,7 +635,7 @@
var form = new BottomItemSelectForm();
form.CancelCallEvent = false;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
+ form.AddForm(title, listText, null, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo)
@@ -747,7 +747,7 @@
}
#endregion
- #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+ #region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
index 9ac4066..d62b4ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -50,7 +50,7 @@
set { btnSleepTime.Text = value; }
}
/// <summary>
- ///鐫＄湢鏃堕棿
+ ///鐫＄湢鏃堕棿
/// </summary>
public NormalViewControl btnSleepTime = null;
#endregion
@@ -125,7 +125,7 @@
#endregion
- #region 鈻� 灞忓箷浜害绾у埆_______________________
+ #region 鈻� 灞忓箷浜害绾у埆_______________________
/// <summary>
/// 娣诲姞灞忓箷浜害绾у埆鎺т欢
/// </summary>
@@ -338,7 +338,7 @@
int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
- //棰滆壊澶栨
+ //棰滆壊澶栨
var btnColorLine = new FrameLayoutStatuControl();
btnColorLine.Width = Application.GetRealHeight(79);
btnColorLine.Height = this.GetPictrueRealSize(79);
@@ -406,7 +406,7 @@
#endregion
- #region 鈻� 鑺傝兘妯″紡琛宊________________________
+ #region 鈻� 鑺傝兘妯″紡琛宊________________________
/// <summary>
/// 娣诲姞鑺傝兘妯″紡琛�
/// </summary>
@@ -505,7 +505,7 @@
}
//娣诲姞鎺ヨ繎鎰熷簲
this.AddProximitySensorsRow(frameBack);
- //搴曠嚎
+ //搴曠嚎
var btnLine = new NormalViewControl(965, 5, true);
btnLine.Height = 1;
btnLine.X = Application.GetRealWidth(52);
@@ -611,7 +611,7 @@
};
}
- #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
+ #region 鈻� 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿_______________
/// <summary>
/// 鏄剧ず閫夋嫨璁惧鐫＄湢鏃堕棿鐨勭晫闈�
/// </summary>
@@ -627,7 +627,7 @@
var form = new BottomItemSelectForm();
form.CancelCallEvent = false;//鍏佽鍙栨秷
- form.AddForm(title, listText, nowSelectNo);
+ form.AddForm(title, listText, null, nowSelectNo);
form.FinishSelectEvent += (selectNo) =>
{
if (selectNo == nowSelectNo)
@@ -739,7 +739,7 @@
}
#endregion
- #region 鈻� 琛ュ厖瀹瑰櫒___________________________
+ #region 鈻� 琛ュ厖瀹瑰櫒___________________________
/// <summary>
/// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
index 39ffcf6..70d9c84 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorWorkModeMenuForm.cs
@@ -132,7 +132,7 @@
row1.ButtonClickEvent += (sender, e) =>
{
var form = new BottomItemSelectForm();
- form.AddForm(btnCaption1.Text, listSelect, this.pirConfigure.mode == 0 ? 1 : 0);
+ form.AddForm(btnCaption1.Text, listSelect, null, this.pirConfigure.mode == 0 ? 1 : 0);
form.FinishSelectEvent += (value) =>
{
this.isDataChanged = true;
@@ -170,7 +170,7 @@
row2.ButtonClickEvent += (sender, e) =>
{
var form = new BottomItemSelectForm();
- form.AddForm(btnCaption2.Text, listSelect, this.pirConfigure.type);
+ form.AddForm(btnCaption2.Text, listSelect, null, this.pirConfigure.type);
form.FinishSelectEvent += (value) =>
{
this.isDataChanged = true;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
index 1f1b42d..3b8829a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayBackUpListForm.cs
@@ -85,7 +85,7 @@
/// <summary>
/// 浠庝簯绔幏鍙栨暟鎹�
/// </summary>
- private async void SetBackupInfoToForm()
+ private void SetBackupInfoToForm()
{
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
@@ -94,7 +94,7 @@
this.ShowProgressBar();
//鑾峰彇鑷姩澶囦唤鐨勬暟鎹�
- var pageAuto = await HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);
+ var pageAuto = HdlBackupLogic.Current.GetBackupListNameFromDB(3, realGateway.GwId);
if (pageAuto == null)
{
//鍏抽棴杩涘害鏉�
@@ -103,7 +103,7 @@
}
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB(2, realGateway.GwId);
if (pageData == null)
{
//鍏抽棴杩涘害鏉�
@@ -263,7 +263,7 @@
/// </summary>
/// <param name="BackupClassId"></param>
/// <param name="backName"></param>
- private async void EditorBackInfo(string BackupClassId, string backName)
+ private void EditorBackInfo(string BackupClassId, string backName)
{
var Pra = new EditorBackUpNamePra();
Pra.BackupClassId = BackupClassId;
@@ -271,13 +271,17 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
if (result == false)
{
return;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
@@ -288,9 +292,9 @@
/// 鍒犻櫎澶囦唤鏂囨。
/// </summary>
/// <param name="BackupClassId"></param>
- private async void DeleteBackInfo(string BackupClassId)
+ private void DeleteBackInfo(string BackupClassId)
{
- bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
+ bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
if (success == false)
{
return;
@@ -300,7 +304,11 @@
this.nowSelectBackId = string.Empty;
this.nowbtnSelect = null;
}
- this.SetBackupInfoToForm();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //浠庝簯绔幏鍙栨暟鎹�
+ this.SetBackupInfoToForm();
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index ff1fb33..ce4b49b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -106,7 +106,7 @@
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
//鍙樻洿缃戝叧鎴块棿
- HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);
+ HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
};
//鎵�灞炰綇瀹�
@@ -326,10 +326,10 @@
/// 妫�娴嬫柊鐗堟湰
/// </summary>
/// <param name="btnNewVersion">鎻愮ず鏈夋柊鐗堟湰鐨勬帶浠�</param>
- private async void CheckNewVersion(PicViewControl btnNewVersion)
+ private void CheckNewVersion(PicViewControl btnNewVersion)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
- var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
+ var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
if (result == null)
{
return;
@@ -355,10 +355,10 @@
/// 璁剧疆缃戝叧鍚嶅瓧
/// </summary>
/// <param name="gatewayName">缃戝叧鍚嶇О</param>
- private async void SetGatewayName(string gatewayName, bool closeForm)
+ private void SetGatewayName(string gatewayName, bool closeForm)
{
//淇敼缃戝叧鍚�
- var result = await HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);
+ var result = HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);
//缃戝叧淇敼澶辫触
if (result == false)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index 74055ac..1548f15 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -206,7 +206,7 @@
{
HdlThreadLogic.Current.RunThread(() =>
{
- this.DeleteGateway(strWayId, gatewayRow);
+ this.DeleteGateway(strWayId);
});
});
};
@@ -238,7 +238,7 @@
/// </summary>
/// <param name="strWayId"></param>
/// <param name="row"></param>
- private async void DeleteGateway(string strWayId, GatewayRowControl row)
+ private async void DeleteGateway(string strWayId)
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -390,7 +390,7 @@
continue;
}
//鑾峰彇鏈�鏂扮増鏈�
- var result = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(way, ShowErrorMode.NO);
if (result == null)
{
continue;
@@ -399,7 +399,7 @@
{
//鏈夋柊鐗堟湰
string gwid = way.GwId;
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
index b509b41..ef5a516 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs
@@ -140,7 +140,7 @@
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
//鍙樻洿缃戝叧鎴块棿
- HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway, roomKeys);
+ HdlGatewayLogic.Current.ChangedGatewayRoom(this.zbGateway.GwId, roomKeys);
};
//瀹屾垚鍒濆鍖栨甯�
@@ -220,12 +220,12 @@
/// </summary>
/// <param name="gatewayName">缃戝叧鍚嶇О</param>
/// <param name="closeForm">鍏抽棴鐣岄潰</param>
- private async void SetGatewayName(string gatewayName, bool closeForm)
+ private void SetGatewayName(string gatewayName, bool closeForm)
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//淇敼鏈湴缃戝叧鍚�
- var result = await HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);
+ var result = HdlGatewayLogic.Current.ReName(zbGateway, gatewayName);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index 03fad5d..ca44a7a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
@@ -120,23 +120,15 @@
//搴曠嚎
frameRow.frameTable.AddBottomLine();
}
- frameRow.frameTable.ButtonClickEvent += (sender, e) =>
- {
- var form = new GatewayProductInfoForm();
- form.AddForm(gateway);
- };
-
if (dicZbGatewayDiv[gwid] == 2)
{
- //鎹㈢粦
- var btnBind = new NormalViewControl(Application.GetRealWidth(184), frameRow.Height, false);
- btnBind.BackgroundColor = 0xfffb744a;
- btnBind.TextAlignment = TextAlignment.Center;
- btnBind.TextColor = UserCenterColor.Current.White;
- btnBind.TextSize = 12;
- btnBind.TextID = R.MyInternationalizationString.uReBindAgain;
- frameRow.AddRightView(btnBind);
- btnBind.ButtonClickEvent += (sender, e) =>
+ //闇�閲嶆柊缁戝畾
+ frameRow.frameTable.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uNeedToRebind), 300);
+ }
+
+ frameRow.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ if (dicZbGatewayDiv[gwid] == 2)
{
//纭缁戝畾鏃х綉鍏筹紵
string msg = Language.StringByID(R.MyInternationalizationString.uRebindGatewayMsg);
@@ -145,8 +137,14 @@
var form = new GatewayRebindForm();
form.AddForm(gateway, dicZbGatewayDiv);
});
- };
- }
+ }
+ else
+ {
+ var form = new GatewayProductInfoForm();
+ form.AddForm(gateway);
+ }
+ };
+
//瀹氫綅
var btnPosition = frameRow.AddEditorControl(false);
btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
index 4121ceb..127a3d1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayFirmwareUpdateForm.cs
@@ -55,13 +55,13 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//鑾峰彇缃戝叧鏂扮増鏈俊鎭�
- this.listVersionInfo = await HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
+ this.listVersionInfo = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
if (listVersionInfo == null)
{
//鍏抽棴杩涘害鏉�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
index 04abc3d..2d00dab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideCommonForm.cs
@@ -37,7 +37,7 @@
/// </summary>
public virtual void ShowFrom()
{
- Phone.MainPage.ListRoomViewFrom.Instance.CanClick = false;
+ Phone.MainPage.LeftListRoomViewFrom.Instance.CanClick = false;
UserView.UserPage.Instance.AddChidren(this);
this.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideForm2.cs b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideForm2.cs
index 2242d3b..278d0dd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideForm2.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Guide/GuideForm2.cs
@@ -54,7 +54,7 @@
var btnKnwon = this.AddIKnwonButton();
btnKnwon.ButtonClickEvent += (sender, e) =>
{
- Phone.MainPage.ListRoomViewFrom.Instance.CanClick = true;
+ Phone.MainPage.LeftListRoomViewFrom.Instance.CanClick = true;
this.RemoveFromParent();
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
index 0fc6ba8..e828557 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlAutoBackupForm.cs
@@ -112,9 +112,9 @@
/// <summary>
/// 涓婁紶鏁版嵁
/// </summary>
- private async void UpLoadBackupInfo()
+ private void UpLoadBackupInfo()
{
- int result = await HdlAutoBackupLogic.DoUpLoadAutoBackupData();
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupData();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
index e7c1728..c8a666e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HdlBackup/HdlBackupListForm.cs
@@ -70,13 +70,13 @@
/// <summary>
/// 浠庝簯绔幏鍙栨暟鎹�
/// </summary>
- private async void SetBackupInfoToForm()
+ private void SetBackupInfoToForm()
{
//杩涘害鏉�
this.ShowProgressBar();
//鑾峰彇app鐨勮嚜鍔ㄥ浠�
- var autoData = await HdlBackupLogic.Current.GetBackupListNameFromDB(1);
+ var autoData = HdlBackupLogic.Current.GetBackupListNameFromDB(1);
if (autoData == null)
{
//鍏抽棴杩涘害鏉�
@@ -84,7 +84,7 @@
return;
}
//浠庝簯绔幏鍙栨暟鎹�
- var pageData = await HdlBackupLogic.Current.GetBackupListNameFromDB();
+ var pageData = HdlBackupLogic.Current.GetBackupListNameFromDB();
if (pageData == null)
{
//鍏抽棴杩涘害鏉�
@@ -283,10 +283,10 @@
/// <param name="BackupClassId"></param>
private void LoadBackupInfo(string BackupClassId)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//浠庝簯绔幏鍙栧浠界殑鏂囦欢
- bool result = await HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
+ bool result = HdlBackupLogic.Current.LoadAppBackupInfo(BackupClassId);
if (result == false)
{
//鏂囦欢鎭㈠澶辫触
@@ -295,7 +295,7 @@
return;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
//鍏抽棴鎵�鏈夌晫闈�
UserCenterLogic.CloseAllOpenForm();
@@ -319,10 +319,10 @@
/// <param name="backName"></param>
private void UpLoadBackInfo(string backName)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鍒涘缓涓�涓浠藉悕瀛�
- string backupClassId = await HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
+ string backupClassId = HdlBackupLogic.Current.CreatNewBackupNameToDB(backName);
if (backupClassId == null)
{
//鍒涘缓澶囦唤鍚嶅瓧澶辫触
@@ -333,7 +333,7 @@
}
//涓婁紶鏁版嵁鍒颁簯绔�
- bool result = await HdlBackupLogic.Current.UpLoadBackupFileToDB(backupClassId);
+ bool result = HdlBackupLogic.Current.UpLoadBackupFileToDB(backupClassId);
if (result == false)
{
//鏂囦欢涓婁紶澶辫触
@@ -363,9 +363,9 @@
/// </summary>
private void UpLoadAutoBackupInfo()
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- int result = await HdlAutoBackupLogic.DoUpLoadAutoBackupData();
+ int result = HdlAutoBackupLogic.DoUpLoadAutoBackupData();
if (result == -1)
{
//鏂囦欢涓婁紶澶辫触
@@ -394,7 +394,7 @@
/// </summary>
/// <param name="BackupClassId"></param>
/// <param name="backName"></param>
- private async void EditorBackInfo(string BackupClassId, string backName)
+ private void EditorBackInfo(string BackupClassId, string backName)
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -405,7 +405,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/UpdateHomeAppGatewayName", true, Pra);
if (result == false)
{
//缂栬緫澶囦唤鍚嶇О澶辫触
@@ -432,16 +432,9 @@
/// </summary>
/// <param name="BackupClassId"></param>
/// <param name="showMode"></param>
- public async void DeleteBackInfo(string BackupClassId, ShowErrorMode showMode = ShowErrorMode.YES)
+ public void DeleteBackInfo(string BackupClassId, ShowErrorMode showMode = ShowErrorMode.YES)
{
- //杩涘害鏉�
- this.ShowProgressBar();
-
- bool success = await HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
-
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
-
+ bool success = HdlBackupLogic.Current.DeleteDbBackupData(BackupClassId);
if (success == false)
{
if (showMode == ShowErrorMode.YES)
@@ -533,28 +526,6 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鎶婃湰鍦版墍鏈夋枃浠剁Щ鍔ㄥ埌鑷姩澶囦唤鏂囦欢澶�
- /// </summary>
- private void CopyLocationAllFileToAutoBackDirectory()
- {
- List<string> listAllFile = Shared.Common.Global.FileListByHomeId();
-
- string strroot = Common.Config.Instance.FullPath;
- string autoPath = System.IO.Path.Combine(strroot, DirNameResourse.LocalMemoryDirectory, DirNameResourse.AutoBackupDirectory);
- foreach (string file in listAllFile)
- {
- //鍒ゆ柇鏄惁鏄簲璇ヤ笂浼犵殑鏂囦欢
- if (HdlBackupLogic.Current.IsNotUpLoadFile(file) == true)
- {
- continue;
- }
- string sourseName = System.IO.Path.Combine(strroot, file);
- string newName = System.IO.Path.Combine(autoPath, file);
- System.IO.File.Copy(sourseName, newName, true);
- }
- }
/// <summary>
/// 妫�娴嬪鑰冨悕绉�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
index 43f19bc..73f495e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
@@ -39,9 +39,9 @@
Type type = typeof(DirNameResourse);
- var PropertyList = type.GetFields();
+ var PropertyList = type.GetProperties();
- var listFile = new List<System.Reflection.FieldInfo>();
+ var listFile = new List<System.Reflection.PropertyInfo>();
foreach (var item in PropertyList)
{
if (item.Name.EndsWith("Directory") == true)
@@ -64,7 +64,7 @@
row1.ButtonClickEvent += (sender, e) =>
{
var form = new HideOptionFileListForm();
- form.AddForm(UserCenterLogic.CombinePath());
+ form.AddForm(Common.Config.Instance.FullPath);
};
//鏌ョ湅鍏ㄩ儴鏂囦欢
@@ -84,12 +84,7 @@
private void AddRowControl(VerticalListControl listView, string directory, string directoryValue, bool addLine)
{
- string myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory, directoryValue);
- if (directoryValue == DirNameResourse.LocalMemoryDirectory)
- {
- myPath = UserCenterLogic.CombinePath(DirNameResourse.LocalMemoryDirectory);
- }
- if (System.IO.Directory.Exists(myPath) == false)
+ if (System.IO.Directory.Exists(directoryValue) == false)
{
return;
}
@@ -105,7 +100,7 @@
row1.ButtonClickEvent += (sender, e) =>
{
var form = new HideOptionFileListForm();
- form.AddForm(myPath);
+ form.AddForm(directoryValue);
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
index b032749..a05bea7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
@@ -20,6 +20,7 @@
/// </summary>
public void ShowForm(string i_file)
{
+ this.ScrollEnabled = false;
//璁剧疆澶撮儴淇℃伅
base.SetTitleText("鏂囦欢鍐呭");
@@ -74,6 +75,9 @@
btnText.TextAlignment = TextAlignment.TopLeft;
btnText.TextColor = UserCenterColor.Current.TextColor1;
btnText.Text = textValue;
+#if Android
+ btnText.Foucs = false;
+#endif
bodyFrameLayout.AddChidren(btnText);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs
index 0f19b03..a4a3e23 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs
@@ -57,7 +57,7 @@
{
this.ClearBodyFrame();
- var listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(directory);
+ var listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory);
listAllFile.Sort();
var listView = new VerticalListControl(23);
@@ -90,7 +90,7 @@
}
});
};
- if (directory == UserCenterLogic.CombinePath())
+ if (directory == Common.Config.Instance.FullPath)
{
btnButon.CanClick = false;
}
@@ -118,12 +118,26 @@
}
row1.frameTable.AddRightArrow();
+ var btnUpLoad = row1.AddEditorControl();
+ btnUpLoad.Text = "涓婁紶";
+ btnUpLoad.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶璇ユ枃浠�(娴嬭瘯)?", () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ string tagrtFile = System.IO.Path.Combine(directory, fileName);
+ HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));
+ });
+ });
+ };
+
var btnDelete = row1.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎璇ョ紦瀛樻枃浠�", () =>
{
- var myFile = UserCenterLogic.CombinePath(directory, fileName);
+ var myFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName);
try
{
System.IO.File.Delete(myFile);
@@ -140,7 +154,7 @@
row1.frameTable.ButtonClickEvent += (sender, e) =>
{
var form = new HideOptionFileContentForm();
- form.AddForm(UserCenterLogic.CombinePath(directory, fileName));
+ form.AddForm(System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName));
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 2526f82..40234dc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -76,29 +76,11 @@
this.AddNormalRowControl("Socket閾炬帴", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
}
- int count = HdlGatewayLogic.Current.GetAllLocalGateway().Count;
+ int count = ZbGateway.GateWayList.Count;
var row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.UseClickStatu = false;
- row1.AddLeftCaption("鏈湴缃戝叧", 400);
- if (count > 0)
- {
- row1.UseClickStatu = true;
- row1.AddRightArrow();
- row1.ButtonClickEvent += (sender, e) =>
- {
- var form = new HideOptionGatewayListForm();
- form.AddForm(1);
- };
- }
- row1.AddMostRightView(count + "涓�", 400);
- row1.AddBottomLine();
-
- count = ZigBee.Device.ZbGateway.GateWayList.Count;
- row1 = new FrameRowControl(listView.rowSpace / 2);
- listView.AddChidren(row1);
- row1.UseClickStatu = false;
- row1.AddLeftCaption("缂撳瓨涓殑缃戝叧", 400);
+ row1.AddLeftCaption("骞挎挱鍒扮殑缃戝叧", 400);
if (count > 0)
{
row1.UseClickStatu = true;
@@ -126,36 +108,6 @@
form.AddForm();
};
-#if Android
- row1 = new FrameRowControl(listView.rowSpace / 2);
- row1.UseClickStatu = false;
- listView.AddChidren(row1);
- row1.AddLeftCaption("GBS瀹氫綅", 500);
- row1.AddBottomLine();
- var btnGbsSwitch = row1.AddMostRightSwitchIcon();
- string checkFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
- if (System.IO.File.Exists(checkFile) == true)
- {
- btnGbsSwitch.IsSelected = true;
- }
- btnGbsSwitch.ButtonClickEvent += (sender, e) =>
- {
- this.ShowMassage(ShowMsgType.Confirm, "娉ㄦ剰:寮�鍚垨鑰呭叧闂鍔熻兘浼氶噸鍚疉pp", () =>
- {
- btnGbsSwitch.IsSelected = !btnGbsSwitch.IsSelected;
- if (btnGbsSwitch.IsSelected == true)
- {
- var file = System.IO.File.Create(checkFile);
- file.Close();
- }
- else
- {
- System.IO.File.Delete(checkFile);
- }
- HDLUtils.RestartApp();
- });
- };
-#endif
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
row1.AddLeftCaption("璁惧缂撳瓨鍙橀噺", 500);
@@ -167,6 +119,82 @@
form.AddForm();
};
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("鏀堕泦鍙戦�佸拰鎺ユ敹鐨勬暟鎹�", 600);
+ row1.AddBottomLine();
+ var btnSwitchLog = row1.AddMostRightSwitchIcon();
+ btnSwitchLog.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnSwitchLog.IsSelected == false)
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍鍙戦�佸強鎺ユ敹鏁版嵁鐨勮褰�?", () =>
+ {
+ btnSwitchLog.IsSelected = true;
+ HdlFileLogic.Current.DeleteFile(DirNameResourse.SendAndReceveDataLog);
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 1;
+ });
+ }
+ else
+ {
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ btnSwitchLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SendAndReceveDataLog);
+ if (txtvalue != null)
+ {
+ var form = new HideOptionFileContentForm();
+ form.AddForm(string.Empty);
+
+ form.SetTextContent(txtvalue);
+ }
+ }
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("SocketReceive", 600);
+ row1.AddBottomLine();
+ var btnSocketReceiveLog = row1.AddMostRightSwitchIcon();
+ btnSocketReceiveLog.ButtonClickEvent += (sender, e) =>
+ {
+ if (btnSocketReceiveLog.IsSelected == false)
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁鎵撳紑璁板綍SocketReceive鐨勮褰�?", () =>
+ {
+ btnSocketReceiveLog.IsSelected = true;
+ HdlFileLogic.Current.DeleteFile(DirNameResourse.SocketReceiveDataLog);
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 1;
+ });
+ }
+ else
+ {
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
+ btnSocketReceiveLog.IsSelected = false;
+ var txtvalue = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SocketReceiveDataLog);
+ if (txtvalue != null)
+ {
+ var form = new HideOptionFileContentForm();
+ form.AddForm(string.Empty);
+
+ form.SetTextContent(txtvalue);
+ }
+ }
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("閲嶆柊鍒濆鍖朣ocket", 600);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁閲嶆柊鍒濆鍖朣ocket瀵硅薄?", () =>
+ {
+ ZigBee.Common.Application.FindGateWaySocket.Stop();
+ ZigBee.Common.Application.FindGateWaySocket.Start();
+ this.ShowMassage(ShowMsgType.Tip, "鍒濆鍖栧畬鎴�");
+ });
+ };
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -176,9 +204,9 @@
{
this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶Log鏂囦欢", () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlBackupLogic.Current.UpLoadLogBackup();
+ HdlBackupLogic.Current.UpLoadLogBackup();
});
});
};
@@ -283,8 +311,10 @@
/// </summary>
public override void CloseFormBefore()
{
- Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest = null;
+ UserCenterResourse.DicReceiveGatewayTest = null;
UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;
+ UserCenterResourse.HideOption.WriteSendAndReceveDataToFile = 0;
+ UserCenterResourse.HideOption.WriteSocketReceiveDataToFile = 0;
base.CloseFormBefore();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
index 1809c0f..9d711f8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
@@ -97,7 +97,7 @@
}
listDirectory.Sort();
- listAllFile = HdlAutoBackupLogic.GetFileFromDirectory(directory.TrimEnd('/'));
+ listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory.TrimEnd('/'));
listAllFile.Sort();
}
@@ -185,6 +185,20 @@
}
row1.frameTable.AddRightArrow();
+ var btnUpLoad = row1.AddEditorControl();
+ btnUpLoad.Text = "涓婁紶";
+ btnUpLoad.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶璇ユ枃浠�(娴嬭瘯)?", () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ string tagrtFile = System.IO.Path.Combine(directory, fileName);
+ HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));
+ });
+ });
+ };
+
var btnDelete = row1.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
index f9b943a..91d8619 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberByIdForm.cs
@@ -66,7 +66,11 @@
return;
}
//妫�绱㈡垚鍛樹俊鎭�
- this.SearchMemberInfo(txtCode.Text.Trim());
+ string strCode = txtCode.Text.Trim();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.SearchMemberInfo(strCode);
+ });
});
}
@@ -79,34 +83,39 @@
/// </summary>
/// <param name="accountId">鎴愬憳ID</param>
/// <param name="txtMsg">淇℃伅鎺т欢</param>
- private async void SearchMemberInfo(string accountId)
+ private void SearchMemberInfo(string accountId)
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
var pra = new AccountInfoPra();
pra.Account = accountId;
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new System.Collections.Generic.List<string>() { "AccountNoExists" });
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new System.Collections.Generic.List<string>() { "AccountNoExists" });
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- if (result == null)
+ if (byteData == null)
{
//寮傚父
return;
}
- if (result == string.Empty)
+ var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode == "AccountNoExists")
{
- //鎴愬憳涓嶅瓨鍦�
- var form = new MemberNotEsixtForm();
- form.AddForm();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鎴愬憳涓嶅瓨鍦�
+ var form = new MemberNotEsixtForm();
+ form.AddForm();
+ });
+
return;
}
- var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(result);
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
infoResult.Account = accountId;
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
var form = new AddMemberInfoForm();
form.AddForm(infoResult);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
old mode 100755
new mode 100644
index f013a0f..5805a8c
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/AddMemberInfoForm.cs
@@ -106,7 +106,10 @@
btnOk.ButtonClickEvent += (sender, e) =>
{
//娣诲姞鎴愬憳
- this.DoAddMember();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.DoAddMember();
+ });
};
}
@@ -117,7 +120,7 @@
/// <summary>
/// 娣诲姞鎴愬憳
/// </summary>
- private async void DoAddMember()
+ private void DoAddMember()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -125,7 +128,7 @@
var pra = new BindSubAccountPra();
pra.SubAccount = memberResult.Account;
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindSubAccount", false, pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -135,15 +138,12 @@
//鑾峰彇杩欎釜鎴愬憳鐨凷ubDistributedMark
var pra2 = new MemberListInfoPra();
- string resultValue = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra2);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- if (resultValue == null)
+ if (string.IsNullOrEmpty(resultValue) == true)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
- this.ShowMassage(ShowMsgType.Tip, msg);
return;
}
List<MemberInfoRes> listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MemberInfoRes>>(resultValue);
@@ -156,16 +156,13 @@
break;
}
}
- if (memberInfoRes == null)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownError);
- this.ShowMassage(ShowMsgType.Tip, msg);
- return;
+ if (memberInfoRes == null)
+ {
+ //鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ string msg = Language.StringByID(R.MyInternationalizationString.uUnKnownErrorAndLostData);
+ this.ShowMassage(ShowMsgType.Tip, msg);
+ return;
}
- //娣诲姞缂撳瓨
- UserCenterResourse.ListMemberInfo.Add(memberInfoRes);
- UserCenterLogic.SaveLocalMemberListInfo();
string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfoRes.DistributedMark + ".png");
if (memberResult.HeadImage != null)
@@ -174,16 +171,19 @@
Shared.IO.FileUtils.WriteFileByBytes(iconPath, memberResult.HeadImage);
}
- //鎴愬憳娣诲姞鎴愬姛
- var form = new AddMemberSuccessForm();
- form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
- form.FormCloseEvent += (() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- this.CloseForm();
- //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
- this.CloseFormByFormName("AddMemberByIdForm");
- //娣诲姞鎴愬憳
- this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
+ //鎴愬憳娣诲姞鎴愬姛
+ var form = new AddMemberSuccessForm();
+ form.AddForm(memberInfoRes, memberInfoRes.DistributedMark);
+ form.FormCloseEvent += (() =>
+ {
+ this.CloseForm();
+ //鍏抽棴鎵嬪姩杈撳叆鎴愬憳ID鐨勭敾闈�
+ this.CloseFormByFormName("AddMemberByIdForm");
+ //娣诲姞鎴愬憳
+ this.LoadFormMethodByName("MemberListForm", "AddRowLayoutByOtherForm", memberInfoRes);
+ });
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index d5b2cbd..e88ead1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -54,7 +54,10 @@
return;
}
//鎼滅储ID
- this.SearchMemberInfo(qrCode);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.SearchMemberInfo(qrCode);
+ });
},
Language.StringByID(R.MyInternationalizationString.uCancel),
Language.StringByID(R.MyInternationalizationString.uFlashlamp),
@@ -174,14 +177,14 @@
/// <summary>
/// 鍒濆鍖栨垚鍛樺垪琛�
/// </summary>
- private async void InitMemberList()
+ private void InitMemberList()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
var pra = new MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
- if (result == null)
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+ if (string.IsNullOrEmpty(result) == true)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar(ShowReLoadMode.YES);
@@ -204,10 +207,8 @@
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- //鍏堟竻绌烘垚鍛樺垪琛ㄤ俊鎭�
- UserCenterResourse.ListMemberInfo.Clear();
-
List<string> listCheck = new List<string>();
+ List<MemberInfoRes> listShowInfo = new List<MemberInfoRes>();
foreach (MemberInfoRes infoRes in listInfo)
{
if (listCheck.Contains(infoRes.DistributedMark) == true
@@ -225,32 +226,28 @@
listCheck.Add(infoRes.DistributedMark);
//娣诲姞鎴愬憳淇℃伅鐨勭紦瀛�
- UserCenterResourse.ListMemberInfo.Add(infoRes);
+ listShowInfo.Add(infoRes);
}
- listInfo.Clear();
- //淇濆瓨鎴愬憳淇℃伅鐨勭紦瀛樺埌鏈湴鏂囦欢
- UserCenterLogic.SaveLocalMemberListInfo();
- if (UserCenterResourse.ListMemberInfo.Count == 0)
+ if (listShowInfo.Count == 0)
{
return;
}
HdlThreadLogic.Current.RunMain(() =>
{
//娣诲姞鎴愬憳鍒楄〃
- this.AddMemberListRowByData();
+ this.AddMemberListRowByData(listShowInfo);
});
}
/// <summary>
/// 娣诲姞鎴愬憳鍒楄〃
/// </summary>
- private void AddMemberListRowByData()
+ private void AddMemberListRowByData(List<MemberInfoRes> listNewInfo)
{
if (this.Parent == null)
{
return;
}
- var listNewInfo = UserCenterResourse.ListMemberInfo;
int count = listNewInfo.Count - 1;
for (int i = 0; i < listNewInfo.Count; i++)
@@ -351,7 +348,7 @@
{
return;
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
var pra = new AccountInfoPra();
foreach (var keys in dicMemberAccount.Keys)
@@ -361,7 +358,7 @@
return;
}
pra.Account = dicMemberAccount[keys];
- var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "NotSetAgain" });
+ var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (result == null)
{
continue;
@@ -423,28 +420,32 @@
/// </summary>
/// <param name="accountId">鎴愬憳ID</param>
/// <param name="txtMsg">淇℃伅鎺т欢</param>
- private async void SearchMemberInfo(string accountId)
+ private void SearchMemberInfo(string accountId)
{
var pra = new AccountInfoPra();
pra.Account = accountId;
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "AccountNoExists" });
- if (result == null)
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "AccountNoExists" });
+ if (byteData == null)
{
//寮傚父
return;
}
- if (result == string.Empty)
+ var revertObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.ResponseEntity.ResponsePack>(System.Text.Encoding.UTF8.GetString(byteData));
+ if (revertObj.StateCode == "AccountNoExists")
{
- //鎴愬憳涓嶅瓨鍦�
- var form = new MemberNotEsixtForm();
- form.AddForm();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鎴愬憳涓嶅瓨鍦�
+ var form = new MemberNotEsixtForm();
+ form.AddForm();
+ });
return;
}
- var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(result);
+ var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
infoResult.Account = accountId;
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
var form = new AddMemberInfoForm();
form.AddForm(infoResult);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 658ee39..27ccb52 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -219,7 +219,10 @@
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
//鍒犻櫎瀛愯处鍙�
- this.DeleteSubAccount();
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.DeleteSubAccount();
+ });
});
};
}
@@ -251,7 +254,8 @@
}
btnSwitch.ButtonClickEvent += (sender, e) =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ btnSwitch.CanClick = false;
+ HdlThreadLogic.Current.RunThread(() =>
{
var pra = new
{
@@ -261,7 +265,7 @@
};
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ChangeSubAccountIsAllowRemoteCtrl", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -273,6 +277,7 @@
Application.RunOnMainThread(() =>
{
+ btnSwitch.CanClick = true;
btnSwitch.IsSelected = !btnSwitch.IsSelected;
});
});
@@ -319,46 +324,49 @@
/// <summary>
/// 鍗囩骇鎴栬�呴檷绾у瓙璐﹀彿
/// </summary>
- public async void UpOrDownSubAccountLevel()
+ public void UpOrDownSubAccountLevel()
{
- //寮�鍚繘搴︽潯
- this.ShowProgressBar();
-
- var pra = new UpOrDownLevelPra();
- pra.DistributedMark = memberInfo.DistributedMark;
-
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpSubAccount", false, pra);
- if (result == false)
+ HdlThreadLogic.Current.RunThread(() =>
{
- this.CloseProgressBar();
- return;
- }
- this.CloseProgressBar();
+ //寮�鍚繘搴︽潯
+ this.ShowProgressBar();
- //鍙樻洿鏉冮檺
- memberInfo.AccountType = memberInfo.AccountType == 1 ? 0 : 1;
+ var pra = new UpOrDownLevelPra();
+ pra.DistributedMark = memberInfo.DistributedMark;
- Application.RunOnMainThread(() =>
- {
- if (this.Parent == null)
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpSubAccount", false, pra);
+ if (result == false)
{
+ this.CloseProgressBar();
return;
}
- //鍙樻洿鏉冮檺鍥炬爣
- if (memberInfo.AccountType == 1)
- {
- btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
- }
- else
- {
- btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
- }
- //鍙樻洿鏉冮檺鏂囧瓧
- btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
+ this.CloseProgressBar();
- //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
- var form = new SubAccountLevelUpSuccessForm();
- form.AddForm(memberInfo);
+ //鍙樻洿鏉冮檺
+ memberInfo.AccountType = memberInfo.AccountType == 1 ? 0 : 1;
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (this.Parent == null)
+ {
+ return;
+ }
+ //鍙樻洿鏉冮檺鍥炬爣
+ if (memberInfo.AccountType == 1)
+ {
+ btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
+ }
+ else
+ {
+ btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
+ }
+ //鍙樻洿鏉冮檺鏂囧瓧
+ btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
+
+ //鎵撳紑鏄剧ず鎴愬姛鐨勭敾闈�
+ var form = new SubAccountLevelUpSuccessForm();
+ form.AddForm(memberInfo);
+ });
});
}
@@ -369,7 +377,7 @@
/// <summary>
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
- private async void DeleteSubAccount()
+ private void DeleteSubAccount()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -377,7 +385,7 @@
var pra = new DeleteSubAccountPra();
pra.SubAccount = memberInfo.SubAccountDistributedMark;
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletedSubAccount", false, pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/DeletedSubAccount", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -386,21 +394,13 @@
return;
}
- //绉婚櫎缂撳瓨
- UserCenterResourse.ListMemberInfo.RemoveAll((obj) =>
+ HdlThreadLogic.Current.RunMain(() =>
{
- if (obj.SubAccountDistributedMark == memberInfo.SubAccountDistributedMark)
- {
- return true;
- }
- return false;
+ //浠庢垚鍛樹竴瑙堢敾闈㈢Щ闄�
+ this.LoadFormMethodByName("MemberListForm", "DeleteRowByAccount", memberInfo.Account);
+ //鑷韩鍏抽棴
+ this.CloseForm();
});
- UserCenterLogic.SaveLocalMemberListInfo();
-
- //浠庢垚鍛樹竴瑙堢敾闈㈢Щ闄�
- this.LoadFormMethodByName("MemberListForm", "DeleteRowByAccount", memberInfo.Account);
- //鑷韩鍏抽棴
- this.CloseForm();
}
#endregion
@@ -412,11 +412,11 @@
/// </summary>
private void GetMemberIcon(ImageView btnUserIcon)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
var pra = new AccountInfoPra();
pra.Account = memberInfo.Account;
- var result = await UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "NotSetAgain" });
+ var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (result == null)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
index 7ccbfb4..686de8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/OtherParty/OtherPartyAccountMenuForm.cs
@@ -41,12 +41,12 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鑾峰彇缁戝畾鏁版嵁
- var result = await this.GetBingData();
+ var result = this.GetBingData();
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -173,12 +173,12 @@
/// 鑾峰彇缁戝畾鏁版嵁
/// </summary>
/// <returns></returns>
- private async Task<bool> GetBingData()
+ private bool GetBingData()
{
this.dicBindData = new Dictionary<string, OtherPartyResult>();
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetUserAuthItem", false, "");
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetUserAuthItem", false, "");
+ if (string.IsNullOrEmpty(result) == true)
{
return false;
}
@@ -223,12 +223,12 @@
/// 缁戝畾寰俊
/// </summary>
/// <param name="infoData"></param>
- private async void BindWechat(string accessToken, string refreshToken, string openID)
+ private void BindWechat(string accessToken, string refreshToken, string openID)
{
//鑾峰彇寰俊鏄电О
var strUrl = "https://api.weixin.qq.com/sns/userinfo?access_token=" + accessToken;
strUrl += "&openid=" + openID;
- var byteData = await Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
+ var byteData = Common.CommonPage.Instance.DoRequestZigbeeHttpsInterface(strUrl, null, null, "GET");
if (byteData == null)
{
return;
@@ -239,7 +239,7 @@
//鍏堜笂浼犲井淇¤祫鏂�
var pra = new { AccessToken = accessToken, RefreshToken = refreshToken, OpenID = openID, UserName = nickData.nickname };
var listNotShow = new List<string>() { "UserNoBindAccount" };
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/InsertOrUpdateAuthUser", false, pra, listNotShow);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/InsertOrUpdateAuthUser", false, pra, listNotShow);
if (result == false)
{
return;
@@ -247,7 +247,7 @@
//鍐嶆墽琛岀粦瀹�
var pra2 = new { AccountGuid = Common.Config.Instance.Guid, OpenID = openID };
- result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
+ result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAuthUserToAccount", false, pra2);
if (result == true)
{
//缁戝畾鎴愬姛锛佷笅娆′綘鍙互鐢ㄥ井淇0}璐﹀彿蹇�熺櫥褰曞暒
@@ -267,10 +267,10 @@
/// 瑙ｉ櫎缁戝畾
/// </summary>
/// <param name="infoData"></param>
- private async void UnBindOtherParty(OtherPartyResult infoData)
+ private void UnBindOtherParty(OtherPartyResult infoData)
{
var pra = new { DistributedMark = infoData.Id };
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UnBindUserAuth", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UnBindUserAuth", false, pra);
if (result == true)
{
//閲嶆柊鍒锋柊鐣岄潰
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
index 29cb8ff..36253de 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
@@ -151,12 +151,12 @@
/// <summary>
/// 鍙戦�侀獙璇佺爜鍒伴偖绠�
/// </summary>
- private async void SendCodeToEmail(BottomClickButton btnNext, string Email)
+ private void SendCodeToEmail(BottomClickButton btnNext, string Email)
{
var sendCodePra = new SendCodePra();
sendCodePra.Account = Email;
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
if (falge == false)
{
return;
@@ -213,7 +213,7 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(string code)
+ private void CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
@@ -226,7 +226,7 @@
checkCodePra.Code = code;
checkCodePra.Account = newEmail;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -242,12 +242,12 @@
/// <summary>
/// 鍙樻洿閭
/// </summary>
- private async void SaveNewEmail()
+ private void SaveNewEmail()
{
var pra = new SaveNewEmailPra();
pra.Account = this.newEmail;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
if (flage == false)
{
//缁戝畾閭澶辫触
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
index f1ae8d1..fa5caea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
@@ -171,13 +171,13 @@
/// <summary>
/// 鍙戦�侀獙璇佺爜鍒版墜鏈�
/// </summary>
- private async void SendCodeToPhone(BottomClickButton btnNext,string areaCode, string phoneNum)
+ private void SendCodeToPhone(BottomClickButton btnNext,string areaCode, string phoneNum)
{
var sendCodePra = new SendCodePra();
sendCodePra.Account = phoneNum;
sendCodePra.AreaCode = Convert.ToInt32(areaCode);
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
if (flage == false)
{
return;
@@ -234,7 +234,7 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(string code)
+ private void CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
@@ -247,7 +247,7 @@
checkCodePra.Code = code;
checkCodePra.Account = newPhone;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -263,12 +263,12 @@
/// <summary>
/// 鍙樻洿鎵嬫満鍙�
/// </summary>
- private async void SaveNewPhoneNumber()
+ private void SaveNewPhoneNumber()
{
var pra = new SaveNewPhoneNumPra();
pra.Account = newPhone;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
if (flage == false)
{
//缁戝畾鎵嬫満澶辫触
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 88a6757..16ba490 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
@@ -120,11 +120,11 @@
/// <summary>
/// 鍙戦�侀獙璇佺爜鍒伴偖绠�
/// </summary>
- private async void SendCodeToEmail(BottomClickButton btnNext)
+ private void SendCodeToEmail(BottomClickButton btnNext)
{
var sendCodePra = new SendCodePra();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
if (falge == false)
{
return;
@@ -179,7 +179,7 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(string code)
+ private void CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
@@ -190,7 +190,7 @@
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
index c7230fe..0243f21 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
@@ -133,11 +133,11 @@
/// <summary>
/// 鍙戦�侀獙璇佺爜鍒版墜鏈�
/// </summary>
- private async void SendCodeToPhone(BottomClickButton btnNext)
+ private void SendCodeToPhone(BottomClickButton btnNext)
{
var sendCodePra = new SendCodePra();
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
if (flage == false)
{
return;
@@ -192,7 +192,7 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(string code)
+ private void CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
@@ -203,7 +203,7 @@
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
index f788e5f..093de67 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorAccountPasswordForm.cs
@@ -164,13 +164,13 @@
/// 淇濆瓨瀵嗙爜
/// </summary>
/// <param name="newPassword"></param>
- private async void SavePassword(string newPassword)
+ private void SavePassword(string newPassword)
{
var pra = new SavePasswordPra();
pra.NewPassword = newPassword;
//鏇存敼瀵嗙爜
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatePassword", false, pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatePassword", false, pra);
if (flage == false)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
index 9036ecd..8dfcc30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
@@ -229,7 +229,7 @@
/// <param name="psw">瀵嗙爜</param>
private void SaveSecondaryPassword(PswGestureInputControl contr, string psw)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -240,7 +240,7 @@
GesturePwd = psw,
StringPwd = UserCenterResourse.AccountOption.PswAuthentication
};
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs
index c2f91ae..972fb7e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorSecondaryPasswordForm.cs
@@ -213,7 +213,7 @@
/// <param name="psw">瀵嗙爜</param>
private void SaveSecondaryPassword(PswNumberInputControl contr, string psw)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -224,7 +224,7 @@
GesturePwd = UserCenterResourse.AccountOption.GestureAuthentication,
StringPwd = psw
};
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
index 980c379..3d503c4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotAccountPasswordForm.cs
@@ -166,13 +166,13 @@
/// 鍙戦�侀獙璇佺爜
/// </summary>
/// <param name="btnCode"></param>
- private async void SetVerificationCode(NormalViewControl btnCode)
+ private void SetVerificationCode(NormalViewControl btnCode)
{
string account = this.strPhoneEmail.StartsWith("+") == true ? UserCenterResourse.UserInfo.Phone : UserCenterResourse.UserInfo.Email;
var sendCodePra = new SendCodePra();
sendCodePra.Account = account;
sendCodePra.AreaCode = Convert.ToInt32(UserCenterResourse.UserInfo.AreaCode);
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ForgetPassword", false, sendCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ForgetPassword", false, sendCodePra);
if (flage == false)
{
return;
@@ -267,14 +267,14 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(TextInputControl txtCode, string code)
+ private void CheckVerificationCode(TextInputControl txtCode, string code)
{
string account = this.strPhoneEmail.StartsWith("+") == true ? UserCenterResourse.UserInfo.Phone : UserCenterResourse.UserInfo.Email;
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
checkCodePra.Account = account;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
index 7d9474b..21528a3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
@@ -166,13 +166,13 @@
/// 鍙戦�侀獙璇佺爜
/// </summary>
/// <param name="btnCode"></param>
- private async void SetVerificationCode(NormalViewControl btnCode)
+ private void SetVerificationCode(NormalViewControl btnCode)
{
string account = this.strPhoneEmail.StartsWith("+") == true ? UserCenterResourse.UserInfo.Phone : UserCenterResourse.UserInfo.Email;
var sendCodePra = new SendCodePra();
sendCodePra.Account = account;
sendCodePra.AreaCode = Convert.ToInt32(UserCenterResourse.UserInfo.AreaCode);
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ForgetPassword", false, sendCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ForgetPassword", false, sendCodePra);
if (flage == false)
{
return;
@@ -267,14 +267,14 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(TextInputControl txtCode, string code)
+ private void CheckVerificationCode(TextInputControl txtCode, string code)
{
string account = this.strPhoneEmail.StartsWith("+") == true ? UserCenterResourse.UserInfo.Phone : UserCenterResourse.UserInfo.Email;
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
checkCodePra.Account = account;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
index a551422..d15698c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ResetAccountPasswordForm.cs
@@ -127,13 +127,13 @@
/// </summary>
/// <param name="newPsw">鏂板瘑鐮�</param>
/// <param name="newPsw2">浜屾纭瀵嗙爜</param>
- private async void ResetPassword(string newPsw, string newPsw2)
+ private void ResetPassword(string newPsw, string newPsw2)
{
var pra = new ResetPswPra();
pra.Password = newPsw;
pra.AgainPassword = newPsw2;
//鏇存敼瀵嗙爜
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ResetPassword", false, pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ResetPassword", false, pra);
if (flage == false)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 4798b97..745feb7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -215,7 +215,7 @@
}
//娣诲姞鎴块棿,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
HdlRoomLogic.Current.AddRoom(newRoom);
this.FinishEditorEvent?.Invoke();
@@ -275,6 +275,11 @@
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -385,10 +390,16 @@
{
listDevice.Add(device);
}
+ //鏂伴
else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
{
listDevice.Add(device);
}
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
+ {
+ listDevice.Add(device);
+ }
}
var listSelect = new List<string>() { newRoom.HumidityDevice };
var form = new SelectDeviceForm();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index cd14c9d..920a4ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -306,16 +306,16 @@
if (changedFloor == false)
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎸囧畾鎴块棿鐨勪俊鎭�
- MainPage.ListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
+ MainPage.LeftListRoomViewFrom.Instance.RefreshRoomInfo(this.editorRoom);
}
else
{
//鍒锋柊宸︽粦鐨勬埧闂村垪琛ㄧ晫闈㈢殑鎴块棿鍒楄〃淇℃伅
- MainPage.ListRoomViewFrom.Instance.RefreshListRoom();
+ MainPage.LeftListRoomViewFrom.Instance.RefreshListRoom();
}
//绠椾簡,杩欓噷濡傛灉鎸変笅淇濆瓨,鍒欎富椤甸渶瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
this.CloseForm();
};
@@ -372,6 +372,11 @@
{
//鑾峰彇娓╁害浼犳劅鍣�
if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
{
listDevice.Add(device);
}
@@ -463,10 +468,16 @@
{
listDevice.Add(device);
}
+ //鏂伴
else if (device.Type == ZigBee.Device.DeviceType.FreshAirHumiditySensor)
{
listDevice.Add(device);
}
+ //PM2.5鏄俯搴﹀拰婀垮害鍚堝湪鍚屼竴涓鐐�
+ else if (device.Type == ZigBee.Device.DeviceType.PMSensor)
+ {
+ listDevice.Add(device);
+ }
}
var listSelect = new List<string>() { cloneRoom.HumidityDevice };
var form = new SelectDeviceForm();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 8dfdc85..3558710 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -19,10 +19,6 @@
/// 妤煎眰鐨勪富閿�
/// </summary>
private string floorKeys = string.Empty;
- /// <summary>
- /// 鎴块棿椤哄簭
- /// </summary>
- private List<string> listRoomSort = new List<string>();
#endregion
@@ -81,11 +77,6 @@
{
//鑾峰彇妤煎眰鐨勬埧闂�
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.floorKeys);
- this.listRoomSort.Clear();
- for (int i = 0; i < listRoom.Count; i++)
- {
- this.listRoomSort.Add(listRoom[i].Id);
- }
this.listView.RemoveAll();
listView.Height = bodyFrameLayout.Height + Application.GetRealHeight(6);
@@ -156,9 +147,6 @@
//璋冩暣楂樺害
frameRow.RemoveFromParent();
listView.AdjustRealHeight(Application.GetRealHeight(23));
- //淇濆瓨椤哄簭
- this.listRoomSort.Remove(room.Id);
- HdlRoomLogic.Current.SaveRoomSort(floorKeys, this.listRoomSort);
});
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index 2ac9c0a..3300808 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -78,7 +78,7 @@
/// <param name="div">1:鍏堣鍙栦簯绔�,鏃犳硶鑱旂綉,鍐嶈鍙栨湰鍦� 2:鍙浜戠 3:鍙鏈湴</param>
private void SetResidenceInfo(int div)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//铏氭嫙浣忓畢鐨勮瘽,鍙鏈湴
if (div == 3 || Config.Instance.Home.IsVirtually == true)
@@ -91,7 +91,7 @@
//寮�鍚繘搴︽潯
this.ShowProgressBar();
//璁剧疆浣忓畢淇℃伅(鏈夌綉鎯呭喌)
- var result = await this.SetResidenceInfoByOnline();
+ var result = this.SetResidenceInfoByOnline();
if (result == true)
{
//浜戠璇诲彇鎴愬姛
@@ -120,13 +120,12 @@
/// <summary>
/// 璁剧疆浣忓畢淇℃伅(鏈夌綉鎯呭喌)
/// </summary>
- private async System.Threading.Tasks.Task<bool> SetResidenceInfoByOnline()
+ private bool SetResidenceInfoByOnline()
{
//鑾峰彇浣忓畢淇℃伅
var Pra = new GetResidenceInfoPra();
- var listNotCheck = new List<string>() { "NotSetAgain" };
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, listNotCheck);
- if (resultData == null)
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });
+ if (string.IsNullOrEmpty(resultData) == true)
{
return false;
}
@@ -224,7 +223,7 @@
}
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -232,7 +231,7 @@
//妫�娴嬫湰鍦版湁娌℃湁杩欎釜浣忓畢
this.CheckIsExsitResidence(info);
- await HdlResidenceLogic.Current.SwitchResidence(info.Id);
+ HdlResidenceLogic.Current.SwitchResidence(info.Id);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -354,9 +353,9 @@
}
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
- await HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
+ HdlResidenceLogic.Current.SwitchResidence(i_home.Id);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -424,7 +423,10 @@
if (info != null)
{
//缂栬緫浜戠鐨勪綇瀹呭悕绉�
- this.EditorResidenceName(textValue, info, btnHome);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.EditorResidenceName(textValue, info, btnHome);
+ });
}
else
{
@@ -448,7 +450,7 @@
/// <param name="ResidenceName"></param>
/// <param name="info"></param>
/// <returns></returns>
- private async void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)
+ private void EditorResidenceName(string ResidenceName, Common.ResponseEntity.ResidenceObj info, NormalViewControl btnHome)
{
//妫�娴嬭兘鍚︿繚瀛樹綇瀹�
if (this.CheckIsCanSaveResidence(info.Id, ResidenceName, true) == false)
@@ -465,17 +467,20 @@
Pra.LoginAccessToken = Config.Instance.Token;
//缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", false, Pra, new List<string> { "NotCheck" });
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (flage == true)
{
- //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
- HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);
- //鏇存敼鏄剧ず鐨勫悕瀛�
- btnHome.Text = ResidenceName;
- info.Name = ResidenceName;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍒锋柊鍐呭瓨鐨勪綇瀹呭悕
+ HdlResidenceLogic.Current.EditorHouseByHouseId(info.Id, ResidenceName);
+ //鏇存敼鏄剧ず鐨勫悕瀛�
+ btnHome.Text = ResidenceName;
+ info.Name = ResidenceName;
+ });
}
}
@@ -508,7 +513,10 @@
dialogForm.CloseDialog();
//淇濆瓨浣忓畢
- this.AddNewResidence(textValue);
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.AddNewResidence(textValue);
+ });
});
}
@@ -517,7 +525,7 @@
/// </summary>
/// <param name="ResidenceName"></param>
/// <returns></returns>
- private async void AddNewResidence(string ResidenceName)
+ private void AddNewResidence(string ResidenceName)
{
//妫�娴嬭兘鍚︿繚瀛樹綇瀹�
if (this.CheckIsCanSaveResidence(string.Empty, ResidenceName, false) == false)
@@ -530,8 +538,8 @@
var Pra = new AddResidencePra();
Pra.Name = ResidenceName;
//娣诲姞浣忓畢
- string resultData = await UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
- if (resultData == null)
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/AddHome", false, Pra);
+ if (string.IsNullOrEmpty(resultData) == true)
{
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -541,9 +549,14 @@
var newInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<NewResidenceInfo>>(resultData);
HdlResidenceLogic.Current.AddHouseToMemmory(newInfo[0].Id, ResidenceName);
- //閲嶆柊鍒锋柊鍒楄〃
- this.listView.RemoveAll();
- this.SetResidenceInfo(2);
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //閲嶆柊鍒锋柊鍒楄〃
+ this.listView.RemoveAll();
+ this.SetResidenceInfo(2);
+ });
+
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index ab1221b..948b78c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -24,14 +24,6 @@
/// </summary>
private VerticalFrameControl listBackContr = null;
/// <summary>
- /// 妤煎眰椤哄簭
- /// </summary>
- private List<string> listFloorSort = new List<string>();
- /// <summary>
- /// 鎴块棿椤哄簭
- /// </summary>
- private List<string> listRoomSort = new List<string>();
- /// <summary>
/// 褰撳墠APP鐨勪綇瀹呮ā寮� 0:杩樻病鏈夎缃湁妯″紡 1:妤煎眰妯″紡 2:娌℃湁妤煎眰妯″紡
/// </summary>
private int AppResidenceMode = 0;
@@ -282,23 +274,17 @@
{
//鑾峰彇妤煎眰
var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
- this.listFloorSort.Clear();
- foreach (string keys in dicFloor.Keys)
- {
- listFloorSort.Add(keys);
- }
-
- if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ if (dicFloor.Count == 0)
{
return;
}
HdlThreadLogic.Current.RunMainInThread(() =>
{
- int count = listFloorSort.Count - 1;
- for (int i = 0; i < listFloorSort.Count; i++)
+ int count = dicFloor.Count;
+ foreach (var keys in dicFloor.Keys)
{
- string keys = listFloorSort[i];
- this.AddFloorRow(keys, dicFloor[keys], i != count);
+ count--;
+ this.AddFloorRow(keys, dicFloor[keys], count != 0);
}
//璋冩暣鎺т欢楂樺害
this.AdjustContrlTableHeight();
@@ -366,11 +352,11 @@
Common.Config.Instance.Home.FloorDics.Remove(keys);
if (Common.Config.Instance.Home.CurrentFloorId == keys)
{
- //濡傛灉鍒犻櫎鐨勬槸褰撳墠妤煎眰鐨勮瘽
Common.Config.Instance.Home.CurrentFloorId = string.Empty;
- foreach (string floorId in Common.Config.Instance.Home.FloorDics.Keys)
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+ foreach (var floorId in dicFloor.Keys)
{
- //鎶婄涓�涓ゼ灞侷D缁欏畠
+ //鎶婄涓�涓ゼ灞傝祴鍊肩粰褰撳墠妤煎眰
Common.Config.Instance.Home.CurrentFloorId = floorId;
break;
}
@@ -392,9 +378,6 @@
HdlRoomLogic.Current.RemoveRoom(roomId);
}
Common.Config.Instance.Home.Save();
- //淇濆瓨椤哄簭
- listFloorSort.Remove(keys);
- HdlRoomLogic.Current.SaveFloorSort(listFloorSort);
if (Common.Config.Instance.Home.FloorDics.Count == 0)
{
@@ -423,7 +406,7 @@
this.AdjustContrlTableHeight();
}
//鍒犻櫎妤煎眰鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
};
}
@@ -481,7 +464,6 @@
Common.Config.Instance.Home.Save();
if (Common.Config.Instance.Home.CurrentFloorId == string.Empty)
{
- Common.Config.Instance.Home.CurrentFloorId = keys;
//鍒涘缓绗竴涓柊鐨勬ゼ灞傜殑璇�,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
HdlRoomLogic.Current.RefreshRoomListView();
}
@@ -495,7 +477,7 @@
this.InitFrameTableByMode();
}
//鍒涘缓鎴栬�呬慨鏀规ゼ灞傜殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
}
});
}
@@ -540,12 +522,6 @@
{
//鑾峰彇妤煎眰鐨勬埧闂�
var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty);
- this.listRoomSort.Clear();
- for (int i = 0; i < listRoom.Count; i++)
- {
- this.listRoomSort.Add(listRoom[i].Id);
- }
-
for (int i = 0; i < listRoom.Count; i++)
{
//娣诲姞鎴块棿琛�
@@ -593,7 +569,6 @@
//濡傛灉鏄垎浜殑鎴块棿锛屼笉鑳界紪杈戝拰淇敼
return;
}
-
//缂栬緫
var btnEditor = frameRow.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
@@ -614,9 +589,6 @@
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
{
HdlRoomLogic.Current.RemoveRoom(room.Id);
- //淇濆瓨椤哄簭
- this.listRoomSort.Remove(room.Id);
- HdlRoomLogic.Current.SaveRoomSort(string.Empty, this.listRoomSort);
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
if (listAllRoom.Count <= 1)
@@ -646,7 +618,7 @@
this.AdjustContrlTableHeight();
}
//鍒犻櫎鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
};
}
@@ -658,7 +630,7 @@
/// <summary>
/// 鍒犻櫎浣忓畢
/// </summary>
- public async void DeleteResidence()
+ private void DeleteResidence()
{
//寮�鍚繘搴︽潯
this.ShowProgressBar();
@@ -670,7 +642,7 @@
Pra.HomeId = Common.Config.Instance.Home.Id;
Pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/DelHome", true, Pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -686,7 +658,7 @@
HomeId = Common.Config.Instance.Home.Id,
PrimaryUserId = Common.Config.Instance.Home.MainUserDistributedMark
};
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/SubAccountDelShareHome", false, Pra2);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -725,7 +697,7 @@
Common.Config.Instance.Save();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenterLogic.InitUserCenterMenmoryAndThread(false);
+ UserCenterLogic.InitUserCenterMenmoryAndThread(false);
//鍒犻櫎浣忓畢
HdlResidenceLogic.Current.DeleteHouseMemmory(deleteId);
@@ -748,7 +720,7 @@
/// <param name="latitude">绾害</param>
/// <param name="longitude">缁忓害</param>
/// <param name="addresName">浣嶇疆鍚嶇О</param>
- private async void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
+ private void SaveResidenceAdrress(NormalViewControl btnLocation, double latitude, double longitude, string addresName)
{
//濡傛灉涓嶆槸铏氭嫙浣忓畢,鎵嶆洿鏂颁簯绔�
if (Common.Config.Instance.Home.IsVirtually == false)
@@ -764,7 +736,7 @@
Pra.Longitude = longitude;
//缂栬緫浣忓畢
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("App/EditHome", true, Pra);
if (flage == false)
{
//鍏抽棴杩涘害鏉�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
index 4ed7043..c80a36f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
@@ -157,7 +157,7 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));
foreach (var floorId in dicFloor.Keys)
{
contr.AddRowMenu(floorId, () =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index c470209..7be9dbd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -254,7 +254,7 @@
UserCenterResourse.ResidenceOption.Save();
btnShortCut.IsSelected = false;
//鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勭殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
}
else
@@ -266,7 +266,7 @@
UserCenterResourse.ResidenceOption.Save();
btnShortCut.IsSelected = true;
//鍒涘缓涓婚〉鐨勩�屽畨闃层�嶆嵎寰勭殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
- UserView.UserPage.Instance.RefreshForm = true;
+ UserView.UserPage.Instance.RefreshAllForm = true;
});
}
};
@@ -534,79 +534,59 @@
//浠庤澶囧垪琛ㄤ腑鑾峰彇鍦ㄧ嚎鐘舵��
HdlThreadLogic.Current.RunThread(() =>
{
- //棣栧厛鑾峰彇杩欎簺浼犳劅鍣ㄦ墍鍦ㄧ殑缃戝叧
- var listWay = new List<ZbGateway>();
foreach (var device in listDevice)
- {
- ZbGateway realWay = null;
- //鏄惁瀛樺湪鐪熷疄鐗╃悊缃戝叧
- if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, device.CurrentGateWayId) == false)
- {
- continue;
- }
- listWay.Add(realWay);
- }
- foreach (var zbway in listWay)
{
if (this.Parent == null)
{
//鐣岄潰鍏抽棴
return;
}
- int statu = 0;
- var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
- if (statu != -1)
+ var deviceInfo = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ if (deviceInfo != null)
{
- for (int i = 0; i < list.Count; i++)
- {
- //璁剧疆璁惧鍦ㄧ嚎鐘舵��
- this.ReceiveDeviceStatuPush(list[i]);
- }
+ //璁剧疆璁惧鍦ㄧ嚎鐘舵��
+ this.ReceiveDeviceStatuPush(device, deviceInfo);
}
+ System.Threading.Thread.Sleep(50);
}
- });
+ }, ShowErrorMode.NO);
}
/// <summary>
/// 鎺ュ彈璁惧鍦ㄧ嚎鎺ㄩ��
/// </summary>
/// <param name="device"></param>
- private void ReceiveDeviceStatuPush(CommonDevice device)
+ private void ReceiveDeviceStatuPush(CommonDevice device, CommonDevice.DeviceInfoData deviceInfo)
{
if (this.Parent == null)
{
//鐣岄潰鍏抽棴
return;
}
-
- lock (objOnlineLock)
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ if (this.dicSensorStatuView.ContainsKey(mainkeys) == true)
{
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.dicSensorStatuView.ContainsKey(mainkeys) == true)
+ CommonDevice Loacldevice = Common.LocalDevice.Current.GetDevice(mainkeys);
+ if (Loacldevice == null)
{
- CommonDevice Loacldevice = Common.LocalDevice.Current.GetDevice(mainkeys);
- if (Loacldevice == null)
- {
- return;
- }
- //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- if (Loacldevice.IsOnline == device.IsOnline)
- {
- return;
- }
- //淇濆瓨鐘舵��
- Loacldevice.IsOnline = device.IsOnline;
- Loacldevice.ReSave();
-
- //鍥犱负杩欐槸鎺ㄩ�佽繃鏉ョ殑锛屾垜涓嶄繚璇侀偅涓�鐬棿杩欎釜涓滆タ浼氫笉浼氳绉婚櫎
- var control = this.dicSensorStatuView[mainkeys];
- Application.RunOnMainThread(() =>
- {
- //璁剧疆鎺т欢鐨勫湪绾跨姸鎬佹枃鏈晥鏋�
- bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
- control?.SetOnlineStatu(bolOnline);
- });
+ return;
}
+ //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
+ if (Loacldevice.IsOnline == deviceInfo.IsOnline)
+ {
+ return;
+ }
+ //淇濆瓨鐘舵��
+ Loacldevice.IsOnline = deviceInfo.IsOnline;
+
+ //鍥犱负杩欐槸鎺ㄩ�佽繃鏉ョ殑锛屾垜涓嶄繚璇侀偅涓�鐬棿杩欎釜涓滆タ浼氫笉浼氳绉婚櫎
+ var control = this.dicSensorStatuView[mainkeys];
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁剧疆鎺т欢鐨勫湪绾跨姸鎬佹枃鏈晥鏋�
+ bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
+ control?.SetOnlineStatu(bolOnline);
+ });
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index 8e7a9d2..79e9e3b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -428,10 +428,10 @@
{
listScene.Add(scene);
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
+ var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
index fc4a6f3..6f0377a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedListRoomForm.cs
@@ -144,7 +144,7 @@
btnIconContr.ButtonClickEvent += (sender, e) =>
{
//妤煎眰鑿滃崟
- var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, Language.StringByID(R.MyInternationalizationString.SelectFloor));
+ var contr = new TopRightFloorMenuControl(dicFloor.Count, 2, this.nowSelectFloorId, Language.StringByID(R.MyInternationalizationString.SelectFloor));
foreach (var floorId in dicFloor.Keys)
{
contr.AddRowMenu(floorId, () =>
@@ -282,7 +282,7 @@
int fileCount = this.GetUpLoadRoomData(listRoom, dicDevice, dicScene);
var listCheckFile = new HashSet<string>();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -290,7 +290,7 @@
for (int index = 0; index < listRoom.Count; index++)
{
//鎵ц涓婁紶
- var result = await HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);
+ var result = HdlShardLogic.Current.DoUploadSharedContent(memberShardInfo, listRoom[index], dicDevice[index], dicScene[index], fileCount, listCheckFile);
if (result == false)
{
break;
@@ -300,7 +300,7 @@
this.CloseProgressBar();
//涓嶇鎴愬姛杩樻槸澶辫触,閮藉埛鏂扮晫闈�
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (this.Parent != null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index 5c1287b..419cc54 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -166,8 +166,12 @@
{
continue;
}
- var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
- listScene.Add(sceneUi);
+ try
+ {
+ var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
+ listScene.Add(sceneUi);
+ }
+ catch { }
}
if (listScene.Count == 0)
{
@@ -409,10 +413,10 @@
//纭鍒犻櫎閫夋嫨鐨勫叡浜満鏅拰鍔熻兘锛�
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteShardContentMsg), () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//涓婁紶鏂囦欢
- var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
+ var result = HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, this.lookRoom, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
@@ -449,11 +453,15 @@
}
//浠庡垎浜枃浠朵腑搴忓垪鍖栧洖鏉�
var deviceData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
- if (device != null)
+ try
{
- listDevice.Add(device);
+ var device = ZigBee.Device.CommonDevice.CommonDeviceByByteString(strArry[1], System.Text.Encoding.UTF8.GetString(deviceData));
+ if (device != null)
+ {
+ listDevice.Add(device);
+ }
}
+ catch { }
}
}
return listDevice;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
index b4cd0ff..7feed80 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
@@ -67,10 +67,10 @@
//娓呯┖bodyFrame
this.ClearBodyFrame();
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鑾峰彇鎴愬憳鐨勫叡浜垪琛�
- var result = await HdlShardLogic.Current.GetMemberShardContentListAndSetToLocation(memberShardInfo);
+ var result = HdlShardLogic.Current.GetMemberShardContentListAndSetToLocation(memberShardInfo);
if (result == false)
{
//鏄剧ず閲嶆柊鍔犺浇鐨勭晫闈�
@@ -276,6 +276,7 @@
continue;
}
var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
+ device.Type = (DeviceType)device.DeviceID;
listDevice.Add(device);
}
//鑾峰彇鍏ㄩ儴鍦烘櫙
@@ -291,10 +292,10 @@
listScene.Add(sceneUi);
}
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵ц鍒犻櫎
- var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, room, listDevice, listScene);
+ var result = HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, room, listDevice, listScene);
if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
index 6969e15..2e36d6f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -242,13 +242,7 @@
this.UploadSuggestion(txtInput.Text, txtEmail.Text);
};
-
- var strFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.SuggestionFile);
- if (System.IO.File.Exists(strFile) == false)
- {
- return;
- }
- var data = UserCenterLogic.LoadFileContent(strFile);
+ var data = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.SuggestionFile);
if (data != null)
{
var strNowData = DateTime.Now.ToString("yyyyMMdd");
@@ -277,7 +271,7 @@
/// <param name="email"></param>
private void UploadSuggestion(string strContent, string email)
{
- HdlThreadLogic.Current.RunThread(async() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
var pra = new
{
@@ -287,15 +281,13 @@
OpinionFeedbackType = this.typeMode,
Email = email
};
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("App/AddOpinionFeedback", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("App/AddOpinionFeedback", false, pra);
if (result == true)
{
//淇濆瓨娆℃暟
this.suggestionCount--;
- var strFile = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Common.Config.Instance.Guid, DirNameResourse.SuggestionFile);
- var byteData = System.Text.Encoding.UTF8.GetBytes(this.suggestionCount + DateTime.Now.ToString("yyyyMMdd"));
//鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(strFile, byteData);
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SuggestionFile, this.suggestionCount + DateTime.Now.ToString("yyyyMMdd"));
HdlThreadLogic.Current.RunMain(() =>
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
index 5baf04c..637ea33 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/MessageManagementForm.cs
@@ -68,10 +68,10 @@
/// <summary>
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
- private async void InitMiddleData(bool showReload)
+ private void InitMiddleData(bool showReload)
{
//鑾峰彇鏁版嵁
- var dicData = await this.GetMessageData();
+ var dicData = this.GetMessageData();
if (dicData == null)
{
if (showReload == true)
@@ -324,9 +324,9 @@
{
//纭鍒犻櫎娑堟伅?
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteMessageMsg);
- this.ShowMassage(ShowMsgType.Confirm, msg, async () =>
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- await this.DeleteMsg(recordInfo.Id, frameList, rowControl);
+ this.DeleteMsg(recordInfo.Id, frameList, rowControl);
});
};
}
@@ -348,7 +348,7 @@
if (sender != null)
{
//鏍囪宸茶(涓嶇瀹冩垚鍔熶笉鎴愬姛)
- await this.SetTickIsRead(recordInfo.Id);
+ this.SetTickIsRead(recordInfo.Id);
}
};
}
@@ -361,12 +361,12 @@
/// 鏍囪宸茶
/// </summary>
/// <param name="strId"></param>
- private async Task<bool> SetTickIsRead(string strId)
+ private bool SetTickIsRead(string strId)
{
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.Id = strId;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagMessageMessageCenterItem", true, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagMessageMessageCenterItem", true, pra);
return result;
}
@@ -382,7 +382,7 @@
//纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uUnTipAllMessageMsg), () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -390,7 +390,7 @@
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.TagAllOrClearType = 0;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (result == false)
@@ -420,12 +420,12 @@
/// <param name="strId"></param>
/// <param name="frameList"></param>
/// <param name="rowContr"></param>
- private async Task<bool> DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)
+ private bool DeleteMsg(string strId, FrameListControl frameList, RowLayoutControl rowContr)
{
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.Id = strId;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/DelMessageCenterItem", true, pra);
if (result == false)
{
return false;
@@ -457,7 +457,7 @@
//纭鍒犻櫎鍏ㄩ儴娑堟伅?
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteAllMessageMsg), () =>
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -465,7 +465,7 @@
var pra = new MessageReadStatuPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
pra.TagAllOrClearType = 1;
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("MessageCenter/TagAllOrClearMessageCenter", true, pra);
if (result == false)
{
//鍏抽棴杩涘害鏉�
@@ -552,7 +552,7 @@
/// 鑾峰彇娑堟伅璁板綍
/// </summary>
/// <returns></returns>
- private async Task<Dictionary<string, List<List<MessageRecordInfo>>>> GetMessageData()
+ private Dictionary<string, List<List<MessageRecordInfo>>> GetMessageData()
{
this.dicAllRow = new Dictionary<string, RowLayoutControl>();
var allListData = new List<MessageRecordInfo>();
@@ -562,7 +562,7 @@
//浼犳劅鍣ㄤ笂鎶�
pra.Topic = "/IASInfoReport";
- var dataInfo = await this.GetMessageDataFromDb(pra);
+ var dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -571,7 +571,7 @@
//闂ㄩ攣涓婃姤
pra.Topic = "/Alarms/SendAlarmInform";
- dataInfo = await this.GetMessageDataFromDb(pra);
+ dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -580,7 +580,7 @@
//鎾ら槻
pra.Topic = "/Security/WithdrawMode_Respon";
- dataInfo = await this.GetMessageDataFromDb(pra);
+ dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -589,7 +589,7 @@
//甯冮槻
pra.Topic = "/Security/EnableMode_Respon";
- dataInfo = await this.GetMessageDataFromDb(pra);
+ dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -598,7 +598,7 @@
//閫昏緫瑙﹀彂涓婃姤
pra.Topic = "/Logic/Execute_Respon";
- dataInfo = await this.GetMessageDataFromDb(pra);
+ dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -607,7 +607,7 @@
//鍦烘櫙瑙﹀彂涓婃姤
pra.Topic = "/Scene/Exec_Respon";
- dataInfo = await this.GetMessageDataFromDb(pra);
+ dataInfo = this.GetMessageDataFromDb(pra);
if (dataInfo == null)
{
return null;
@@ -623,10 +623,10 @@
/// </summary>
/// <param name="pra"></param>
/// <returns></returns>
- private async Task<List<MessageRecordInfo>> GetMessageDataFromDb(MessageInfoPra pra)
+ private List<MessageRecordInfo> GetMessageDataFromDb(MessageInfoPra pra)
{
- var result = await UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra);
- if (result == null)
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", true, pra);
+ if (string.IsNullOrEmpty(result) == true)
{
return null;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
index 5043272..f792ccc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
@@ -375,10 +375,10 @@
return;
}
btnTitle.CanClick = false;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
this.ShowProgressBar();
- var result = await HdlBackupLogic.Current.LoadHideOption();
+ var result = HdlBackupLogic.Current.LoadHideOption();
this.CloseProgressBar();
if (result == true)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index 7b002f1..21b346c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -317,7 +317,7 @@
/// 鏇存柊鐢ㄦ埛鍚�
/// </summary>
/// <param name="txtName"></param>
- private async void SaveUserName(TextInputControl txtName, bool showMsg)
+ private void SaveUserName(TextInputControl txtName, bool showMsg)
{
if (UserCenterResourse.UserInfo.UserName == string.Empty)
{
@@ -334,7 +334,7 @@
var pra = new SaveUserNamePra();
pra.UserName = UserCenterResourse.UserInfo.UserName;
- bool result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdateUserName", false, pra);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdateUserName", false, pra);
if (result == false)
{
return;
@@ -403,10 +403,10 @@
/// </summary>
/// <param name="btnUser"></param>
/// <param name="imagePath"></param>
- private async void UpLoadUserIconFile(ImageView btnUser, string imagePath)
+ private void UpLoadUserIconFile(ImageView btnUser, string imagePath)
{
var pra = new { HeadImage = Shared.IO.FileUtils.ReadFile(imagePath) };
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdateHeadImage", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdateHeadImage", false, pra);
if (result == true)
{
UserCenterResourse.UserInfo.UserIconFileChanged = true;
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 960d44d..8503e8e 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -56,16 +56,17 @@
this.ShowLoginLoadView();
CommonPage.Loading.Start();
- UserCenter.HdlThreadLogic.Current.RunThread(async () =>
+ UserCenter.HdlThreadLogic.Current.RunThread(() =>
{
//鐧诲綍
- var loginSuccess = await LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+ var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
+
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
if (loginSuccess == 1 || loginSuccess == 2)
{
- var homes = await UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();
+ var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
- await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
+ UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
ZigBee.Common.Application.Init();
@@ -121,7 +122,7 @@
/// <param name="password">Password.</param>
/// <param name="source">Source.</param>
/// <param name="company">Company.</param>
- public async System.Threading.Tasks.Task<int> LoginByPWDAsync(string account, string password, string source = "", int company = 0)
+ public int LoginByPWDAsync(string account, string password, string source = "", int company = 0)
{
var isLoginSuccess = -1;
var requestObj = new SendDataToServer.LoginObj
@@ -132,7 +133,8 @@
Company = company
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var revertObj = await CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson));
+ //鐧婚檰鎺ュ彛鐗规畩,闇�瑕佸揩涓�鐐硅闂�,璁剧疆3绉掕秴鏃�
+ var revertObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/Login", System.Text.Encoding.UTF8.GetBytes(requestJson), 3);
if (revertObj == null)
{
return 2;
@@ -152,7 +154,7 @@
Config.Instance.LoginDateTime = DateTime.Now;
Config.Instance.LoginToken = revertData.Token;
//涓婃姤璁惧ID
- await CommonPage.Instance.PushRegID();
+ CommonPage.Instance.PushRegID();
isLoginSuccess = 1;
}
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
@@ -161,7 +163,7 @@
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginLocalRegionRes>(revertObj.ResponseData.ToString());
CommonPage.RequestHttpsHost = responseDataObj.RegionServer;
//鍐嶆鐧诲綍
- return await this.LoginByPWDAsync(account, password, source, company);
+ return this.LoginByPWDAsync(account, password, source, company);
}
if (stateCodeStr == "NOTVERIFY")
{
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 86a34af..c7009e5 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -52,7 +52,15 @@
/// <summary>
/// 濡傛灉璁剧疆姝ゅ彉閲忎负true,鍒欏湪鍗曞嚮搴曢儴鑿滃崟鏃�,寮哄埗鏃犳潯浠跺叏閮ㄥ埛鏂�
/// </summary>
- public bool RefreshForm = false;
+ public bool RefreshAllForm = false;
+ /// <summary>
+ /// 鍒锋柊涓婚〉
+ /// </summary>
+ public bool RefreshMainPageForm = false;
+ /// <summary>
+ /// 鍒锋柊鍒嗙被
+ /// </summary>
+ public bool RefreshCategoryForm = false;
#endregion
@@ -66,6 +74,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
Shared.Application.LocationAction += (lon, lat) =>
{
+ //涓婃姤缁忕含搴�
Login.AccountLogic.Instance.ReceiveAppLatAndLon(lon.ToString(), lat.ToString());
};
}
@@ -229,20 +238,20 @@
/// <param name="handClick">鏄惁鏄墜鍔ㄧ偣鍑�</param>
private void BottomMenuClickEvent(MenuSelectEnum selectEnum, bool handClick)
{
- if (this.RefreshForm == false && selectEnum == this.nowSelectMenu && handClick == true)
+ if (this.RefreshAllForm == false && selectEnum == this.nowSelectMenu && handClick == true)
{
//鎵嬪姩鐐瑰嚮鍚屼竴涓彍鍗�,鍒欎笉鍋氬鐞�
return;
}
//濡傛灉寮哄埗鎸囧畾鍒锋柊鐣岄潰鐨勮瘽
- if (this.RefreshForm == true)
+ if (this.RefreshAllForm == true)
{
//鍏ㄩ儴鍒锋柊
this.listForm = new List<EditorCommonForm>() { null, null, null };
this.bodyFrameView.RemoveAll();
- this.RefreshForm = false;
+ this.RefreshAllForm = false;
}
this.nowSelectMenu = selectEnum;
@@ -252,6 +261,13 @@
{
//宸︽粦鑿滃崟鍙�
CommonPage.Instance.IsDrawerLockMode = false;
+ if (this.RefreshMainPageForm == true)
+ {
+ //鍒锋柊涓婚〉
+ listForm[0]?.CloseForm();
+ listForm[0] = null;
+ this.RefreshMainPageForm = false;
+ }
if (listForm[0] == null)
{
var form = new MainPage.HomeMainPageForm();
@@ -265,6 +281,13 @@
{
//宸︽粦鑿滃崟涓嶅彲
CommonPage.Instance.IsDrawerLockMode = true;
+ if (this.RefreshCategoryForm == true)
+ {
+ //鍒锋柊鍒嗙被
+ listForm[1]?.CloseForm();
+ listForm[1] = null;
+ this.RefreshCategoryForm = false;
+ }
if (listForm[1] == null)
{
var form = new Category.CategoryMainForm();
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index e229871..2a5e850 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -31,7 +31,10 @@
{
return;
}
- isInited = true;
+ isInited = true;
+
+ //鍒濆鍖朣ocket
+ FindGateWaySocket.Start();
new System.Threading.Thread(async () =>
{
@@ -93,8 +96,8 @@
}
}
- var broadcastIpAddress = new Shared.Net.NetWiFi().BroadcastIpAddress;
-
+ var broadcastIpAddress = new Shared.Net.NetWiFi().BroadcastIpAddress;
+
if (Shared.Application.IsWifi)
{
if (0 < gateWayList.Count)
@@ -149,11 +152,7 @@
FindGateWaySocket.BeginSend(new System.Net.IPEndPoint(broadcastIpAddress, 7624), broadBytes);
}
}
- catch
- {
- //鍏抽棴Socket,涓嬫鍙戦�佷細鑷姩杩炴帴
- FindGateWaySocket.Stop();
- }
+ catch{}
System.Threading.Thread.Sleep(500);
}
})
@@ -171,7 +170,6 @@
var bytes = new byte[1024];
var len = FindGateWaySocket.busSocket.Receive(bytes, bytes.Length, System.Net.Sockets.SocketFlags.None);
-
if (bytes[43] == 0xA2)
{
//骞挎挱鍥炲缃戝叧鐨勫熀鏈俊鎭鐞�
@@ -279,12 +277,17 @@
}
}
}
+ else
+ {
+ //璋冭瘯鐢�
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
+ {
+ var data33 = Encoding.UTF8.GetString(bytes).Replace("锟�)", string.Empty).TrimStart('\0').TrimEnd('\0');
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, data33);
+ }
+ }
}
- catch
- {
- //鍏抽棴Socket,涓嬫鍙戦�佷細鑷姩杩炴帴
- FindGateWaySocket.Stop();
- }
+ catch{}
}
#endregion
}
@@ -385,10 +388,20 @@
{
try
{
- Start(7624);
- busSocket.BeginSendTo(bytes, 0, bytes.Length, SocketFlags.None, iPEndPoint, new AsyncCallback(asyncEndSend), null);
+ if (IsRunning)
+ {
+ busSocket.BeginSendTo(bytes, 0, bytes.Length, SocketFlags.None, iPEndPoint, new AsyncCallback(asyncEndSend), null);
+ }
+
}
- catch { }
+ catch (Exception ex)
+ {
+ //璋冭瘯鐢�
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "鍙戦�佸紓甯�(BeginSendTo)\r\n" + ex.Message);
+ }
+ }
}
/// <summary>
@@ -401,7 +414,14 @@
{
int bytesSent = busSocket.EndSendTo(iar);
}
- catch { }
+ catch(Exception ex)
+ {
+ //璋冭瘯鐢�
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "寮傛鍙戦�佺粨鏉熷紓甯�(asyncEndSend)\r\n" + ex.Message);
+ }
+ }
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
index 0e9c605..973d822 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -6,8 +6,9 @@
[System.Serializable]
public class Config
{
- static readonly string fileName = "Config.json";
- static Config config;
+ private const string fileName = "Config.json";
+
+ private static Config config = null;
public static Config Instance
{
get
@@ -28,11 +29,11 @@
/// <summary>
/// 璐︽埛鐧诲綍鎴愬姛鏃剁殑鏃堕棿
/// </summary>
- public DateTime LoginDateTime = DateTime.MinValue;
+ public DateTime LoginDateTime = DateTime.MinValue;
/// <summary>
- /// Gets a value indicating whether this <see cref="T:Shared.Common.Config"/> is login.
+ ///
/// </summary>
- /// <value><c>true</c> if is login; otherwise, <c>false</c>.</value>
+ [Newtonsoft.Json.JsonIgnore]
public bool IsLogin
{
get
@@ -40,16 +41,6 @@
return (DateTime.Now - LoginDateTime).Days < 7;
}
}
-
- /// <summary>
- /// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
- /// </summary>
- public int AccountType = 0;
- /// <summary>
- /// 璐︽埛鐧诲綍鎴愬姛鐨勪富ID
- /// </summary>
- public int MasterID = 0;
-
public static void ReFresh()
{
@@ -67,6 +58,11 @@
}
}
+ /// <summary>
+ /// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�(姝ゅ彉閲忛粯璁や负0,骞朵笖涓嶈祴鍊�)
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int AccountType = 0;
/// <summary>
/// 褰撳墠鐧诲綍鐨勫笎鍙�
/// </summary>
@@ -105,12 +101,12 @@
/// 褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public bool TheSameLoginAccount = false;
-
- [Newtonsoft.Json.JsonIgnore]
+ public bool TheSameLoginAccount = false;
+
/// <summary>
/// 褰撳墠甯愬彿鐨凾oken
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string Token
{
get
@@ -136,14 +132,18 @@
}
/// <summary>
- /// 鐧诲綍鏃禩oken
+ /// 鐧诲綍鏃禩oken(鐩墠杩欎笢瑗挎病鐢�)
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string LoginToken = string.Empty;
- public List<string> HomeFilePathList = new List<string> { };
-
public string HomeId = string.Empty;
+ /// <summary>
+ /// 浣忓畢鏂囦欢鍒楄〃
+ /// </summary>
+ public List<string> HomeFilePathList = new List<string>();
+
[Newtonsoft.Json.JsonIgnore]
private House m_Home = null;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs
index 633fda0..4a7371a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Global.cs
@@ -96,118 +96,6 @@
System.IO.Directory.CreateDirectory(path);
}
}
-
- /// <summary>
- /// 鍦ㄥ綋鍓嶄綇瀹呮枃浠跺す涓嬪垱寤轰竴涓┖鐨勬枃浠跺す锛坱z)
- /// </summary>
- /// <param name="directoryName">闇�瑕佸垱寤虹殑鏂囦欢澶瑰悕瀛�</param>
- /// <param name="clear">濡傛灉鏂囦欢澶瑰瓨鍦紝鏄惁闇�瑕佹竻绌烘枃浠跺す</param>
- public static void CreateEmptyDirectory(string directoryName, bool clear = false)
- {
- string creatName = Config.Instance.FullPath;
- creatName = System.IO.Path.Combine(creatName, directoryName);
- if (!System.IO.Directory.Exists(creatName))
- {
- System.IO.Directory.CreateDirectory(creatName);
- }
- else if (clear == true)
- {
- //濡傛灉瀛樺湪锛屽垯娓呯┖鍏ㄩ儴鏂囦欢
- var files = System.IO.Directory.GetFiles(creatName);
- foreach (var file in files)
- {
- System.IO.File.Delete(file);
- }
- }
- }
-
- /// <summary>
- /// 灏嗕俊鎭啓鍏ユ寚瀹氱殑鏂囦欢澶归噷(鏍圭洰褰曚负褰撳墠浣忓畢鐨勬枃浠跺す)(tz)
- /// </summary>
- /// <param name="directoryName">鎸囧畾鐨勬枃浠跺す璺緞</param>
- /// <param name="fileName">鏂囦欢鍚�</param>
- /// <param name="bytes">鍐呭</param>
- public static void WriteFileToDirectoryByBytes(string directoryName, string fileName, byte[] bytes)
- {
- //鍏堝幓鍒涘缓瀹冨惂
- Global.CreateEmptyDirectory(directoryName);
-
- //鎷兼帴璺緞
- string fullName = Config.Instance.FullPath;
- fullName = System.IO.Path.Combine(fullName, directoryName);
- fullName = System.IO.Path.Combine(fullName, fileName);
- //鍐欏叆鍐呭
- Shared.IO.FileUtils.WriteFileByBytes(fullName, bytes);
- }
-
- /// <summary>
- /// 璇诲彇鎸囧畾鐨勬枃浠跺す閲岀殑鎸囧畾鐨勬枃浠�(鏍圭洰褰曚负褰撳墠浣忓畢鐨勬枃浠跺す)(tz)
- /// </summary>
- /// <param name="directoryName">鎸囧畾鐨勬枃浠跺す璺緞</param>
- /// <param name="fileName">鏂囦欢鍚�</param>
- public static byte[] ReadFileByDirectory(string directoryName, string fileName)
- {
- //鎷兼帴璺緞
- string fullName = Config.Instance.FullPath;
- fullName = System.IO.Path.Combine(fullName, directoryName);
- fullName = System.IO.Path.Combine(fullName, fileName);
- if (System.IO.File.Exists(fullName) == false)
- {
- return null;
- }
- return Shared.IO.FileUtils.ReadFile(fullName);
- }
-
- /// <summary>
- /// 绉诲姩鏂囦欢(tz)
- /// </summary>
- /// <param name="oldFile">闇�瑕佺Щ鍔ㄧ殑鏂囦欢(FullName)</param>
- /// <param name="newFile">瑕佺Щ鍔ㄥ埌鐨勪綅缃�(FullName)</param>
- public static void MoveFileToDirectory(string oldFile, string newFile)
- {
- //鍏堝垹闄�
- if (System.IO.File.Exists(newFile) == true)
- {
- System.IO.File.Delete(newFile);
- }
- System.IO.File.Move(oldFile, newFile);
- }
-
- /// <summary>
- /// 灏嗘寚瀹氭枃浠跺す閲岄潰鐨勫叏閮ㄦ枃浠剁Щ鍔ㄥ埌褰撳墠浣忓畢鐨勬枃浠跺す鍐�(tz)
- /// </summary>
- /// <param name="directory"></param>
- /// <param name="deleteDirectory">澶勭悊瀹屼箣鍚庯紝鏄惁鎶婃枃浠跺す鍒犻櫎</param>
- public static void MoveDirectoryFileToHomeDirectory(string directory, bool deleteDirectory = false)
- {
- string rootPath = Config.Instance.FullPath;
- string fulldirectory = System.IO.Path.Combine(rootPath, directory);
-
- if (System.IO.Directory.Exists(fulldirectory) == false)
- {
- return;
- }
-
- var files = System.IO.Directory.GetFiles(fulldirectory);
- var listFile = new List<string>();
- foreach (var file in files)
- {
- var f = file.Substring(fulldirectory.Length + 1);
- listFile.Add(f);
- }
-
- foreach (var file in listFile)
- {
- string oldFile = System.IO.Path.Combine(fulldirectory, file);
- string newFile = System.IO.Path.Combine(rootPath, file);
- //绉诲姩鏂囦欢
- Global.MoveFileToDirectory(oldFile, newFile);
- }
- if (deleteDirectory == true)
- {
- System.IO.Directory.Delete(fulldirectory);
- }
- }
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index cb8f325..0ae3f20 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -85,6 +85,7 @@
/// <para>鎸佺画鏁版嵁涓婃姤(MomentStatus=0 TriggerZoneStatus>=1锛滄姤璀︼紴 TriggerZoneStatus=0锛滃彇娑堟姤璀︼紴)</para>
/// <para>21: Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿欙級</para>
/// <para>22:Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿�</para>
+ /// <para>541 鐞冨瀷绉诲姩浼犳劅鍣�</para>
/// </summary>
public int IasDeviceType;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index f10262e..826613d 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -628,11 +628,11 @@
//璁块棶鎺ュ彛
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
- result1 = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
+ result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
}
else
{
- result1 = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
+ result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
}
if (result1 != null)
{
@@ -662,7 +662,7 @@
return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>>>)(async () =>
{
var pra = new Shared.Phone.UserCenter.MemberListInfoPra();
- string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+ string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
if (result == null)
{
return null;
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
index 38aaeca..2db5d41 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
@@ -13,12 +13,41 @@
}
#region IAS瀹夐槻淇℃伅涓婃姤.
+ /// <summary>
+ /// 涓婁竴娆¤闂甶ASInfo鐨勬椂闂�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ private DateTime oldiASInfoTime = DateTime.Now;
+ /// <summary>
+ /// IAS瀹夐槻淇℃伅涓婃姤
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ private IASInfoData m_iASInfo = null;
/// <summary>
- /// IAS瀹夐槻淇℃伅涓婃姤
+ /// IAS瀹夐槻淇℃伅涓婃姤(杩欎釜涓滆タ30绉掍箣鍚庡氨娓呮帀)
/// <para>褰撳畨闃茶澶囧睘鎬х姸鎬佹敼鍙樻椂鍊欙紙渚嬪涓�姘у寲纰充紶鎰熷櫒妫�娴嬪埌涓�姘у寲纰虫皵浣擄級锛岃澶囧皢涓婃姤灞炴�х姸鎬佸彉鍖栨暟鎹��</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
- public IASInfoData iASInfo;
+ public IASInfoData iASInfo
+ {
+ get
+ {
+ if (m_iASInfo != null && (DateTime.Now - oldiASInfoTime).TotalMilliseconds > 30 * 1000)
+ {
+ //杩欎釜涓滆タ30绉掍箣鍚庡氨娓呮帀
+ m_iASInfo = null;
+ return null;
+ }
+ return m_iASInfo;
+ }
+ set
+ {
+ //璁板綍璧锋洿鏂版椂闂�
+ this.oldiASInfoTime = DateTime.Now;
+ m_iASInfo = value;
+ }
+ }
+
/// <summary>
/// IAS瀹夐槻淇℃伅涓婃姤
/// <para>褰撳畨闃茶澶囧睘鎬х姸鎬佹敼鍙樻椂鍊欙紙渚嬪涓�姘у寲纰充紶鎰熷櫒妫�娴嬪埌涓�姘у寲纰虫皵浣擄級锛岃澶囧皢涓婃姤灞炴�х姸鎬佸彉鍖栨暟鎹��</para>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index dbe28ee..139f2b6 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -2400,6 +2400,11 @@
{
DebugPrintLog($" 鏈湴杩炴帴鎴愬姛_缃戝叧IP:{brokerName}_缃戝叧鏄惁鍔�:{IsEncry}_褰撳墠瀵嗙爜:{Password}");
IsRemote = false;
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴鎴愬姛");
+ }
});
}
@@ -2439,7 +2444,12 @@
}
}
catch (Exception ex)
- {
+ {
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴寮傚父:\r\n" + ex.Message);
+ }
DebugPrintLog($"灞�鍩熺綉閫氳杩炴帴鍑哄紓甯�:{ex.Message}");
}
finally
@@ -2475,9 +2485,7 @@
MainAccountId = Config.Instance.Home.MainUserDistributedMark,
SharedHid = Config.Instance.Home.Id
};
-
- var listNotShow = new List<string>() { "NotSetAgain" };
- var resultData = await Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, listNotShow);
+ var resultData = Shared.Phone.UserCenter.UserCenterLogic.GetByteResponseDataByRequestHttps("App/GetSharedHomeApiControl", false, pra, new List<string> { "NotCheck" });
if (resultData == null)
{
return;
@@ -2498,7 +2506,7 @@
pra2.ReqDto.LoginAccessToken = loginToken;
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(pra2));
- var result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSingleHomeGatewayPagger", bytes, loginToken);
+ var result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSingleHomeGatewayPagger", bytes, loginToken);
if (result != null)
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(Encoding.UTF8.GetString(result));
@@ -2688,7 +2696,7 @@
["PublishPayloadJsonStr"] = "1"
};
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
- result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
+ result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/GetConnMqttInfo", bytes, Config.Instance.Token);
}
else
{
@@ -2705,7 +2713,7 @@
["PublishPayloadJsonStr"] = "1"
};
var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(jsonData));
- result = await CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
+ result = CommonPage.Instance.DoRequestZigbeeHttpsInterface("https://global.hdlcontrol.com/HangZhouHdlCloudApi/EmqMqtt/ShareMemberConnMqttInfo", bytes, Config.Instance.Token);
}
if (result != null)
{
@@ -2882,6 +2890,16 @@
if (Shared.Common.Config.Instance.HomeId == "")
{
return;
+ }
+
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ string text = "杩滅▼鍙戦��:";
+ if (IsRemote == false) { text = "鏈湴鍙戦��:"; }
+ text += topic + "\r\n";
+ text += Encoding.UTF8.GetString(message) + "\r\n";
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, text);
}
if (IsRemote)
@@ -2916,6 +2934,11 @@
{
DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
+ }
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, "鏈湴杩炴帴寮傚父鏂紑");
}
}
}
@@ -3132,6 +3155,14 @@
attrId = topic.Split('/')[5];
}
+ //Log鍐欏叆(璋冭瘯鐢�)
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSendAndReceveDataToFile == 1)
+ {
+ string text = "缃戝叧鍥炲:" + topic + "\r\n";
+ text += message + "\r\n";
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(2, text);
+ }
+
//鍏ㄥ眬鎺ユ敹缃戝叧鎺ㄩ�佺殑鐨勯�昏緫(涓轰簡鎵ц閫熷害,灏藉彲鑳界殑鍒姞鑰楁椂鐨勬搷浣�)
Shared.Phone.UserCenter.HdlGatewayReceiveLogic.Current.GatewayOverallMsgReceive(gatewayID, topic, reportStatus, message);
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index f7b8d43..ab48517 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -46,7 +46,7 @@
/// </summary>
public long GwVersionDate = 0;
/// <summary>
- ///Linux缃戝叧绫诲瀷
+ ///Linux缃戝叧绫诲瀷(涔熷彨缃戝叧闀滃儚绫诲瀷)
/// </summary>
public int LinuxImageType = -1;
/// <summary>
@@ -66,7 +66,7 @@
/// </summary>
public int CoordinatorFirmwareVersion = -1;
/// <summary>
- /// 鍗忚皟鍣ㄩ暅鍍廔D(涔熷彨缃戝叧闀滃儚绫诲瀷)
+ /// 鍗忚皟鍣ㄩ暅鍍廔D
/// </summary>
public int CoordinatorImageId = -1;
/// <summary>
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 524782f..3349e43 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -945,6 +945,15 @@
public readonly static int nightLightSwitch = 5406;
public readonly static int colorTemperature = 5407;
public readonly static int buzzer = 5408;
+ public readonly static int ambientLight = 5409;
+ public readonly static int illuminanceValue = 5410;
+ public readonly static int dark = 5411;
+ public readonly static int bright = 5412;
+ public readonly static int tipIlluminanceValue = 5413;
+ public readonly static int videoIntercom = 5414;
+ public readonly static int dong = 5415;
+ public readonly static int unit = 5416;
+ public readonly static int theOutdoorUnit = 5417;
@@ -2982,7 +2991,7 @@
/// </summary>
public const int uCarbonMonoxideRevealed = 15393;
/// <summary>
- /// 鏈変笉鏄庣墿浣撶粡杩�
+ /// 鏈変汉缁忚繃
/// </summary>
public const int uHadUnKnowObjectPassed = 15394;
/// <summary>
@@ -5801,7 +5810,18 @@
/// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
/// </summary>
public const int uSetDeviceFunctionTypeFail = 16134;
-
+ /// <summary>
+ /// 鑾峰彇鍦烘櫙鍒楄〃澶辫触,缃戝叧鍥炲瓒呮椂
+ /// </summary>
+ public const int uGetSceneListFailAndTimeOut = 16135;
+ /// <summary>
+ /// 闇�閲嶆柊缁戝畾
+ /// </summary>
+ public const int uNeedToRebind = 16136;
+ /// <summary>
+ /// 鍑虹幇鎰忓鎯呭喌,鏁版嵁涓㈠け
+ /// </summary>
+ public const int uUnKnownErrorAndLostData = 16137;
@@ -6031,14 +6051,17 @@
/// </summary>
public const int uAddFangyueEnvironmentPanelMsg = 21021;
/// <summary>
- /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ /// 绐楀笜闈㈡澘 -> 闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
/// </summary>
public const int uAddCurtaunPanelMsg = 21022;
/// <summary>
/// 鍚搁《鐕冩皵浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
/// </summary>
public const int uAddSensorCeilingGasMsg = 21023;
-
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣� -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+ /// </summary>
+ public const int uAddSensorSphericalMotionMsg = 21024;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6221,6 +6244,10 @@
/// 闀滃儚ID涓�20000鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氳壊娓╃伅
/// </summary>
public const int uDeviceModelId20000 = 30044;
+ /// <summary>
+ /// 闀滃儚ID涓�1205鐨勮澶囩殑瀹樻柟鍚嶅瓧锛氱悆鍨嬬Щ鍔ㄤ紶鎰熷櫒
+ /// </summary>
+ public const int uDeviceModelId1205 = 30045;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6423,7 +6450,11 @@
/// <summary>
/// 绠�绾︾幆澧冮潰鏉�
/// </summary>
- public const int uDeviceDirectionName29 = 70028;
+ public const int uDeviceDirectionName29 = 70028;
+ /// <summary>
+ /// 鐞冨瀷绉诲姩浼犳劅鍣�
+ /// </summary>
+ public const int uDeviceDirectionName30 = 70029;
}
}
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index ff57551..7de833c 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -36,6 +36,8 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceTemperatureRowControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectLocalSceneImageForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CurrentDeviceState.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Illumination.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicDveiceStatus.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\AddDeviceView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\Addview.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\CompleteView.cs" />
@@ -55,6 +57,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\RoomAndDeviceView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SkipView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SoneLogicList.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\VideoIntercom\VideoMachine.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountForgetPWD.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\AccountLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegister.cs" />
@@ -62,7 +65,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountResetPWDSuccess.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Controls\PhoneEmailSelectControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneEmailForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneZone.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceAcDetailCardMethord.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectFloorForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectHouseForm.cs" />
@@ -72,7 +74,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneCategoryView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectTime.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectZone.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\TopFrameLayout.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddLogicPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddScenePage.cs" />
@@ -178,6 +179,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceDoorLockLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceOtherLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlExperienceAccountLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlFileLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayBackupLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayUpdateLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlLogLogic.cs" />
@@ -222,6 +224,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorInfraredDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPirDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPMTwoPointFiveForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorSphericalMotionDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorTemperatureHumidityForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorWaterDirectionForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Light\MiniNightLightFunctionSettionForm.cs" />
@@ -469,7 +472,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\UserLoginRes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\SendDataToServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\Room.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ListRoomViewFrom.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\LeftListRoomViewFrom.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\SelectLocalRoomImageForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressBar.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SearchEditText.cs" />
--
Gitblit v1.8.0