From e3f3f62315a5789cd812b96954b67bffda4a0f5a Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 16:33:55 +0800
Subject: [PATCH] 金辉项目，萤石摄像头更新
---
HDL_ON/DAL/DriverLayer/Control.cs | 712 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 456 insertions(+), 256 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 7663b04..ae081bc 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;
@@ -25,6 +25,8 @@
public class Control
{
+
+
static Control _control;
public static Control Ins
{
@@ -48,35 +50,41 @@
return _msg_id++;
}
}
- /// <summary>
- /// 鑾峰彇13浣嶆椂闂存埑
- /// </summary>
- /// <returns></returns>
- public string Get_TimeStamp()
- {
- long t = DateTime.Now.Ticks / 10000;
- return t.ToString();
- }
+ ///// <summary>
+ ///// 鑾峰彇13浣嶆椂闂存埑
+ ///// </summary>
+ ///// <returns></returns>
+ //public string Get_TimeStamp()
+ //{
+ // long t = DateTime.Now.Ticks / 10000;
+ // return t.ToString();
+ //}
- bool _gatewayOnline = false;
/// <summary>
- /// 缃戝叧鏄惁鍦ㄧ嚎
+ /// 鏄惁鎼滅储鏈湴缃戝叧鎴愬姛
/// </summary>
- public bool GatewayOnline {
+ public bool IsSearchLocalGatewaySuccessful = false;
+
+ bool _GatewayOnline_Local = false;
+ /// <summary>
+ /// 缃戝叧鍦ㄧ嚎-灞�鍩熺綉
+ /// </summary>
+ public bool GatewayOnline_Local
+ {
get
{
- return _gatewayOnline;
+ return _GatewayOnline_Local;
}
set
{
- if (_gatewayOnline != value)
+ if (_GatewayOnline_Local != value)
{
- _gatewayOnline = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- UI.HomePage.LoadEvent_CheckLinkStatus();
+ _GatewayOnline_Local = value;
if (value)
{
- MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ MainPage.Log($"缃戝叧灞�鍩熺綉鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
System.Threading.Thread.Sleep(1000);
@@ -84,30 +92,79 @@
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
}
+ else
+ {
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ }
}
}
}
+ bool _GatewayOnline_Cloud = false;
/// <summary>
- /// 缃戝叧閫氳ID
+ /// 缃戝叧鍦ㄧ嚎-浜戠
/// </summary>
- public string GatewayId ="";
-
- bool _isRemote = false;
- /// <summary>
- /// 鏄惁涓鸿繙绋嬭繛鎺�
- /// </summary>
- public bool IsRemote {
+ public bool GatewayOnline_Cloud
+ {
get
{
- return _isRemote;
+ return _GatewayOnline_Cloud;
}
set
{
- _isRemote = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
+ if (_GatewayOnline_Cloud != value)
+ {
+ _GatewayOnline_Cloud = value;
+ if(GatewayOnline_Local)
+ {
+ return;
+ }
+ if (value)
+ {
+ if (DB_ResidenceData.Instance.HomeGateway == null)
+ {
+ return;
+ }
+ if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(3000);
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.GetGatewayInfo();
+ })
+ { IsBackground = true }.Start();
+ return;
+ }
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(1000);
+ FunctionList.List.ReadAllFunctionStatus();
+ })
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+ }
+ else
+ {
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ }
+ }
}
}
+
+
+ /// <summary>
+ /// 缃戝叧閫氳ID
+ /// </summary>
+ public string GatewayId = "";
+
+ /// <summary>
+ /// 鏄惁涓鸿繙绋嬭繛鎺�
+ /// </summary>
+ //public bool IsRemote = false;
/// <summary>
/// 閫氳鍦板潃IP
/// </summary>
@@ -123,7 +180,7 @@
/// <summary>
/// 鏈湴udp
/// </summary>
- public Control_Udp myUdp = null;
+ public Control_Udp myUdp1 = null;
/// <summary>
/// 閫氳鏂瑰紡
@@ -144,11 +201,6 @@
/// </summary>
public void OpenUdp(int port)
{
- if (myUdp == null)
- {
- myUdp = new Control_Udp();
- }
-
UdpSocket._BusSocket.Start(port);
}
/// <summary>
@@ -156,10 +208,6 @@
/// </summary>
public void CloseUdp()
{
- if (myUdp != null)
- {
- myUdp = null;
- }
UdpSocket._BusSocket.Stop();
}
@@ -175,42 +223,58 @@
}
}
- ///// <summary>
- ///// 鏀瑰彉閫氳鏂瑰紡
- ///// </summary>
- //public void ChangeCommunicationMode(CommunicationMode communicationMode)
- //{
- // this.communicationMode = communicationMode;
- //}
-
/// <summary>
/// 鎼滅储鏈湴缃戝叧鍒楄〃
/// </summary>
public void SearchLoaclGateway()
{
- OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
- new System.Threading.Thread(() =>
+ //2021-01-15 : 浣忓畢娌℃湁缁戝畾缃戝叧鐨勬椂鍊欎笉鐢ㄦ悳绱紝骞朵笖涓嶈兘閾炬帴mqtt
+ if(DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
{
- for (int i = 0; i < 5; i++)
- {
- if (GatewayOnline)
- break;
- if (DB_ResidenceData.Instance.GatewayType == 0)
- {
- myUdp.ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
- }
- else if (DB_ResidenceData.Instance.GatewayType == 1)
- {
- myUdp.SearchLocalGateway();
- }
- System.Threading.Thread.Sleep(500);
- }
- })
- { IsBackground = true }.Start();
- if (!GatewayOnline)//缃戝叧涓嶅湪绾跨殑鏃跺�欐墠鍙皾璇曡繙绋嬭繛鎺�
+ return;
+ }
+ Ins.GatewayOnline_Local = false;
+ var ggg = DB_ResidenceData.Instance.GatewayType == 0 ? "涓�绔彛" : "A缃戝叧";
+ var ggg1 = MainPage.InternetStatus == 1 ? "4G" : "wifi";
+ MainPage.Log($"鎼滅储缃戝叧鍒楄〃锛岀綉鍏崇被鍨�:{ggg};缃戠粶绫诲瀷:{ggg1}");
+ if (MainPage.InternetStatus == 0)
{
- Ins.IsRemote = true;
+ Ins.GatewayOnline_Cloud = false;
+ return;
+ }
+ else if (MainPage.InternetStatus == 1)
+ {
DAL.Mqtt.MqttClient.InitState();
+ }
+ else if (MainPage.InternetStatus == 2)
+ {
+ OpenUdp(DB_ResidenceData.Instance.GatewayType == 0 ? 6000 : 8585);
+ //閲嶇疆鎼滅储缃戝叧鏍囧織
+ IsSearchLocalGatewaySuccessful = false;
+
+ new System.Threading.Thread(() =>
+ {
+ for (int i = 0; i < 5; i++)
+ {
+ if (IsSearchLocalGatewaySuccessful)
+ {
+ Ins.GatewayOnline_Local = true;
+ break;
+ }
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ new Control_Udp().ControlBytesSend(Command.ReadGateway, 255, 255, new byte[] { (byte)new Random().Next(255), (byte)new Random().Next(255) });
+ }
+ else if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ new Control_Udp().SearchLocalGateway();
+ }
+ System.Threading.Thread.Sleep(500);
+ }
+
+ DAL.Mqtt.MqttClient.InitState();
+ })
+ { IsBackground = true }.Start();
}
}
@@ -219,15 +283,19 @@
/// </summary>
public void ControlScene(Scene scene)
{
- if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
+ if (!Ins.GatewayOnline_Local || DB_ResidenceData.Instance.GatewayType == 1)
{
- ControlAProtocolScene(scene);
+ new System.Threading.Thread(() =>
+ {
+ ControlAProtocolScene(scene);
+ })
+ { IsBackground = true }.Start();
}
else
{
if (DB_ResidenceData.Instance.GatewayType == 0)
{
- myUdp.ControlBusScenes(scene);
+ new Control_Udp().ControlBusScenes(scene);
}
}
}
@@ -239,58 +307,170 @@
/// </summary>
/// <param name="commandString"></param>
/// <param name="function"></param>
+ /// <param name="useRemote">鏄惁鐩存帴浣跨敤杩滅▼鍙戦��</param>
/// <returns></returns>
- public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
+ public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false)
{
- function.usageCount++;
+ function.controlCounter++;
function.refreshTime = DateTime.Now;
- DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
- //杩滅▼閫氳
- if (Ins.IsRemote)
+
+ //濡傛灉鏄帶鍒惰皟鍏夌殑寮�鏃讹紝浜害鍊间笉鑳戒负0
+ if (commandDictionary.Count > 2)
{
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) && commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
+ {
+ if (commandDictionary[FunctionAttributeKey.OnOff] == "on")
+ {
+ if (commandDictionary[FunctionAttributeKey.Brightness] == "0")
+ {
+ commandDictionary[FunctionAttributeKey.Brightness] = "100";
+ }
+ }
+ if (commandDictionary[FunctionAttributeKey.OnOff] == "off")
+ {
+ if (commandDictionary[FunctionAttributeKey.Brightness] != "0")
+ {
+ commandDictionary[FunctionAttributeKey.Brightness] = "0";
+ }
+ }
+ }
+ }
+
+ MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
+
+ ///绗笁鏂规秱楦﹁澶囩粺涓�浣跨敤杩滅▼鎺у埗
+ switch(function.spk)
+ {
+ case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaWaterValve:
+ case SPK.ElectricTuyaWeepRobot:
+ useRemote = true;
+ break;
+ }
+
+ //杩滅▼閫氳 --娑傞甫璁惧蹇呴』闇�瑕佽繙绋�
+ if (useRemote == true)
+ {
+ DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
//ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
var apiControlData = function.GetApiControlData(commandDictionary);
var actionObjs = new List<ApiAlinkControlActionObj>();
actionObjs.Add(apiControlData);
var pack = httpServer.ControlDevice(actionObjs);
- //MainPage.Log($"{pack.Code}:{pack.Data}");
}
- //鏈湴閫氳
else
{
- //Bus鎺у埗
- if (DB_ResidenceData.Instance.GatewayType == 0)
+ ////杩滅▼閫氳
+ //if (Ins.GatewayOnline_Local == false && Ins.GatewayOnline_Cloud == true)
+ //{
+ // DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
+ // //ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
+ // var apiControlData = function.GetApiControlData(commandDictionary);
+ // var actionObjs = new List<ApiAlinkControlActionObj>();
+ // actionObjs.Add(apiControlData);
+ // var pack = httpServer.ControlDevice(actionObjs);
+ //}
+ //鏈湴閫氳
+ if (Ins.GatewayOnline_Local)
{
- try
+ //Bus鎺у埗
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
- if (myUdp != null)
+ try
{
- myUdp.WriteBusData(function, commandDictionary);
+ new Control_Udp().WriteBusData(function, commandDictionary);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
}
}
- catch (Exception ex)
- {
- MainPage.Log($"鍙戦�佹暟鎹紓甯�: {ex.Message}");
- }
- }
- //ALink鎺у埗
- else
- {
- if (myUdp != null)
+ //ALink鎺у埗
+ else
{
var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
- Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
}
}
+ //杩滅▼閫氳
+ else
+ {
+ DAL.Server.HttpServerRequest httpServer = new DAL.Server.HttpServerRequest();
+ //ALink鎺у埗銆丅us鎺у埗浣跨敤鍚屼竴涓帴鍙ｆ帶鍒讹紝鐢变簯绔礋璐ｈВ鏋�
+ var apiControlData = function.GetApiControlData(commandDictionary);
+ var actionObjs = new List<ApiAlinkControlActionObj>();
+ actionObjs.Add(apiControlData);
+ var pack = httpServer.ControlDevice(actionObjs);
+ }
+
}
+ }
+ /// <summary>
+ /// 鍏ㄥ紑鍏ㄥ叧鍔熻兘
+ /// </summary>
+ public void SwtichFunctions(bool open,List<Function> functions)
+ {
+ var count = 0;
+ var logString = open ? "鎵撳紑\r\n" : "鍏抽棴\r\n";
+ List<ApiAlinkControlActionObj> actionObjs = new List<ApiAlinkControlActionObj>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
+ var pm = new DAL.Server.HttpServerRequest();
+ foreach (var temp in functions)
+ {
+ logString += temp.spk + ":" + temp.sid + "\r\n";
+ var apiControlData = temp.GetApiControlData(d);
+ actionObjs.Add(apiControlData);
+ count++;
+ if (count > 9)
+ {
+ var result = pm.ControlDevice(actionObjs);
+ actionObjs = new List<ApiAlinkControlActionObj>();
+ count = 0;
+ MainPage.Log(logString);
+ logString = "";
+ }
+ }
+ var pack = pm.ControlDevice(actionObjs);
+ MainPage.Log(logString);
}
public void SendApiReadCommand(List<string> functionIds)
{
var pm = new DAL.Server.HttpServerRequest();
var pack = pm.RefreshDeviceStatus(functionIds);
+ }
+ /// <summary>
+ /// 璇诲彇鍔熻兘璇︾粏鏁版嵁
+ /// </summary>
+ /// <param name="functionIds"></param>
+ public void ReadFunctionsInfo(List<string> functionIds)
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.GetDeviceInfoList(functionIds);
+ if(pack!= null&& pack.Data!=null)
+ {
+ //寰呮祴璇�2021-03-04
+ var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());
+ if(ddd!= null)
+ {
+ foreach(var function in ddd)
+ {
+ var temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
+ if(temp!= null)
+ {
+ if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(temp.spk))
+ {
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(temp.sid, function.status);
+ }
+ }
+ }
+ }
+ }
}
/// <summary>
@@ -300,18 +480,14 @@
public void SendReadCommand(Function function)
{
function.refreshTime = DateTime.Now;
- if (Ins.IsRemote)
+ if (Ins.GatewayOnline_Local)
{
- var pm = new DAL.Server.HttpServerRequest();
- var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId});
- }
- else
- {
+
if (DB_ResidenceData.Instance.GatewayType == 0)
{
try
{
- Ins.myUdp.ReadBusData(function);
+ new Control_Udp().ReadBusData(function);
}
catch (Exception ex)
{
@@ -334,25 +510,16 @@
};
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
- Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
}
}
+ else
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.RefreshDeviceStatus(new List<string>() { function.deviceId });
+ }
}
- ///// <summary>
- ///// 鍙戦�丄鍗忚璇诲彇鍛戒护
- ///// </summary>
- //public void SendReadCommand(List<Dictionary<string, string>> keyValuePairs)
- //{
- // var readDataObj = new GatewayAlinkReadObj()
- // {
- // id = Ins.msg_id.ToString(),
- // objects = keyValuePairs,
- // time_stamp = Utlis.GetTimestamp()
- // };
- // var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
- // var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
- // Ins.myUdp.SendLocalHdlLinkData(sendBytes);
- //}
/// <summary>
/// a鍗忚鎺у埗鍦烘櫙
@@ -360,15 +527,15 @@
/// <param name="scene"></param>
static void ControlAProtocolScene(Scene scene)
{
- if (Ins.IsRemote)
+ if (!Ins.GatewayOnline_Local)//缃戝叧鏈湴涓嶅湪绾�
{
- var pm = new HDL_ON.DAL.Server.HttpServerRequest();
- pm.ExecuteScene(scene.userSceneId);
+ var pm = new DAL.Server.HttpServerRequest();
+ var result = pm.ExecuteScene(scene.userSceneId);
}
else
{
Dictionary<string, string> keys = new Dictionary<string, string>();
- keys.Add("sid", scene.userSceneId);
+ keys.Add("sid", scene.sid);
var aLinkData = new AlinkReadFunctionStatusObj()
{
id = Ins.msg_id.ToString(),
@@ -380,7 +547,7 @@
};
var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson);
- Ins.myUdp.SendLocalHdlLinkData(sendBytes);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id);
}
}
/// <summary>
@@ -394,7 +561,7 @@
string sendDataString = topicString + lengthString + bodyDataString;
byte[] sendDataBytes = Encoding.ASCII.GetBytes(sendDataString);
- MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
+ //MainPage.Log($"杞崲HDL-Link鏁版嵁\r\n{sendDataString}\r\n");
return sendDataBytes;
}
@@ -434,6 +601,11 @@
break;
}
}
+
+ MainPage.Log($"灞�鍩熺綉淇℃伅: {receiveObj.Topic}");
+ MainPage.Log($"鍐呭: {res[1]}");
+
+
//楠岃瘉鏈夋晥鏁版嵁闀垮害
//if (res[1].Length != receiveObj.Length)
//{
@@ -442,18 +614,21 @@
//}
receiveObj.BodyDataString = res[1];
- var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
- if (bodyJObj == null)
- {
- return receiveObj;
- }
if (receiveObj.Topic == CommunicationTopic.SearchLoaclGatewayReply)
{
+ var bodyJObj = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePack>(res[1]);
+ if (bodyJObj == null)
+ {
+ return receiveObj;
+ }
+
var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
{
- Ins.GatewayOnline = true;
- if(!string.IsNullOrEmpty( device.gatewayId))
+ MainPage.Log("鏈湴鎼滅储缃戝叧鎴愬姛");
+ Ins.IsSearchLocalGatewaySuccessful = true;
+ Ins.GatewayOnline_Local = true;
+ if (!string.IsNullOrEmpty(device.gatewayId))
{
Ins.GatewayId = device.gatewayId;
}
@@ -462,13 +637,19 @@
Ins.GatewayId = device.device_mac;
}
reportIp = "239.0.168.188";// device.ip_address;
- Ins.IsRemote = false;
}
}
- else if(receiveObj.Topic == CommunicationTopic.ct.ReadStatus+"_reply" ||
+ else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
+ receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" ||
receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
{
- UpdataFunctionStatus(receiveObj.BodyDataString);
+ //TODO 鏆傛椂涓嶄紶姝ｇ‘鐨勬暟鎹笂鍘伙紝濡傛灉鍚庨潰瑕佷紭鍖栧墠闈㈣繖浜涗唬鐮�
+ UpdataFunctionStatus(receiveObj.BodyDataString, null);
+ }
+ else
+ {
+ //涓�浜涚壒娈婄殑涓婚澶勭悊(涓轰簡鎵ц閫熷害,灏藉彲鑳界殑鍒姞鑰楁椂鐨勬搷浣�)
+ Stan.HdlCloudReceiveLogic.Current.CloudOverallMsgReceiveEx(receiveObj.Topic, receiveObj.BodyDataString);
}
}
return receiveObj;
@@ -479,164 +660,183 @@
/// A鍗忚鏁版嵁
/// </summary>
/// <param name="updateBytes"></param>
- public void UpdataFunctionStatus(string revString)
+ public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
{
- MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+
+ if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
+ {
+ if (FunctionList.List.GetDeviceFunctionList(SPK.BrandType.Tuya).Count == 0)
+ {
+ //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�...");
+ return;
+ }
+ }
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
if (temp != null)
{
+ Control_Udp.ReceiveRepeatManager(temp.id, usefulBytes);
var allLocalFuntion = FunctionList.List.GetDeviceFunctionList();
foreach (var updateTemp in temp.objects)
{
try
{
- //bool hadChange = false;//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
- var updataObj = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
- if (updataObj != null)
+ var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
+ if (localFunction == null)
{
- foreach (var attr in updateTemp.status)
+ continue;
+ }
+ if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
+ {
+ if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk))
{
- foreach (var locatAttr in updataObj.attributes)
- {
- if (attr.key == locatAttr.key)
- {
- if (locatAttr.curValue.ToString() == attr.value)
- {
- continue;
- }
- locatAttr.curValue = attr.value;
- //hadChange = true;
- }
- }
+ //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�........");
+ return;
}
- //2020-12-13 濡傛灉鎺у埗鏃讹紝绔嬪嵆鏇存柊鐣岄潰鍗崇姸鎬侊紝鏀跺埌鏁版嵁涓嶇敤鍦ㄥ鐞嗭紝鐩墠鍙慨鏀硅澶囩姸鎬侊紝鐣岄潰娌℃湁鏇存柊锛岃繕鏄渶瑕佹帴鏀舵暟鎹洿鏂�
- //if (!hadChange)//鐘舵�佹湁鍙樺寲鍐嶆洿鏂扮晫闈�
- //{
- // continue;
- //}
- //鏇存柊鐣岄潰鐘舵��
- switch (updataObj.spk)
- {
- case SPK.LightSwitch:
- RelayPage.UpdataState(updataObj as Light);
- break;
- case SPK.LightDimming:
- var dimming = updataObj as Light;
- dimming.lastState = Language.StringByID(StringId.Brightness) + " : " + dimming.brightness + "%";
- DimmerPage.UpdataStates(dimming);
- break;
- case SPK.ElectricFan:
- var fan = updataObj as Fan;
- fan.lastState = Language.StringByID(StringId.Level) + " : " + fan.openLevel;
- FanPage.UpdataState(fan);
- break;
- case SPK.LightRGB:
- var rgb = updataObj as Light;
- rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
- RGBPage.UpdataStates(rgb);
- break;
- case SPK.LightRGBW:
- case SPK.LightCCT:
- break;
- case SPK.CurtainSwitch:
- var curtain = updataObj as Curtain;
- curtain.lastState = curtain.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
- CurtainModulePage.UpdataState(curtain);
- break;
- case SPK.CurtainTrietex:
- var trietex = updataObj as Curtain;
- trietex.lastState = Language.StringByID(StringId.Open) + trietex.percent + "%";
- MotorCurtainPage.UpdataState(trietex);
- break;
- case SPK.CurtainRoller:
- var roller = updataObj as Curtain;
- roller.lastState = Language.StringByID(StringId.Open) + roller.percent + "%";
- RollingShutterPage.UpdataState(roller);
- break;
- case SPK.CurtainShades:
- break;
- case SPK.AcStandard:
- var ac = updataObj as AC;
- ac.lastState = "";
- switch (ac.trait_mode.curValue.ToString())
+ }
+ MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+ foreach (var attr in updateTemp.status)
+ {
+ localFunction.time_stamp = temp.time_stamp;
+ localFunction.SetAttrState(attr.key, attr.value);
+ }
+
+ //鏇存柊鐣岄潰鐘舵��
+ Function localObj = null;
+ switch (localFunction.spk)
+ {
+ case SPK.LightSwitch:
+ RelayPage.UpdataState(localFunction);
+ break;
+ case SPK.LightDimming:
+ localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " +
+ localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ DimmerPage.UpdataStates(localFunction);
+ break;
+ case SPK.ElectricFan:
+ localFunction.lastState = Language.StringByID(StringId.Level) + " : " +
+ localFunction.GetAttrState(FunctionAttributeKey.OpenLevel);
+ FanPage.UpdataState(localFunction);
+ break;
+ case SPK.LightRGB:
+ localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ RGBPage.UpdataStates(localFunction);
+ break;
+ case SPK.LightRGBW:
+ break;
+ case SPK.LightCCT:
+ localFunction.lastState = Language.StringByID(StringId.Brightness) + " : " + localFunction.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+ ColorTureLampPage.UpdataStatus(localFunction);
+ break;
+ case SPK.CurtainSwitch:
+ localFunction.lastState = localFunction.trait_on_off.curValue.ToString() == "on" ? Language.StringByID(StringId.Open) : Language.StringByID(StringId.Close);
+ CurtainModulePage.UpdataState(localFunction);
+ break;
+ case SPK.CurtainTrietex:
+ localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
+ MotorCurtainPage.UpdataState(localFunction);
+ break;
+ case SPK.CurtainRoller:
+ localFunction.lastState = Language.StringByID(StringId.Open) + localFunction.GetAttrState(FunctionAttributeKey.Percent) + "%";
+ RollingShutterPage.UpdataState(localFunction);
+ break;
+ case SPK.CurtainShades:
+ break;
+ case SPK.AcStandard:
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
+ if (localFunction != null)
+ {
+ localFunction.lastState = "";
+ switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
{
case "cool":
- ac.lastState = Language.StringByID(StringId.Cool);
+ localFunction.lastState = Language.StringByID(StringId.Cool);
break;
case "heat":
- ac.lastState = Language.StringByID(StringId.Heat);
+ localFunction.lastState = Language.StringByID(StringId.Heat);
break;
case "dry":
- ac.lastState = Language.StringByID(StringId.Dry);
+ localFunction.lastState = Language.StringByID(StringId.Dry);
break;
case "auto":
- ac.lastState = Language.StringByID(StringId.Auto);
+ localFunction.lastState = Language.StringByID(StringId.Auto);
break;
case "fan":
- ac.lastState = Language.StringByID(StringId.AirSupply);
+ localFunction.lastState = Language.StringByID(StringId.AirSupply);
break;
}
- switch (ac.trait_fan.curValue.ToString())
+ switch (localFunction.GetAttrState(FunctionAttributeKey.FanSpeed))
{
case "high":
- ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
+ localFunction.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
break;
case "medium":
- ac.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
+ localFunction.lastState += " " + Language.StringByID(StringId.MiddleWindSpeed);
break;
case "low":
- ac.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
+ localFunction.lastState += " " + Language.StringByID(StringId.LowWindSpeed);
break;
case "auto":
- ac.lastState += " " + Language.StringByID(StringId.Auto);
+ localFunction.lastState += " " + Language.StringByID(StringId.Auto);
break;
}
- ac.lastState += " " + ac.trait_temp.curValue + ac.tempUnitString;
- ACPage.UpdataStates(ac);
- break;
- case SPK.FloorHeatStandard:
- var fh = updataObj as FloorHeating;
- switch (fh.trait_mode.curValue)
- {
- case "normal":
- fh.lastState = Language.StringByID(StringId.Normal);
- break;
- case "day":
- fh.lastState = Language.StringByID(StringId.Day);
- break;
- case "night":
- fh.lastState = Language.StringByID(StringId.Night);
- break;
- case "timer":
- fh.lastState = Language.StringByID(StringId.Auto);
- break;
- case "away":
- fh.lastState = Language.StringByID(StringId.Away);
- break;
- }
- fh.lastState += " " + fh.trait_temp.curValue + fh.tempUnitString;
- FloorHeatingPage.UpdataStates(fh);
- break;
- case SPK.SensorPm25:
- case SPK.SensorCO2:
- case SPK.SensorTVOC:
- case SPK.SensorTemperature:
- case SPK.SensorHumidity:
- var sensor = updataObj as Sensor;
- EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
- break;
- case SPK.ElectricSocket:
- break;
- case SPK.ElectricTV:
- break;
- default:
- break;
- }
- HomePage.UpdataFunctionStates(updataObj);
- RoomPage.UpdataStates(updataObj);
- FunctionPage.UpdataStates(updataObj);
- ClassificationPage.UpdataInfo(updataObj);
+ localFunction.lastState += " " + localFunction.GetAttrState(FunctionAttributeKey.SetTemp) + new AC().GetTempUnitString(localFunction);
+ ACPage.UpdataStates(localFunction);
+ }
+ break;
+ case SPK.FloorHeatStandard:
+ switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
+ {
+ case "normal":
+ localFunction.lastState = Language.StringByID(StringId.Normal);
+ break;
+ case "day":
+ localFunction.lastState = Language.StringByID(StringId.Day);
+ break;
+ case "night":
+ localFunction.lastState = Language.StringByID(StringId.Night);
+ break;
+ case "timer":
+ localFunction.lastState = Language.StringByID(StringId.Auto);
+ break;
+ case "away":
+ localFunction.lastState = Language.StringByID(StringId.Away);
+ break;
+ }
+ localFunction.lastState += " " + localFunction.GetAttrState(FunctionAttributeKey.SetTemp) + new FloorHeating().GetTempUnitString(localFunction);
+ FloorHeatingPage.UpdataStates(localFunction);
+ break;
+ case SPK.SensorPm25:
+ case SPK.SensorCO2:
+ case SPK.SensorTVOC:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
+ break;
+ case SPK.ElectricSocket:
+ SocketPage.UpdataState(localFunction);
+ break;
+ case SPK.ElectricTV:
+ break;
+ case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaWeepRobot:
+ case SPK.ElectricTuyaWaterValve:
+ case SPK.SensorPir:
+ case SPK.SensorDoorWindow:
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
+ case SPK.ClothesHanger:
+ case SPK.AcIr:
+ //璁惧鐘舵�佹帹閫�
+ Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
+ break;
}
+
+ HomePage.UpdataFunctionStates(localFunction);
+ RoomPage.UpdataStates(localFunction);
+ FunctionPage.UpdataStates(localFunction);
+ ClassificationPage.UpdataInfo(localFunction);
+
}
catch (Exception ex)
{
--
Gitblit v1.8.0