From 83d3a5b39efa7bea47ed418cab8ebc2f9fec8b14 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 12:44:24 +0800
Subject: [PATCH] 20201223-4
---
HDL_ON/Entity/Function/Function.cs | 484 ++++++++++++++++-------------------------------------
1 files changed, 150 insertions(+), 334 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9376caf..a41d3d2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,5 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Common;
+using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using Shared;
@@ -114,21 +116,12 @@
/// 璇ュ姛鑳芥坊鍔犲埌鍒版埧闂村垪琛�
/// </summary>
public List<string> roomIds = new List<string>();
- /// <summary>
- /// 缁戝畾鎴块棿
- /// </summary>
- public void BindRoom(string roomId)
- {
- roomIds.Add(roomId);
- var pm = new DAL.Server.HttpServerRequest();
- pm.BindDeviceToRoom(deviceId, roomId);
- }
/// <summary>
/// bus鍗忚鏁版嵁鏍煎紡
/// 浣跨敤A鍗忚鎺у埗鏃讹紝鏀瑰睘鎬т负绌�
/// </summary>
- public BusData bus_Data;
+ public BusData bus;
/// <summary>
/// 鏄惁鏀惰棌
/// </summary>
@@ -158,37 +151,6 @@
/// </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;
- }
- }
-
- /// <summary>
/// 鏈�鍚庢帶鍒剁殑涓�娆＄姸鎬�
/// </summary>
[Newtonsoft.Json.JsonIgnore]
@@ -202,7 +164,7 @@
{
if (_trait_on_off == null)
{
- _trait_on_off = attributes.Find((obj) => obj.key == "on_off");
+ _trait_on_off = attributes.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_on_off == null)
{
@@ -213,8 +175,12 @@
max = 1,
min = 0,
};
+ _trait_on_off.curValue = "off";
}
- _trait_on_off.curValue = "on";
+ }
+ if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off")
+ {
+ _trait_on_off.curValue = "off";
}
return _trait_on_off;
}
@@ -227,14 +193,15 @@
/// <summary>
/// 浣跨敤娆℃暟
/// </summary>
- public double usageCount = 0;
+ public double controlCounter = 0;
/// <summary>
/// 浣跨敤棰戠巼
/// </summary>
- public double usageFrequency {
+ public double usageFrequency
+ {
get
{
- return usageCount / 7;
+ return controlCounter / 7;
}
}
/// <summary>
@@ -242,12 +209,72 @@
/// </summary>
public int fixedSerialNumber = int.MaxValue;
+ /// <summary>
+ /// 鏀惰棌鍔熻兘
+ /// </summary>
+ public void CollectFunction()
+ {
+ var result = "";
+ //var waitPage = new Loading();
+
+ new System.Threading.Thread(() =>
+ {
+ if (collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
+ }
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ collect = !collect;
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ /// <summary>
+ /// 缂栬緫鍔熻兘缁戝畾鎴块棿淇℃伅
+ /// </summary>
+ public void EditBindRoomInfo(string roomId)
+ {
+ var result = "";
+
+ new System.Threading.Thread(() =>
+ {
+ if (collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.BindDeviceToRoom(new List<string>() { deviceId }, new List<string>() { roomId }).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.UnbindDeviceToRoom(deviceId,roomId);
+ }
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ collect = !collect;
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
public string GetBusId()
{
string busId = "";
- if (bus_Data != null)
+ if (bus != null)
{
- busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
+ busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.LoopId;
}
return busId;
}
@@ -261,7 +288,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -270,11 +297,11 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.roomName;
+ roomNameList += findRoom.floorName +"-"+ findRoom.roomName;
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
- roomNameList = Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
@@ -296,26 +323,25 @@
{
if (upSevser)
{
- var pm = new DAL.Server.HttpServerRequest();
+ var pm = new HttpServerRequest();
var pack = pm.UpdataDevcieInfo(this);
- if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ if (pack.Code == StateCode.SUCCESS)
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
- MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+ FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
else
{
- Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "Code:" + pack.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
}
else
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
- MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+ FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
}
+
/// <summary>
/// 杞崲鎴愬満鏅姛鑳藉璞�
@@ -326,8 +352,40 @@
var sFunc = new SceneFunction();
foreach (var attr in attributes)
{
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ switch (attr.key)
+ {
+ case FunctionAttributeKey.OnOff:
+ case FunctionAttributeKey.Brightness:
+ case FunctionAttributeKey.Mode:
+ case FunctionAttributeKey.SetTemp:
+ case FunctionAttributeKey.FanSpeed:
+ case FunctionAttributeKey.Percent:
+ //case FunctionAttributeKey.FadeTime:
+ if (attr.curValue.ToString() == "{}")
+ {
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ attr.curValue = "off";
+ }
+ else
+ {
+ attr.curValue = "0";
+ }
+ }
+ if (attr.key == FunctionAttributeKey.SetTemp)
+ {
+ double vv = 16;
+ Double.TryParse(attr.curValue.ToString(), out vv);
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
+ }
+ else
+ {
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ }
+ break;
+ }
}
+ sFunc.sid = this.sid;
return sFunc;
}
@@ -348,9 +406,9 @@
var acd = new AlinkControlData();
acd.sid = sid;
- var aca = new AlinkControlAttributes();
foreach (var dic in commandDictionary)
{
+ var aca = new AlinkControlAttributes();
aca.key = dic.Key;
aca.value = dic.Value;
acd.status.Add(aca);
@@ -369,6 +427,7 @@
ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
aaao.deviceId = this.deviceId;
aaao.spk = this.spk;
+ aaao.bus = this.bus;
foreach (var kv in keyValues)
{
aaao.attributes.Add(new AlinkControlAttributes()
@@ -451,6 +510,7 @@
/// 鍔熻兘灞炴��
/// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
/// </summary>
+ [System.Serializable]
public class FunctionAttributes
{
/// <summary>
@@ -464,11 +524,11 @@
/// <summary>
/// 鏈�澶у��
/// </summary>
- public int max=100;
+ public int max = 100;
/// <summary>
/// 鏈�灏忓��
/// </summary>
- public int min=0;
+ public int min = 0;
/// <summary>
/// 鏁版嵁绫诲瀷
/// </summary>
@@ -478,270 +538,6 @@
/// </summary>
public object curValue = new object();
- //----app鑷畾涔�
- /// <summary>
- /// 灞炴�у�煎崟浣�
- /// </summary>
- string _uintString;
- [Newtonsoft.Json.JsonIgnore]
- public string uintString
- {
- get
- {
- if (!string.IsNullOrEmpty(_uintString))
- {
- return _uintString;
- }
- var us = "";
- switch (key)
- {
- case "temperature":
- case "set_temperature":
- us = "掳C";
- break;
- case "percent":
- case "brightness":
- us = "%";
- break;
- }
- return us;
- }
- }
-
- /// <summary>
- /// 灞炴�у悕绉版樉绀烘枃鏈�
- /// 涓嫳鏂囨樉绀�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string name_text
- {
- get
- {
- string text = "";
- switch (key)
- {
- case "on_off":
- text = Language.StringByID(StringId.OnOff);
- break;
- case "brightness":
- text = Language.StringByID(StringId.Brightness);
- break;
- case "color":
- text = Language.StringByID(StringId.ColorValue);
- break;
- case "mode":
- text = Language.StringByID(StringId.Mode);
- break;
- case "fan":
- text = Language.StringByID(StringId.FanSpeed);
- break;
- case "temperature":
- case "set_temperature":
- text = Language.StringByID(StringId.Temp);
- break;
- case "delay":
- text = Language.StringByID(StringId.Delay);
- break;
- case "cct":
- text = "CCT";
- break;
- //case "fade_time":
- case "percent":
- text = Language.StringByID(StringId.PercentAdjustment);
- break;
- //case "lock":
- //case "ico":
- //case "swing":
- //case "set_point":
- //case "pm25":
- //case "volume":
- //case "vol_step":
- //case "source":
- //case "treble":
- //case "bass":
- //case "playlist":
- //case "song_name":
- //case "current_status":
- //case "enable":
- //case "lux":
- //case "adjust_value":
- //case "range":
- //case "humidity":
- //case "type":
- //case "state":
- //case "sensitivity":
- //case "pm25value":
- }
- return text;
- }
- }
-
- /// <summary>
- /// 鑾峰彇褰撳墠灞炴�х殑鏄剧ず鏂囨湰
- /// 涓嫳鏂囨樉绀�
- /// </summary>
- public string GetCurValueText()
- {
- return GetValueText(curValue.ToString());
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾灞炴�х殑鏄剧ず鏂囨湰
- /// 涓嫳鏂囨樉绀�
- /// </summary>
- public string GetValueText(string value)
- {
- string text = "";
- value = value.Replace("{}", "");
- switch (key)
- {
- case "on_off":
- text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
- break;
- case "temperature":
- case "set_temperature":
- case "brightness":
- case "percent":
- if (value == "")
- {
- this.curValue = this.min;
- text = this.min.ToString();
- }
- else
- {
- text = value;
- }
- break;
- //case "color":
- case "mode":
- switch (value)
- {
- //----绌鸿皟
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- case "cool":
- text = Language.StringByID(StringId.Cool);
- break;
- case "heat":
- text = Language.StringByID(StringId.Heat);
- break;
- case "dry":
- text = Language.StringByID(StringId.Dry);
- break;
- case "fan":
- text = Language.StringByID(StringId.AirSupply);
- break;
- //-----鍦扮儹
- case "day":
- text = Language.StringByID(StringId.Day);
- break;
- case "night":
- text = Language.StringByID(StringId.Night);
- break;
- case "away":
- text = Language.StringByID(StringId.Away);
- break;
- case "normal":
- text = Language.StringByID(StringId.Normal);
- break;
- case "timer":
- text = Language.StringByID(StringId.Timer);
- break;
- default:
- if (this.value.Contains("cool"))
- {
- this.curValue = "cool";
- text = Language.StringByID(StringId.Cool);
- }
- else if (this.value.Contains("day"))
- {
- this.curValue = "day";
- text = Language.StringByID(StringId.Day);
- }
- else
- {
- foreach (var v in this.value)
- {
- this.curValue = v;
- text = GetCurValueText();
- }
- }
- break;
- }
- break;
- case "fan":
- switch (value)
- {
- case "high":
- text = Language.StringByID(StringId.HighWindSpeed);
- break;
- case "medium":
- text = Language.StringByID(StringId.MiddleWindSpeed);
- break;
- case "low":
- text = Language.StringByID(StringId.LowWindSpeed);
- break;
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- default:
- if (this.value.Contains("low"))
- {
- this.curValue = "low";
- text = Language.StringByID(StringId.LowWindSpeed);
- }
- else
- {
- foreach (var v in this.value)
- {
- this.curValue = v;
- text = GetCurValueText();
- }
- }
- break;
- }
- break;
- //case "delay":
- //case "cct":
- //case "fade_time":
- //case "lock":
- //case "ico":
- //case "swing":
- //case "set_point":
- //case "pm25":
- //case "volume":
- //case "vol_step":
- //case "source":
- //case "treble":
- //case "bass":
- //case "playlist":
- //case "song_name":
- //case "current_status":
- //case "enable":
- //case "lux":
- //case "adjust_value":
- //case "range":
- //case "humidity":
- //case "type":
- //case "state":
- //case "sensitivity":
- //case "pm25value":
- case "high":
- text = Language.StringByID(StringId.HighWindSpeed);
- break;
- case "medium":
- text = Language.StringByID(StringId.MiddleWindSpeed);
- break;
- case "low":
- text = Language.StringByID(StringId.LowWindSpeed);
- break;
- case "auto":
- text = Language.StringByID(StringId.Auto);
- break;
- }
- return text;
- }
}
/// <summary>
/// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
@@ -759,7 +555,11 @@
/// <summary>
/// 棰滆壊
/// </summary>
- public const string Color = "color";
+ public const string RGB = "rgb";
+ /// <summary>
+ /// 娓愬彉鏃堕棿
+ /// </summary>
+ public const string FadeTime = "fade_time";
/// <summary>
/// 妯″紡
/// </summary>
@@ -769,9 +569,9 @@
/// </summary>
public const string FanSpeed = "fan";
/// <summary>
- /// 娓╁害
+ /// 璁剧疆娓╁害
/// </summary>
- public const string Temp = "temperature";
+ public const string SetTemp = "set_temp";
/// <summary>
/// 寤舵椂
/// </summary>
@@ -784,6 +584,14 @@
/// 鐧惧垎姣�
/// </summary>
public const string Percent = "percent";
+ /// <summary>
+ /// 瀹ゅ唴娓╁害
+ /// </summary>
+ public const string IndoorTemp = "room_temp";
+ /// <summary>
+ /// value
+ /// </summary>
+ public const string Value = "value";
}
/// <summary>
/// 璁惧鍔熻兘oid
@@ -820,7 +628,15 @@
return Convert.ToByte(addresses.Substring(2, 2), 16);
}
}
- public byte loopId;
+ public byte LoopId
+ {
+ get
+ {
+ return Convert.ToByte(loopId, 16);
+ }
+ }
+
+ public string loopId;
}
public static class SPK
@@ -916,15 +732,15 @@
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
- public const string ElectricSocket = "electric.socket ";
+ public const string ElectricSocket = "electrical.socket";
/// <summary>
/// 瀹剁數銆佺數瑙�
/// </summary>
- public const string ElectricTV = "electric.tv";
+ public const string ElectricTV = "electrical.tv";
/// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
- public const string ElectricFan = "electric.fan";
+ public const string ElectricFan = "electrical.fan";
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0