From 5b77d9d57a6cddb474a66ca54401ad5ab0892db3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 十一月 2022 14:23:42 +0800
Subject: [PATCH] Merge branch 'dev--wxr' into LcSdkV1
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 7e79081..986ef9c 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -8,7 +8,6 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Shared;
-using Com.Hdl;
namespace HDL_ON.UI
{
@@ -190,12 +189,14 @@
//鏇存柊閾炬帴鐘舵�乮con棰滆壊
- int ddd = 0;
#if DEBUG
+ int ddd = 0;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
- Com.Hdl.HDLToDaHai.InitApplication(Shared.Application.Activity.Application);
- Com.Hdl.HDLToDaHai.OpneActivity(Shared.Application.Activity);
+ //827a98c98da7469b8bc19bb6a3c7651906
+ //St_00009073b431d8b2490c9df0c5cb0e73
+ Com.Hdl.HdlToLc.InitData(Shared.Application.Activity,false, "827a98c98da7469b8bc19bb6a3c7651906");
+ Com.Hdl.HdlToLc.OpenActivity();
};
#endif
@@ -701,7 +702,6 @@
}
else //鍏朵粬璁惧
{
-
var btnbg = new Button()
{
UnSelectedImagePath = "Collection/Functionbg.png",
@@ -711,8 +711,6 @@
functionView.AddChidren(btnbg);
LoadDeviceFunctionDiv(functionView, function);
-
-
if (SPK.ArmSensorSpkList().Contains(function.spk))
{
btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
@@ -720,7 +718,6 @@
}
}
index++;
-
}
if (index == 0)
@@ -905,7 +902,7 @@
};
- if (function.spk == SPK.SenesorMegahealth)
+ if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1118,7 +1115,7 @@
}
- else if (function.spk == SPK.SenesorMegahealth)
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
//btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
//btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1134,6 +1131,11 @@
btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
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
@@ -1177,7 +1179,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);
}
@@ -1235,11 +1237,11 @@
var btnLogo = new Button()
{
- Y = Application.GetRealWidth(85),
+ Y = Application.GetRealHeight(65),
UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
Width = Application.GetRealWidth(80),
- Height = Application.GetRealWidth(37),
+ Height = Application.GetRealHeight(37),
};
view.AddChidren(btnLogo);
--
Gitblit v1.8.0