From a023039e525469ef33bf0324d17d3e954e6b29d7 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:54:20 +0800
Subject: [PATCH] 兼容温总的添加红外宝
---
HDL_ON/Entity/Function/Function.cs | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2eca3c6..0997ffa 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -65,6 +65,22 @@
#region 浼樺寲鍖哄煙 2021-02-25
/// <summary>
+ /// 鏇存柊鐨勬渶鍚庢椂闂�
+ /// </summary>
+ public string time_stamp = "1615261019796";
+
+ public string GeteTime()
+ {
+ try
+ {
+ DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+ return startTime.AddMilliseconds(Convert.ToDouble(time_stamp)).ToString("s");
+ }
+ catch {
+ return DateTime.MinValue.ToString("s");
+ }
+ }
+ /// <summary>
/// 鑾峰彇灞炴�у垪琛�
/// </summary>
/// <returns></returns>
@@ -79,7 +95,7 @@
return attrs;
}
/// <summary>
- /// 鑾峰彇鍒跺畾灞炴��
+ /// 鑾峰彇鎸囧畾灞炴��
/// </summary>
/// <returns></returns>
public FunctionAttributes GetAttribute(string key)
@@ -96,7 +112,7 @@
public string GetAttrState(string key)
{
var attrState = attributes.Find((s) => s.key == key.ToString());
- if(attrState == null)
+ if (attrState == null || string.IsNullOrEmpty(attrState.state))
{
return "0";
}
@@ -108,7 +124,7 @@
/// <param name="key"></param>
/// <param name="value"></param>
/// <returns>淇敼缁撴灉</returns>
- public bool SetAttrState(string key, string value)
+ public bool SetAttrState(string key, object value)
{
//var attrState = status.Find((s) => s.key == key.ToString());
var attr = attributes.Find((s) => s.key == key);
@@ -118,13 +134,36 @@
}
else
{
- attr.state = value;
+ attr.state = value.ToString();
+ attr.curValue = value.ToString();
}
return true;
}
+ /// <summary>
+ /// icon鏂囦欢鍚嶇О
+ /// </summary>
+ public string IconName
+ {
+ get
+ {
+ return spk.Replace(".","");
+ }
+ }
+ /// <summary>
+ /// 涓婁竴娆℃墦寮�鐨勪寒搴�
+ /// 鐏厜绉佹湁灞炴��
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int lastBrightness = 100;
+ /// <summary>
+ /// 宸ヤ綔妯″紡瀵瑰簲鐨勫伐浣滄俯搴�
+ /// 鍦扮儹绉佹湁灞炴��
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public Dictionary<string, byte> Fh_Mode_Temp = new Dictionary<string, byte>();
#endregion
@@ -263,7 +302,6 @@
public void CollectFunction()
{
var result = "";
- //var waitPage = new Loading();
new System.Threading.Thread(() =>
{
@@ -282,6 +320,12 @@
{
collect = !collect;
IMessageCommon.Current.ShowErrorInfoAlter(result);
+ });
+ }else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ UI.HomePage.RefreshFunctionView();
});
}
})
@@ -492,9 +536,7 @@
{
var sendDataObj = new AlinkFunctionStatusObj();
sendDataObj.id = Control.Ins.msg_id.ToString();
- sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
-
-
+ sendDataObj.time_stamp = Utlis.GetTimestamp();
var acd = new AlinkStatusData();
acd.sid = sid;
foreach (var dic in commandDictionary)
@@ -504,9 +546,7 @@
aca.value = dic.Value;
acd.status.Add(aca);
}
-
sendDataObj.objects.Add(acd);
-
return sendDataObj;
}
/// <summary>
@@ -672,13 +712,41 @@
/// </summary>
public const string Mode = "mode";
/// <summary>
+ /// 宸ヤ綔妯″紡
+ /// 鍦扮儹/鍦板喎/鍔熺巼鍦扮儹/鍔熺巼鍦板喎
+ /// </summary>
+ public const string WorkMode = "mode_work";
+ /// <summary>
/// 椋庨��
/// </summary>
public const string FanSpeed = "fan";
/// <summary>
+ /// 鎵嬪姩椋庡悜
+ /// </summary>
+ public const string FanManual = "fan_manual";
+ /// <summary>
+ /// 鑷姩椋庡悜
+ /// </summary>
+ public const string FanAuto = "fan_auto";
+
+ /// <summary>
/// 璁剧疆娓╁害
/// </summary>
public const string SetTemp = "set_temp";
+ /// <summary>
+ /// 娓╁害鍔犲噺
+ /// </summary>
+ public const string SetTempStep = "set_temp_step";
+ /// <summary>
+ /// 娓╁害妯″紡
+ /// 绌鸿皟銆佸湴鐑�//app鑷姞
+ /// </summary>
+ public const string TempType = "temperature_type";
+ /// <summary>
+ /// 鏃堕棿鏍囪
+ /// 鍦扮儹//app鑷姞
+ /// </summary>
+ public const string TimeFlag = "time_flag";
/// <summary>
/// 寤舵椂
/// </summary>
@@ -763,8 +831,14 @@
/// 璐熺瀛愬墿浣欐椂闂�
/// </summary>
public const string AnionTimeLeft = "anion_time_surplus";
-
-
+ /// <summary>
+ /// 鎵撳紑鐧昏(椋庢墖)
+ /// </summary>
+ public const string OpenLevel = "openLevel";
+ /// <summary>
+ /// 绾㈠鎸夐敭
+ /// </summary>
+ public const string Key = "key";
#region tuya
@@ -865,6 +939,10 @@
/// </summary>
public const string AcStandard = "ac.standard";
/// <summary>
+ /// 锛堢孩澶栫┖璋冿級
+ /// </summary>
+ public const string AcIr= "ir.ac";
+ /// <summary>
/// 锛堝湴鐑級
/// </summary>
public const string FloorHeatStandard = "floorHeat.standard";
@@ -947,9 +1025,13 @@
/// </summary>
public const string ElectricTV = "electrical.tv";
/// <summary>
+ /// 绾㈠銆佺數瑙�
+ /// </summary>
+ public const string TvIr = "ir.tv";
+ /// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
- public const string ElectricFan = "electrical.fan";
+ public const string ElectricFan = "electrical.fan";
/// <summary>
/// 瀹剁數銆佹秱楦︾┖姘斿噣鍖栧櫒
/// </summary>
@@ -957,7 +1039,7 @@
/// <summary>
/// 瀹剁數銆佹秱楦︾數椋庢墖
/// </summary>
- public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
+ public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
/// <summary>
/// 瀹剁數銆佹秱楦︽壂鍦版満鍣ㄤ汉
/// </summary>
@@ -975,9 +1057,9 @@
/// </summary>
public const string IrModule = "ir.module";
/// <summary>
- /// 绾㈠绌鸿皟
+ /// 绾㈠閬ユ帶鍣�
/// </summary>
- public const string IrAC = "ir.ac";
+ public const string IrLearn = "ir.learn";
/// <summary>
@@ -1059,8 +1141,12 @@
/// 瀹剁數
/// </summary>
public const string Electric = "electrical";
+ /// <summary>
+ /// 绾㈠璁惧
+ /// </summary>
+ public const string IR = "ir";
- //Music = 0x09,
+
}
--
Gitblit v1.8.0