From 0e7881aa010ff350d04895a0687ffb7d5ca46168 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 13:09:16 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/Entity/Function/Scene.cs | 100 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 69 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index b1ace2a..207a844 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -63,37 +63,37 @@
/// <summary>
/// 寤舵椂
/// </summary>
- public int 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 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;
+ // }
+ //}
/// <summary>
/// 鍦烘櫙鍒嗙粍
@@ -256,6 +256,44 @@
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>
/// 淇敼鍦烘櫙
--
Gitblit v1.8.0