From f96d6e7fb045f2be98300ada72c1c76f726005eb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 16 十二月 2020 15:33:02 +0800
Subject: [PATCH] 2020-12-16 1.面容指纹解锁开关，通过数字验证问题修复。
---
HDL_ON/DAL/DriverLayer/Control.cs | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 9d0256a..4c86695 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -77,7 +77,12 @@
if (value)
{
MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
- FunctionList.List.ReadAllFunctionStatus();
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(1000);
+ FunctionList.List.ReadAllFunctionStatus();
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
}
}
}
@@ -214,13 +219,16 @@
/// </summary>
public void ControlScene(Scene scene)
{
- if(myUdp!=null)
- {
- myUdp.ControlBusScenes(scene);
- }
- if(myTcpClient!= null)
+ if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
{
ControlAProtocolScene(scene);
+ }
+ else
+ {
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ myUdp.ControlBusScenes(scene);
+ }
}
}
@@ -347,15 +355,33 @@
//}
/// <summary>
- /// 鎺у埗a鍗忚鍦烘櫙
+ /// a鍗忚鎺у埗鍦烘櫙
/// </summary>
/// <param name="scene"></param>
static void ControlAProtocolScene(Scene scene)
{
- var sendSidObj = new AProtocolSendingObject();
- sendSidObj.time_stamp = "";
- sendSidObj.type = "device_sid";
- sendSidObj.command = "get_list_response";
+ if (Ins.IsRemote)
+ {
+ var pm = new HDL_ON.DAL.Server.HttpServerRequest();
+ pm.ExecuteScene(scene.userSceneId);
+ }
+ else
+ {
+ Dictionary<string, string> keys = new Dictionary<string, string>();
+ keys.Add("sid", scene.sid);
+ var aLinkData = new AlinkReadFunctionStatusObj()
+ {
+ id = Ins.msg_id.ToString(),
+ objects = new List<Dictionary<string, string>>()
+ {
+ keys
+ },
+ time_stamp = Utlis.GetTimestamp()
+ };
+ var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
+ var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson);
+ Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ }
}
/// <summary>
/// 杞崲閫氳鏁版嵁
--
Gitblit v1.8.0