From 8df24b0a3dfd5b6f39c5393ef24eab25b70ab858 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 13:18:33 +0800
Subject: [PATCH] 202009111
---
HDL_ON/DriverLayer/CommonPage.cs | 323 ++++++++++++++++-------------------------------------
1 files changed, 101 insertions(+), 222 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index d12e95e..92167dd 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -1,10 +1,8 @@
锘縰sing System;
+using System.Collections.Generic;
using System.Text;
-using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using HDL_ON.UI;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using Shared;
using Shared.Net;
@@ -12,11 +10,7 @@
{
public static class CommonPage
{
-
- public static bool IsRemote;
public static Action RefreshAir;
- public static string FindGatewayChilrenIPAddress = new NetWiFi().BroadcastIpAddress.ToString();
- private static string ip = "0.0.0.0";
public static System.Net.IPEndPoint EndPoint
{
get
@@ -30,16 +24,6 @@
//闃叉寮傚父瀵艰嚧绋嬪簭閫�鍑�
return new System.Net.IPEndPoint(System.Net.IPAddress.Parse("127.0.0.1"), 6000);
}
- }
- }
-
-
- public static System.Net.IPEndPoint GetGatewayIP_EndPoint
- {
- get
- {
- //闃叉寮傚父瀵艰嚧绋嬪簭閫�鍑�
- return new System.Net.IPEndPoint(System.Net.IPAddress.Parse("224.0.168.188"), 6688);
}
}
@@ -66,31 +50,6 @@
return Encoding.GetEncoding("gb2312");
}
}
- }
- public static bool isHttpListenerStart;
- public static DateTime dt;
-
- //public static byte currentSubnetID = 0;
- public static void InitHttpListener()
- {
- if (isHttpListenerStart)
- {
- return;
- }
- Console.WriteLine("Init Http Listener !");
- HttpListener.Start(new NetWiFi().IpAddress, 6002);
- HttpListener.EventHandler -= httpListener_EventHandler;
- HttpListener.EventHandler += httpListener_EventHandler;
- isHttpListenerStart = true;
- }
- public static void CloseHttpListener()
- {
- //isHttpListenerStart = false;
- //return;
- if (!isHttpListenerStart)
- return;
- HttpListener.Close();
- isHttpListenerStart = false;
}
/// <summary>
/// 鍒濆鍖栧鐞唖ocket鎺ユ敹鐨勬暟鎹�
@@ -119,16 +78,66 @@
switch (command)
{
- case Command.ReadLightSingleLoopBrightnessACK:
case Command.SetSingleLightACK:
- foreach (var light in DB_ResidenceData.residenceData.functionList.lights)
+ var queryList = new List<Function>();
+ queryList.AddRange(DB_ResidenceData.functionList.electricals);
+ queryList.AddRange(DB_ResidenceData.functionList.lights);
+ foreach (var updataObj in queryList)
{
- if (light.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (updataObj.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ {
+ if (updataObj.functionType != FunctionType.RGB)
+ {
+ var newState = receiveBytes[2] == 0 ? "off" : "on";
+ if (updataObj.trait_on_off.value.ToString() == newState)
+ {
+ //鐘舵�佷竴鏍凤紝涓嶇敤鍐嶅埛鏂伴〉闈�
+ break;
+ }
+ if (updataObj.trait_on_off.value.ToString() == "on")
+ {
+ if (updataObj.functionType == FunctionType.Fan)
+ {
+ (updataObj as Fan).openLevel = receiveBytes[2];
+ updataObj.lastState = Language.StringByID(StringId.Level) + " : " + receiveBytes[2];
+ }
+ else
+ {
+ (updataObj as Light).brightness = receiveBytes[2];
+ updataObj.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[2] + "%";
+ }
+ }
+ HomePage.UpdataFunctionStates(updataObj);
+ RoomPage.UpdataStates(updataObj);
+ FunctionPage.UpdataStates(updataObj);
+ ClassificationPage.UpdataInfo(updataObj);
+ switch (updataObj.functionType)
+ {
+ case FunctionType.Relay:
+ RelayPage.UpdataState(updataObj as Light);
+ break;
+ case FunctionType.Dimmer:
+ DimmerPage.UpdataStates(updataObj as Light);
+ break;
+ case FunctionType.Fan:
+ FanPage.UpdataState(updataObj as Fan);
+ break;
+ }
+ break;
+ }
+ }
+ }
+ break;
+ case Command.ReadLightAllLoopBrightnessACK:
+ for (int i = 0; i < receiveBytes[0]; i++)
+ {
+ var light = DB_ResidenceData.functionList.lights.Find((obj) => obj.bus_Data.SubnetID == subnetID && obj.bus_Data.DeviceID == deviceID && obj.bus_Data.LoopID == (i+1));
+ if (light != null)
{
if (light.functionType != FunctionType.RGB)
{
- light.on_off = receiveBytes[2] == 0 ? "off" : "on";
- if (light.on_off == "on")
+ light.trait_on_off.value = receiveBytes[light.bus_Data.LoopID] == 0 ? "off" : "on";
+ if (light.trait_on_off.value.ToString() == "on")
{
light.brightness = receiveBytes[2];
light.lastState = Language.StringByID(StringId.Brightness) + " : " + receiveBytes[2] + "%";
@@ -148,17 +157,14 @@
}
}
}
- }
-
- foreach (var e in DB_ResidenceData.residenceData.functionList.electricals)
- {
- if (e.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ else
{
- if (e.functionType == FunctionType.Fan)
+ var e = DB_ResidenceData.functionList.electricals.Find((obj) => obj.bus_Data.SubnetID == subnetID && obj.bus_Data.DeviceID == deviceID && obj.bus_Data.LoopID == i);
+ if (e != null)
{
var fan = e as Fan;
- fan.on_off = receiveBytes[2] == 0 ? "off" : "on";
- if (fan.on_off == "on")
+ fan.trait_on_off.value = receiveBytes[2] == 0 ? "off" : "on";
+ if (fan.trait_on_off.value.ToString() == "on")
{
fan.openLevel = receiveBytes[2];
fan.lastState = Language.StringByID(StringId.Level) + " : " + receiveBytes[2];
@@ -179,17 +185,16 @@
}
}
}
-
break;
case Command.SetLogicLoopColorACK:
case Command.ReadLogicLoopColorACK:
- foreach (var rgb in DB_ResidenceData.residenceData.functionList.lights)
+ foreach (var rgb in DB_ResidenceData.functionList.lights)
{
if (rgb.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
if (rgb.functionType == FunctionType.RGB)
{
- rgb.on_off = receiveBytes[1] > 0 ? "on" : "off";
+ rgb.trait_on_off.value = receiveBytes[1] > 0 ? "on" : "off";
if (receiveBytes[1] > 0)
{
rgb.brightness = receiveBytes[1];
@@ -210,7 +215,7 @@
break;
case Command.SetCurtainModelStutasACK:
case Command.ReadCurtainStutasACK:
- foreach (var curtain in DB_ResidenceData.residenceData.functionList.curtains)
+ foreach (var curtain in DB_ResidenceData.functionList.curtains)
{
if (curtain.bus_Data.SubnetID == subnetID && curtain.bus_Data.DeviceID == deviceID)
{
@@ -218,14 +223,14 @@
{
if (receiveBytes[1] > 1)
{
- curtain.on_off = "on";
+ curtain.trait_on_off.value = "on";
}
else
{
- curtain.on_off = "off";
+ curtain.trait_on_off.value = "off";
}
- curtain.openLevel = receiveBytes[1];
- curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
+ curtain.percent = receiveBytes[1];
+ curtain.lastState = Language.StringByID(StringId.Open) + curtain.percent + "%";
}
else
{
@@ -234,14 +239,14 @@
switch (receiveBytes[1])
{
case 0:
- curtain.on_off = "stop";
+ curtain.trait_on_off.value = "stop";
break;
case 1:
- curtain.on_off = "on";
+ curtain.trait_on_off.value = "on";
curtain.lastState = Language.StringByID(StringId.Open);
break;
case 2:
- curtain.on_off = "off";
+ curtain.trait_on_off.value = "off";
curtain.lastState = Language.StringByID(StringId.Close);
break;
}
@@ -262,18 +267,18 @@
break;
case Command.SetACModeACK:
case Command.ReadACModeACK:
- foreach (var ac in DB_ResidenceData.residenceData.functionList.aCs)
+ foreach (var ac in DB_ResidenceData.functionList.aCs)
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
ac.curTempType = receiveBytes[1];
ac.indoorTemp = receiveBytes[2];
- ac.on_off = receiveBytes[8] == 1 ? "on" : "off";
+ ac.trait_on_off.value = receiveBytes[8] == 1 ? "on" : "off";
ac.curModeIndex = receiveBytes[9];
ac.curFanIndex = receiveBytes[10];
- ac.curTemp = receiveBytes[11];
+ ac.trait_temp.value = receiveBytes[11];
ac.lastState = "";
- switch (ac.trait_mode.curValues.ToString())
+ switch (ac.trait_mode.value.ToString())
{
case "cool":
ac.lastState = Language.StringByID(StringId.Cool);
@@ -291,7 +296,7 @@
ac.lastState = Language.StringByID(StringId.AirSupply);
break;
}
- switch (ac.trait_fan.curValues.ToString())
+ switch (ac.trait_fan.value.ToString())
{
case "high":
ac.lastState += " " + Language.StringByID(StringId.HighWindSpeed);
@@ -306,7 +311,7 @@
ac.lastState += " " + Language.StringByID(StringId.Auto);
break;
}
- ac.lastState += " " + ac.curTemp + ac.curTempTypeString;
+ ac.lastState += " " + ac.trait_temp.value + ac.tempUnitString;
RoomPage.UpdataStates(ac);
FunctionPage.UpdataStates(ac);
HomePage.UpdataFunctionStates(ac);
@@ -317,20 +322,20 @@
break;
case Command.ReadFloorHeatACK:
case Command.SetFloorHeatACK:
- foreach (var fh in DB_ResidenceData.residenceData.functionList.floorHeatings)
+ foreach (var fh in DB_ResidenceData.functionList.floorHeatings)
{
if (fh.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
fh.curTempType = receiveBytes[2];
- fh.on_off = receiveBytes[1] % 2 == 0 ? "off" : "on";
+ fh.trait_on_off.value = receiveBytes[1] % 2 == 0 ? "off" : "on";
fh.curModeIndex = receiveBytes[3];
- if (fh.modeTemp.ContainsKey("ordinary"))
+ if (fh.modeTemp.ContainsKey("normal"))
{
- fh.modeTemp["ordinary"] = receiveBytes[4];
+ fh.modeTemp["normal"] = receiveBytes[4];
}
else
{
- fh.modeTemp.Add("ordinary", receiveBytes[4]);
+ fh.modeTemp.Add("normal", receiveBytes[4]);
}
if (fh.modeTemp.ContainsKey("day"))
{
@@ -340,7 +345,6 @@
{
fh.modeTemp.Add("day", receiveBytes[5]);
}
-
if (fh.modeTemp.ContainsKey("night"))
{
fh.modeTemp["night"] = receiveBytes[6];
@@ -349,7 +353,6 @@
{
fh.modeTemp.Add("night", receiveBytes[6]);
}
-
if (fh.modeTemp.ContainsKey("away"))
{
fh.modeTemp["away"] = receiveBytes[7];
@@ -358,24 +361,32 @@
{
fh.modeTemp.Add("away", receiveBytes[7]);
}
- switch (fh.curMode)
+
+ switch (fh.trait_mode.value)
{
- case "ordinary":
- fh.lastState = Language.StringByID(StringId.Ordinary);
+ case "normal":
+ fh.lastState = Language.StringByID(StringId.Normal);
+ fh.curTemp = receiveBytes[4];
break;
case "day":
fh.lastState = Language.StringByID(StringId.Day);
+ fh.curTemp = receiveBytes[5];
break;
case "night":
fh.lastState = Language.StringByID(StringId.Night);
+ fh.curTemp = receiveBytes[6];
break;
case "timer":
fh.lastState = Language.StringByID(StringId.Auto);
if (receiveBytes[8] == 0)
{
+ fh.timeFlag = 0;
+ fh.curTemp = receiveBytes[5];
}
else
{
+ fh.timeFlag = 1;
+ fh.curTemp = receiveBytes[6];
}
break;
case "away":
@@ -383,7 +394,7 @@
fh.lastState = Language.StringByID(StringId.Away);
break;
}
- fh.lastState += " " + fh.curTemp + fh.curTempTypeString;
+ fh.lastState += " " + fh.curTemp + fh.tempUnitString;
RoomPage.UpdataStates(fh);
FunctionPage.UpdataStates(fh);
HomePage.UpdataFunctionStates(fh);
@@ -395,8 +406,7 @@
case Command.ReadDeviceLoopInfoACK:
FunctionType dt = (FunctionType)(11 * 256 + receiveBytes[1]);
string tag = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
-
- foreach (var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
{
if (sensor.bus_Data != null)
{
@@ -429,7 +439,7 @@
break;
case Command.New_Analog_Quantity_BROADCAST:
string tag1 = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
- foreach (var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
{
if (sensor.bus_Data != null)
{
@@ -477,20 +487,20 @@
{
break;
}
- foreach (var ac in DB_ResidenceData.residenceData.functionList.aCs)
+ foreach (var ac in DB_ResidenceData.functionList.aCs)
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + reACPanel)
{
switch (receiveBytes[0])
{
case 3://
- ac.on_off = receiveBytes[1] == 1 ? "on" : "off";
+ ac.trait_on_off.value = receiveBytes[1] == 1 ? "on" : "off";
break;
case 4:
case 7:
case 8:
case 19:
- ac.curTemp = receiveBytes[1];
+ ac.trait_temp.value = receiveBytes[1];
break;
case 5:
ac.curFanIndex = receiveBytes[1];
@@ -501,63 +511,24 @@
}
ac.lastState = "";
- ac.lastState += " " + ac.curTemp + ac.curTempTypeString;
+ ac.lastState += " " + ac.trait_temp.value + ac.tempUnitString;
RoomPage.UpdataStates(ac);
FunctionPage.UpdataStates(ac);
HomePage.UpdataFunctionStates(ac);
ClassificationPage.UpdataInfo(ac);
ACPage.UpdataStates(ac);
- //else if (common.Type == DeviceType.FoolHeatPanel)
- {
- //switch (receiveBytes[0])
- //{
- // case 20://
- // fh.Status = receiveBytes[1];
- // break;
- // case 21:
- // fh.TemperatureType = receiveBytes[1];
- // if (receiveBytes[1] == 5)
- // {
- // if (fh.Timer == 0)//鏃堕棿妯″紡鐨勬椂闂存鏍囧織 (0锛氱櫧澶╋紝1锛氬鏅�) (1byte) //20110112鍔犳椂闂存鏍囧織
- // Control.ControlBytesSend(Command.ReadInstructionPanelKey, fh.SubnetID, fh.DeviceID, new byte[] { 26, 2, fh.LoopID }, SendCount.Zero);
- // else
- // Control.ControlBytesSend(Command.ReadInstructionPanelKey, fh.SubnetID, fh.DeviceID, new byte[] { 27, 3, fh.LoopID }, SendCount.Zero);
- // }
- // else
- // Control.ControlBytesSend(Command.ReadInstructionPanelKey, fh.SubnetID, fh.DeviceID, new byte[] { (byte)(receiveBytes[1] + 24), fh.LoopID }, SendCount.Zero);
- // break;
- // case 25:
- // fh.NormalTemperature = receiveBytes[1];
- // break;
- // case 26:
- // fh.DayTemperature = receiveBytes[1];
- // break;
- // case 27:
- // fh.NightTemperature = receiveBytes[1];
- // break;
- // case 28:
- // fh.AwayTemperature = receiveBytes[1];
- // break;
- //}
- }
}
}
break;
case Command.ReadPanleTempACK://1944
case Command.PanleBroadcastTemp:
- foreach (var ac in DB_ResidenceData.residenceData.functionList.aCs)
+ foreach (var ac in DB_ResidenceData.functionList.aCs)
{
if (ac.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
{
ac.indoorTemp = receiveBytes[1];
FunctionPage.UpdataStates(ac);
}
- //else if (common.Type == DeviceType.FoolHeatPanel)
- // {
- // var tempFH22 = common as FoolHeatPanel;
- // tempFH22.IndoorTemperature = receiveBytes[1];
- // UserFHPage.UpdateIndoorTemp(tempFH22.CommonLoopID, receiveBytes[1]);
- // }
}
break;
}
@@ -580,98 +551,6 @@
return "0" + s;
}
return s;//
- }
-
- static void httpListener_EventHandler(System.Collections.Specialized.NameValueCollection nameValueCollection, System.IO.Stream outputStream, System.IO.Stream inputStream)
- {
- try
- {
- if (nameValueCollection["Command"] != null && nameValueCollection["Command"].StartsWith("Get"))
- {
- string tempFileName = nameValueCollection["Command"].Replace("Get", "");
- if ("AllFiles" == tempFileName)
- {
- byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(FileUtils.ReadFiles()));
- outputStream.Write(bytes, 0, bytes.Length);
- outputStream.Flush();
- }
- else
- {
- byte[] bytes;
- if (!FileUtils.Exists(tempFileName))
- {
- bytes = Encoding.UTF8.GetBytes("鏂囦欢鍚嶄笉瀛樺湪锛�");
- outputStream.Write(bytes, 0, bytes.Length);
- outputStream.Flush();
- return;
- }
- System.IO.FileStream fs = new System.IO.FileStream(Application.RootPath + tempFileName, System.IO.FileMode.Open);
- bytes = new byte[fs.Length];
- fs.Read(bytes, 0, bytes.Length);
- fs.Close();
- outputStream.Write(bytes, 0, bytes.Length);
- outputStream.Flush();
- }
- }
- else if (nameValueCollection["Command"].StartsWith("Upload"))
- {
- string path = Application.RootPath + nameValueCollection["Command"].Replace("Upload", "");
- string dePath = nameValueCollection["Command"].Replace("Upload", "");
- FileUtils.WriteFileByInputStream(path, inputStream);
- var reString = CommonPage.MyEncodingUTF8.GetString(FileUtils.ReadFile(path));
- var common = JsonConvert.DeserializeObject<AProtocolEntity>(reString);
- //Console.WriteLine(common.ToString());
- if(dePath == "FunctionList")
- {
- foreach(var obj in common.objects)
- {
- DB_ResidenceData.residenceData.functionList.AddFunction(obj);
- }
- DB_ResidenceData.residenceData.functionList.GetAllFunction();
- }
- }
- else
- {
- byte[] bytes = System.Text.Encoding.UTF8.GetBytes("璇锋眰鍛戒护鏃犳晥锛�");
- outputStream.Write(bytes, 0, bytes.Length);
- outputStream.Flush();
- }
- }
- catch (Exception ex)
- {
- MainPage.Log("httpListener_EventHandler" + ex.ToString());
- }
- }
-
- /// <summary>
- /// 鐩戝惉璇锋眰鐨凥ttp绔彛
- /// </summary>
- public static int Port = 5555;
- static void httpListener_EventHandler(string rawUrl, System.IO.Stream outputStream, System.IO.Stream inputStream)
- {
- foreach (var musicInfo in MusicInfo.MusicInfoList)
- {
- if ("audio-item-" + musicInfo.ID == rawUrl.TrimStart('/'))
- {
- var file = new System.IO.FileStream(musicInfo.Data, System.IO.FileMode.Open, System.IO.FileAccess.Read);
- byte[] bytes = new byte[1024];
- try
- {
- while (file.CanRead)
- {
- int len = file.Read(bytes, 0, bytes.Length);
- if (len == 0)
- {
- break;
- }
- outputStream.Write(bytes, 0, len);
- }
- }
- catch { }
- file.Close();
- break;
- }
- }
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0