From e89fc7322f0199a9d46ec70ae850ab1a41b0fe3e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 13:12:41 +0800
Subject: [PATCH] 2020-12-19 1.1.iOS和Android 获取天气失败问题，修复调整处理。 2.Android增加网络监听事件，和iOS封装统一监听处理接口。
---
HDL_ON/Entity/Function/Scene.cs | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
old mode 100644
new mode 100755
index b1ace2a..fba530b
--- 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>
/// 鍦烘櫙鍒嗙粍
@@ -223,7 +223,7 @@
}
if (roomNameList == "" )
{
- roomNameList = Shared.Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Shared.Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
@@ -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>
/// 淇敼鍦烘櫙
@@ -277,20 +315,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