From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/Entity/Function/Function.cs | 69 ++++++----------------------------
1 files changed, 12 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 0997ffa..0216ac5 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -65,22 +65,6 @@
#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>
@@ -140,16 +124,8 @@
return true;
}
- /// <summary>
- /// icon鏂囦欢鍚嶇О
- /// </summary>
- public string IconName
- {
- get
- {
- return spk.Replace(".","");
- }
- }
+
+
/// <summary>
/// 涓婁竴娆℃墦寮�鐨勪寒搴�
@@ -536,7 +512,9 @@
{
var sendDataObj = new AlinkFunctionStatusObj();
sendDataObj.id = Control.Ins.msg_id.ToString();
- sendDataObj.time_stamp = Utlis.GetTimestamp();
+ sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
+
+
var acd = new AlinkStatusData();
acd.sid = sid;
foreach (var dic in commandDictionary)
@@ -546,7 +524,9 @@
aca.value = dic.Value;
acd.status.Add(aca);
}
+
sendDataObj.objects.Add(acd);
+
return sendDataObj;
}
/// <summary>
@@ -721,22 +701,9 @@
/// </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鑷姞
@@ -835,10 +802,6 @@
/// 鎵撳紑鐧昏(椋庢墖)
/// </summary>
public const string OpenLevel = "openLevel";
- /// <summary>
- /// 绾㈠鎸夐敭
- /// </summary>
- public const string Key = "key";
#region tuya
@@ -1025,13 +988,9 @@
/// </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>
@@ -1039,7 +998,7 @@
/// <summary>
/// 瀹剁數銆佹秱楦︾數椋庢墖
/// </summary>
- public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
+ public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
/// <summary>
/// 瀹剁數銆佹秱楦︽壂鍦版満鍣ㄤ汉
/// </summary>
@@ -1057,9 +1016,9 @@
/// </summary>
public const string IrModule = "ir.module";
/// <summary>
- /// 绾㈠閬ユ帶鍣�
+ /// 绾㈠鐢佃
/// </summary>
- public const string IrLearn = "ir.learn";
+ public const string TvIr = "ir.tv";
/// <summary>
@@ -1141,12 +1100,8 @@
/// 瀹剁數
/// </summary>
public const string Electric = "electrical";
- /// <summary>
- /// 绾㈠璁惧
- /// </summary>
- public const string IR = "ir";
-
+ //Music = 0x09,
}
--
Gitblit v1.8.0