From 1cd93851bde6ec19c07f1445899a76ab0dfa507d Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 13 四月 2023 16:01:53 +0800
Subject: [PATCH] 1.增加推送判断是否加载了类的方法 2.修改launch screen引用 3.去掉门锁测试环境appkey逻辑
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 2a74a67..d6bf43f 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -39,7 +39,7 @@
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- if (titleId == StringId.Lights && !DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
Action action = () =>
{
@@ -142,6 +142,9 @@
if (titleId == StringId.Lights)
{
functionList.AddRange(FunctionList.List.GetLightList());
+ functionList.AddRange(FunctionList.List.groupControls);
+
+
var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
foreach (var scene in lightScene)
@@ -255,7 +258,7 @@
}
if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -272,7 +275,7 @@
}
else if (function.spk == SPK.IpCam_Imou)
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -289,7 +292,7 @@
}
else
{
- var functionDiv = new FunctionControlZone(function)
+ var functionDiv = new FunctionControlZone(function,null)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -314,12 +317,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
--
Gitblit v1.8.0