From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL-ON_Android/HDL-ON_Android.csproj | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 69f535d..68b87db 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -400,8 +400,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorfulBar.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_blue.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\GroupControl_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" />
<AndroidAsset Include="Assets\h5\index.html" />
<AndroidAsset Include="Assets\h5\static\index.63b34199.css" />
<AndroidAsset Include="Assets\h5\static\images\coal-save-ic.png" />
@@ -432,6 +431,32 @@
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockUserManager.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\groupControl.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\SeriesIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\peephole.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securityipcamez.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\FaceUnlockImage.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\TouchUnlcokImage.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\HomePagebg.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
--
Gitblit v1.8.0