From 1026814d931de92f0da5f15a58870565a94100e0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:37:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 569f447..173cb69 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -70,33 +70,36 @@
//LoadFunctionRow(sceneFunction.localFunction.trait_on_off);
//switch (sceneFunction.localFunction.functionType)
//{
- // case FunctionType.AC:
+ // case SPK.AcStandard:
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp"));
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan"));
// break;
- // case FunctionType.FloorHeating:
+ // case SPK.FloorHeatStandard:
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp"));
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode"));
// break;
- // case FunctionType.Curtain:
+ // case SPK.CurtainSwitch:
// //鏃犳搷浣�
// break;
- // case FunctionType.MotorCurtain:
- // case FunctionType.RollingShutter:
+ // case SPK.CurtainTrietex:
+ // case SPK.CurtainRoller:
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "percent"));
// break;
- // case FunctionType.Relay:
+ // case SPK.LightSwitch:
// //鏃犳搷浣�
// break;
- // case FunctionType.Dimmer:
- // case FunctionType.RGB:
+ // case SPK.LightDimming:
+ // case SPK.LightRGB:
// LoadFunctionRow(sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness"));
// break;
//}
- //鍔犺浇寤舵椂Row
- LoadDelayRow();
+ if (DB_ResidenceData.Instance.GatewayType != 0)
+ {
+ //鍔犺浇寤舵椂Row
+ LoadDelayRow();
+ }
var bottomView = new FrameLayout()
{
@@ -317,12 +320,18 @@
sceneFunction.delay = obj;
btnDelayInfo.Text = FunctionList.List.GetDelayText(obj);
};
- new PublicAssmebly().SetSceneDelayDialog(action,sceneFunction.delay);
+ Dictionary<string, string> items = new Dictionary<string, string>();
+ items.Add("30", "30s");
+ items.Add("60", "1min");
+ items.Add("120", "2min");
+ items.Add("300", "5min");
+ new PublicAssmebly().SetSceneDelayDialog(items,action,sceneFunction.delay);
};
#endregion
}
+
#endregion
#region 灞炴�ч�夋嫨寮圭獥
--
Gitblit v1.8.0