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 | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 6bf5e6d..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>
@@ -528,7 +512,7 @@
{
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();
@@ -1032,9 +1016,9 @@
/// </summary>
public const string IrModule = "ir.module";
/// <summary>
- /// 绾㈠绌鸿皟
+ /// 绾㈠鐢佃
/// </summary>
- public const string IrAC = "ir.ac";
+ public const string TvIr = "ir.tv";
/// <summary>
@@ -1116,12 +1100,8 @@
/// 瀹剁數
/// </summary>
public const string Electric = "electrical";
- /// <summary>
- /// 绾㈠璁惧
- /// </summary>
- public const string IR = "ir";
-
+ //Music = 0x09,
}
--
Gitblit v1.8.0