From c1cb2d8c6034a2ee7aa8a5710bba15b14f76cebc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 八月 2023 18:54:31 +0800
Subject: [PATCH] 2023年08月18日18:54:22
---
HDL_ON/Entity/Function/Scene.cs | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index a7ac909..fdf195b 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -95,7 +95,7 @@
/// <summary>
/// 浜戠oss瀛樺偍鍥剧墖鐨勮矾寰�
/// </summary>
- public string image = "";
+ public string image = "Intelligence/Gallery/scenebg1.png";
///// <summary>
///// 鍦烘櫙鑳屾櫙
@@ -112,6 +112,10 @@
//{
// return image;
//}
+ if(image == "")
+ {
+ image = "Intelligence/Gallery/scenebg1.png";
+ }
if (image.Contains("Intelligence/Gallery/scenebg"))
{
@@ -119,15 +123,12 @@
}
else
{
- var sceneImageInfo = OssSceneImages.Find((obj) => obj.defaultIconName == image);
+ var sceneImageInfo = OssSceneImages.Find((obj) => obj.defaultIconUrl == image);
if (sceneImageInfo != null)
{
- return sceneImageInfo.defaultIconName;
+ return sceneImageInfo.localUrl;
}
- else
- {
- return "Intelligence/Gallery/scenebg1.png";
- }
+ return image;
}
}
set
@@ -155,51 +156,61 @@
new SceneImageInfo
{
defaultIconName = "scenebg1",
- defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/781c397f-611a-48a2-a3ed-2520ffb971bb.png"
+ defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/781c397f-611a-48a2-a3ed-2520ffb971bb.png",
+ localUrl = "Intelligence/Gallery/scenebg1.png",
},
new SceneImageInfo
{
defaultIconName = "scenebg2",
+ localUrl = "Intelligence/Gallery/scenebg2.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/be2a7c63-a6c0-427a-bb6d-f5c06f5b2f05.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg3",
+ localUrl = "Intelligence/Gallery/scenebg3.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/5d801aca-03fb-4ef3-88ec-75ade3aa1c94.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg4",
+ localUrl = "Intelligence/Gallery/scenebg4.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/a205306c-4fcd-4ea1-8e88-e84282dc0d54.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg5",
+ localUrl = "Intelligence/Gallery/scenebg5.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/93a0acdc-14be-4776-a9fd-e0fc6f13c909.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg6",
+ localUrl = "Intelligence/Gallery/scenebg6.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/45074923-2227-422a-be33-e37e6c3f9d23.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg7",
+ localUrl = "Intelligence/Gallery/scenebg7.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/28b3e459-041e-4ea1-9ff9-57053c5357f4.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg8",
+ localUrl = "Intelligence/Gallery/scenebg8.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/d470b979-cc06-4701-a2bd-7301856c9195.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg9",
+ localUrl = "Intelligence/Gallery/scenebg9.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/1a130d03-86b2-4174-b986-6f6c312a959f.png"
},
new SceneImageInfo
{
defaultIconName = "scenebg10",
+ localUrl = "Intelligence/Gallery/scenebg10.png",
defaultIconUrl = "http://hdl-hz-prod.oss-cn-hangzhou.aliyuncs.com/20/2022/07/54c1c7ab-9b63-4487-a77d-d5d3dadd9801.png"
}
};
@@ -549,6 +560,10 @@
private Function ConvertFunctionObject()
{
var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if(localFunction == null)
+ {
+ localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ }
return localFunction;
}
@@ -613,12 +628,17 @@
var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
if (perAngle != null)
{
- sceneFunctionInfo += " " + perState.value + "掳";
+ sceneFunctionInfo += " " + perAngle.value + "掳";
}
return sceneFunctionInfo;
}
-
+ /// <summary>
+ /// 璁惧
+ /// 鍦烘櫙 =scene
+ /// 缇ゆ帶=5
+ /// </summary>
+ public string type = "0";
}
/// <summary>
@@ -652,7 +672,7 @@
text = Language.StringByID(StringId.Brightness);
break;
case FunctionAttributeKey.RGB:
- text = Language.StringByID(StringId.ColorValue);
+ text = "RGB";// Language.StringByID(StringId.ColorValue);
break;
case FunctionAttributeKey.Mode:
text = Language.StringByID(StringId.Mode);
@@ -681,22 +701,26 @@
case "angle":
text = Language.StringByID(StringId.Angle);
break;
+ case "security":
+ text = Language.StringByID(StringId.DeploymentStatus);
+ break;
}
return text;
}
+ public string UintString = "";
/// <summary>
/// 灞炴�у�煎崟浣�
/// </summary>
- public string GetUintString(string inputKey = "")
+ public string GetUintString()
{
+ if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
+ {
+ return UintString;
+ }
var us = "";
var swithchString = key;
- if (!string.IsNullOrEmpty(inputKey))
- {
- swithchString = inputKey;
- }
switch (swithchString)
{
case FunctionAttributeKey.SetTemp:
@@ -732,13 +756,18 @@
string text = "";
switch (key)
{
+ case FunctionAttributeKey.Security:
+ text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
+ break;
case FunctionAttributeKey.OnOff:
+ case FunctionAttributeKey.Colorful:
text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
break;
case FunctionAttributeKey.SetTemp:
case FunctionAttributeKey.RoomTemp:
case FunctionAttributeKey.Brightness:
case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.CCT:
case FunctionAttributeKey.Angle:
int outT = 0;
int.TryParse(catchString, out outT);
@@ -865,6 +894,7 @@
{
public string defaultIconName;
public string defaultIconUrl;
+ public string localUrl;
}
--
Gitblit v1.8.0