From f345087dbefecef9146fdb13481cb9ee3320d576 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 11:46:28 +0800
Subject: [PATCH] 20201223-2
---
HDL_ON/Entity/FunctionList.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index aaacb3c..7adfaaf 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
+using HDL_ON.Common;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
using Shared;
@@ -371,7 +372,7 @@
}
else
{
- Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
return pack.Code;
}
@@ -647,7 +648,7 @@
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
- public string AddScene(Scene scene,out Scene result)
+ public string AddScene(Scene scene, out Scene result)
{
Scene tempScene = null;
var pm = new HttpServerRequest();
@@ -657,13 +658,46 @@
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
- Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ result = tempScene;
}
- result = tempScene;
+ else
+ {
+ result = tempScene;
+ }
return revPack.Code;
}
#endregion
+ #region 鏀惰棌鍔熻兘
+
+ /// <summary>
+ /// 鏀惰棌鍦烘櫙
+ /// </summary>
+ public string CollectScene(Scene scene)
+ {
+ var result = "";
+ if (scene.collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(scene.userSceneId).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(scene.userSceneId).Code;
+ }
+
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ }
+
+ return result;
+ }
+
+ #endregion
+
+
#region 鍔熻兘鏂囨湰鐩稿叧
/// <summary>
/// 灞炴�у悕绉版樉绀烘枃鏈�
--
Gitblit v1.8.0