From af224fed5dea064e306a0591dcd080655e38ec18 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十一月 2022 17:08:02 +0800
Subject: [PATCH] 光伏界面更新，大华摄像头跨平台界面更新
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 064bc66..ec6a2eb 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -189,8 +189,8 @@
//鏇存柊閾炬帴鐘舵�乮con棰滆壊
- int ddd = 0;
#if DEBUG
+ int ddd = 0;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
@@ -699,7 +699,6 @@
}
else //鍏朵粬璁惧
{
-
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -709,8 +708,6 @@
functionView.AddChidren(btnbg);
LoadDeviceFunctionDiv(functionView, function);
-
-
if (SPK.ArmSensorSpkList().Contains(function.spk))
{
btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
@@ -718,7 +715,6 @@
}
}
index++;
-
}
if (index == 0)
@@ -1133,6 +1129,11 @@
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
}
+ else if (function.spk == SPK.IpCam_Imou)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ }
else
{
@@ -1175,7 +1176,7 @@
btnIcon.MouseUpEventHandler = skipControlPageEvent;
btnState.MouseUpEventHandler = skipControlPageEvent;
//涓嶉渶瑕佹洿鏂扮姸鎬佺殑鍔ㄨ兘鍒楄〃
- if(!SPK.NotStatusSpkList.Contains(function.spk))
+ if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
{
UpdataFunctionStates(function);
}
--
Gitblit v1.8.0