From 288a6f34fde9853721ca48ed6cc23bb59967bf95 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 18 九月 2023 19:12:53 +0800
Subject: [PATCH] 2023年09月18日19:12:51
---
HDL-ON_Android/HDL-ON_Android.csproj | 1 +
HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png | 0
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 2 +-
HDL-ON_iOS/HDL-ON_iOS.csproj | 1 +
HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png | 0
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs | 1 -
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 2 ++
7 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png
new file mode 100644
index 0000000..3f5db62
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 9a632bf..c6a2366 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -605,6 +605,7 @@
<AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
<AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
<AndroidAsset Include="Assets\Phone\Collection\GatewayOnlineTipIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f76fc85..6e85bb0 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1754,6 +1754,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png
new file mode 100644
index 0000000..3f5db62
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/AksFunctionBg.png
Binary files differ
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 2257bfa..2eb8498 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -1524,7 +1524,7 @@
else if (function.spk == SPK.AvZkAiks)
{
//涓轰簡鍘绘帀寮�鍏虫寜閽�
- //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.UnSelectedImagePath = "AksIcon/yingyinzhongkong1.png";
}
//else if (function.spk == SPK.GroupControl)
//{
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 66b07f4..637399a 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1221,6 +1221,8 @@
};
break;
case ShowFunction.Aks:
+
+ btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
//鍩冨厠鏂奖闊充腑鎺�
btnName.TextID = StringId.jiatingyingyuan;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
index ae167b0..58ad700 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -154,7 +154,6 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
- this.Tag = "Cancel";
btnImage.Tag = this.Tag;
btnName.Tag = this.Tag;
--
Gitblit v1.8.0