From 6692d867a0876b014be3cbd64bc3a237a026dc2d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 18 十月 2022 09:57:15 +0800 Subject: [PATCH] 修改安卓隐私确认弹窗,隐私协议英文的问题 --- HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs index dbba017..afe7efb 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs @@ -446,6 +446,14 @@ } } } + else if(function.spk == SPK.SensorHelp) + { + var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus); + if(tempStatus != null) + { + state = tempStatus.curValue.ToString() == "alarm"; + } + } else { state = function.trait_on_off.curValue.ToString() == "on"; @@ -466,7 +474,14 @@ { if (function.spk != SPK.LightSwitch) { - btn.Text = function.lastState; + if (function.spk == SPK.SensorHelp) + { + btn.TextID = StringId.InAlarming; + } + else + { + btn.Text = function.lastState; + } } } } -- Gitblit v1.8.0