From 631f94758c3cb42abcdda8094e77895f376eff16 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:53:43 +0800
Subject: [PATCH] 2021-1-12-3
---
HDL_ON/DAL/DriverLayer/Control.cs | 145 +++++++++++++++++++++++++++++++++++------------
1 files changed, 107 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 2e8555f..fe8179b 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;
@@ -82,11 +82,23 @@
{
if (_gatewayOnline != value)
{
- _gatewayOnline = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- UI.HomePage.LoadEvent_CheckLinkStatus();
- if (value)
+ if(value)
{
+ if (IsRemote)//濡傛灉鏄繙绋�
+ {
+ 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;
+ }
+ }
+ _gatewayOnline = value;
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
MainPage.Log($"缃戝叧鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
@@ -94,6 +106,12 @@
FunctionList.List.ReadAllFunctionStatus();
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+ }
+ else
+ {
+ _gatewayOnline = value;
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
}
}
}
@@ -103,23 +121,10 @@
/// </summary>
public string GatewayId = "";
- bool _isRemote = false;
/// <summary>
/// 鏄惁涓鸿繙绋嬭繛鎺�
/// </summary>
- public bool IsRemote
- {
- get
- {
- return _isRemote;
- }
- set
- {
- _isRemote = value;
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
- }
- }
+ public bool IsRemote = false;
/// <summary>
/// 閫氳鍦板潃IP
/// </summary>
@@ -178,20 +183,14 @@
}
}
- ///// <summary>
- ///// 鏀瑰彉閫氳鏂瑰紡
- ///// </summary>
- //public void ChangeCommunicationMode(CommunicationMode communicationMode)
- //{
- // this.communicationMode = communicationMode;
- //}
-
/// <summary>
/// 鎼滅储鏈湴缃戝叧鍒楄〃
/// </summary>
public void SearchLoaclGateway()
{
- MainPage.Log($"鎼滅储鏈湴缃戝叧鍒楄〃锛岀綉鍏崇被鍨�:{DB_ResidenceData.Instance.GatewayType}");
+ var ggg = DB_ResidenceData.Instance.GatewayType == 0 ? "涓�绔彛" : "A缃戝叧";
+ var ggg1 = MainPage.InternetStatus == 1 ? "4G" : "wifi";
+ MainPage.Log($"鎼滅储缃戝叧鍒楄〃锛岀綉鍏崇被鍨�:{ggg};缃戠粶绫诲瀷:{ggg1}");
if (MainPage.InternetStatus == 0)
{
Ins.GatewayOnline = false;
@@ -240,7 +239,6 @@
})
{ IsBackground = true }.Start();
}
-
}
/// <summary>
@@ -250,7 +248,11 @@
{
if (Ins.IsRemote || DB_ResidenceData.Instance.GatewayType == 1)
{
- ControlAProtocolScene(scene);
+ new System.Threading.Thread(() =>
+ {
+ ControlAProtocolScene(scene);
+ })
+ { IsBackground = true }.Start();
}
else
{
@@ -271,8 +273,32 @@
/// <returns></returns>
public void SendWriteCommand(Function function, Dictionary<string, string> commandDictionary)
{
- function.usageCount++;
+ function.controlCounter++;
function.refreshTime = DateTime.Now;
+
+ //濡傛灉鏄帶鍒惰皟鍏夌殑寮�鏃讹紝浜害鍊间笉鑳戒负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)}");
//杩滅▼閫氳
if (Ins.IsRemote)
@@ -283,7 +309,6 @@
var actionObjs = new List<ApiAlinkControlActionObj>();
actionObjs.Add(apiControlData);
var pack = httpServer.ControlDevice(actionObjs);
- //MainPage.Log($"{pack.Code}:{pack.Data}");
}
//鏈湴閫氳
else
@@ -307,8 +332,38 @@
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id);
+ MainPage.Log($"鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
}
}
+ }
+ /// <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)
@@ -358,6 +413,7 @@
};
var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(readDataObj);
var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ReadStatus, functionControlDataJson);
+ MainPage.Log($"鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
new Control_Udp().SendLocalHdlLinkData(sendBytes, readDataObj.id);
}
}
@@ -386,8 +442,16 @@
{
if (Ins.IsRemote)
{
- var pm = new HDL_ON.DAL.Server.HttpServerRequest();
- pm.ExecuteScene(scene.userSceneId);
+ //浜戠鍋氬鐞嗗彂閫佷竴绔彛鍦烘櫙
+ //if (DB_ResidenceData.Instance.GatewayType == 0)
+ //{
+ // new Control_Udp().ControlBusScenes(scene);
+ //}
+ //else
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var result = pm.ExecuteScene(scene.userSceneId);
+ }
}
else
{
@@ -418,7 +482,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;
}
@@ -458,6 +522,10 @@
break;
}
}
+
+ MainPage.Log($"time 1 :{receiveObj.Topic}");
+
+
//楠岃瘉鏈夋晥鏁版嵁闀垮害
//if (res[1].Length != receiveObj.Length)
//{
@@ -476,7 +544,7 @@
var device = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceModule>(bodyJObj.objects.ToString());
if (device.device_mac == DB_ResidenceData.Instance.residenceGatewayMAC)
{
- //鏈湴鎼滅储缃戝叧鎴愬姛
+ MainPage.Log("鏈湴鎼滅储缃戝叧鎴愬姛");
Control.Ins.IsSearchLocalGatewaySuccessful = true;
Ins.GatewayOnline = true;
if (!string.IsNullOrEmpty(device.gatewayId))
@@ -492,6 +560,7 @@
}
}
else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
+ receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" ||
receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus)
{
//TODO 鏆傛椂涓嶄紶姝ｇ‘鐨勬暟鎹笂鍘伙紝濡傛灉鍚庨潰瑕佷紭鍖栧墠闈㈣繖浜涗唬鐮�
@@ -547,7 +616,7 @@
localAttr.curValue = attr.value;
}
}
- MainPage.Log($"{localSwitch.trait_on_off.curValue}: ");
+ //rgb.lastState = Language.StringByID(StringId.Brightness) + " : " + rgb.brightness + "%";
RelayPage.UpdataState(localSwitch);
}
break;
@@ -618,7 +687,7 @@
}
}
lightCCT.lastState = Language.StringByID(StringId.Brightness) + " : " + lightCCT.brightness + "%";
- DimmerPage.UpdataStates(lightCCT);
+ ColorTureLampPage.UpdataStates(lightCCT);
}
break;
case SPK.CurtainSwitch:
--
Gitblit v1.8.0