From 320d7cc8feb394d0ce3db2ec1d01593b554d990f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:57:13 +0800
Subject: [PATCH] 2020-12-23 1.更新
---
HDL_ON/Entity/Function/Scene.cs | 134 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index b1ace2a..a369fa7 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -35,7 +35,7 @@
/// <summary>
/// 浜戠鍞竴ID
/// </summary>
- public string userSceneId = "";
+ public string userSceneId = null;
/// <summary>
/// 鍦烘櫙sid
/// </summary>
@@ -63,37 +63,11 @@
/// <summary>
/// 寤舵椂
/// </summary>
- public int delay = 0;
+ public string delay = "0";
/// <summary>
- /// 寤舵椂鏄剧ず鐨勬枃鏈�
+ /// 鍦烘櫙鐨勬渶濂戒竴娆℃墽琛屾椂闂�
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string delayText
- {
- get
- {
- string text = "";
- switch (delay)
- {
- case 0:
- text = Language.StringByID(StringId.NoDelay);
- break;
- case 30:
- text = "30s";
- break;
- case 60:
- text = "1min";
- break;
- case 120:
- text = "2min";
- break;
- case 300:
- text = "5min";
- break;
- }
- return text;
- }
- }
+ public string LastExecutionTime = "";
/// <summary>
/// 鍦烘櫙鍒嗙粍
@@ -223,7 +197,7 @@
}
if (roomNameList == "" )
{
- roomNameList = Shared.Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Shared.Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
@@ -237,6 +211,51 @@
get
{
return "SceneData_" + sid;
+ }
+ }
+ /// <summary>
+ /// 鍦烘櫙鎵ц\鍊掕鏃�
+ /// </summary>
+ /// <param name="btnShowDelay"></param>
+ public void SceneCountDown(Button btnShowDelay)
+ {
+ //鍦烘櫙姝ｅ湪鍊掕鏃舵墽琛屼腑
+ if (LastExecutionTime != "" && Convert.ToDouble(LastExecutionTime) + Convert.ToDouble(delay) > Convert.ToDouble(Utlis.GetTimestamp(false)))
+ {
+ int time = 0;
+ int.TryParse(Convert.ToInt32(
+ Convert.ToDouble(LastExecutionTime) + Convert.ToDouble(delay) - Convert.ToDouble(Utlis.GetTimestamp(false))
+ ).ToString(), out time);
+ if (time > 0)
+ {
+ new System.Threading.Thread(() =>
+ {
+ if (time > 0)
+ {
+ while (time > 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (time > 60)
+ {
+ btnShowDelay.Text = (time / 60).ToString() + "min" + time % 60 + "s";
+ }
+ else
+ {
+ btnShowDelay.Text = time.ToString() + "s";
+ }
+ });
+ System.Threading.Thread.Sleep(1000);
+ time--;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ btnShowDelay.Text = "";
+ });
+ }
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.BelowNormal }.Start();
+ }
}
}
@@ -255,6 +274,44 @@
Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
MainPage.Log($"Save Scene Data : {savePath}");
}
+ }
+ /// <summary>
+ /// 鏀惰棌鍦烘櫙
+ /// </summary>
+ /// <returns></returns>
+ public string CollectScene()
+ {
+ var pm = new HttpServerRequest();
+ if (this.collect)
+ {
+ var revPack = pm.CollectScene(this.userSceneId);
+ return revPack;
+ }
+ else
+ {
+ var revPack = pm.CancelCollectScene(this.userSceneId);
+ return revPack;
+ }
+ }
+
+ /// <summary>
+ /// 缂栬緫鍦烘櫙
+ /// </summary>
+ public string EditScene()
+ {
+ var pm = new HttpServerRequest();
+ var revPack = pm.EditScene(this);
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var scenes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
+ var tempScene = scenes.Find((obj) => obj.sid == sid);
+ if (tempScene != null)
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ }
+ }
+ return revPack.Code;
}
/// <summary>
@@ -277,20 +334,7 @@
return revPack.Code;
}
- /// <summary>
- /// 娣诲姞鍦烘櫙
- /// </summary>
- public string AddScene()
- {
- var pm = new HttpServerRequest();
- var revPack = pm.AddScene(this);
- if (revPack.Code == StateCode.SUCCESS)
- {
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
- }
- return revPack.Code;
- }
+
/// <summary>
/// 涓婁紶鏁版嵁鍒颁簯绔�
--
Gitblit v1.8.0