From 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 23 九月 2021 15:24:01 +0800
Subject: [PATCH] 主页刷新优化
---
HDL_ON/Entity/Function/Scene.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index b9ecb02..b9d9039 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -77,17 +77,24 @@
public string group = "1";
/// <summary>
/// 鍦烘櫙绫诲瀷
+ /// 0:鏅��
+ /// 1:鐢靛奖
+ /// 2:璋冨厜
/// </summary>
public SceneType sceneType = SceneType.OrdinaryScenes;
/// <summary>
/// 鏀惰棌鏍囪
/// </summary>
public bool collect = false;
+ /// <summary>
+ /// 鏄惁鍏佽鍒犻櫎
+ /// </summary>
+ public bool can_delete = true;
/// <summary>
/// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
/// </summary>
- public string userId = "";
+ public string userId = UserInfo.Current.ID;
///// <summary>
///// 鍦烘櫙鑳屾櫙
@@ -542,10 +549,15 @@
/// <summary>
/// 灞炴�у�煎崟浣�
/// </summary>
- public string GetUintString()
+ public string GetUintString(string inputKey = "")
{
var us = "";
- switch (key)
+ var swithchString = key;
+ if(!string.IsNullOrEmpty(inputKey))
+ {
+ swithchString = inputKey;
+ }
+ switch (swithchString)
{
case FunctionAttributeKey.SetTemp:
case FunctionAttributeKey.RoomTemp:
@@ -581,6 +593,10 @@
case FunctionAttributeKey.RoomTemp:
case FunctionAttributeKey.Brightness:
case FunctionAttributeKey.Percent:
+ int outT = 0;
+ int.TryParse(catchString,out outT);
+ if (outT < 0)
+ catchString = "0";
if (catchString == "")
{
catchString = "0";
--
Gitblit v1.8.0