From b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期四, 22 四月 2021 09:25:06 +0800
Subject: [PATCH] 2021-4-22 对接乐橙可视对讲
---
HDL_ON/Entity/FunctionList.cs | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index baaa0f8..898d24e 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -98,7 +98,7 @@
return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan
|| obj.spk == SPK.ElectricSocket
|| obj.spk == SPK.IrLearn
- || obj.spk == SPK.IrTV
+ || obj.spk == SPK.TvIr
|| obj.spk == SPK.ElectricTV
|| obj.spk == SPK.ElectricTuyaAirCleaner
|| obj.spk == SPK.ElectricTuyaWeepRobot
@@ -125,7 +125,7 @@
/// </summary>
public List<Function> GetTVList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.IrTV);
+ return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.TvIr);
}
/// <summary>
/// 瀹剁數鎻掑骇鍒楄〃
@@ -195,6 +195,18 @@
);
}
+<<<<<<< Updated upstream
+=======
+ /// <summary>
+ /// 鍙瀵硅鍒楄〃,褰撲负null鎴杝ize涓�0鍒欎笉鏄剧ず鍙瀵硅icon
+ /// </summary>
+ // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
+ public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>();
+
+ /// <summary>
+ /// 鍦烘櫙鍒楄〃
+ /// </summary>
+>>>>>>> Stashed changes
public List<Scene> scenes = new List<Scene>();
/// <summary>
@@ -335,6 +347,7 @@
List.scenes.Remove(scene);
}
}
+
/// <summary>
/// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠�
/// </summary>
@@ -452,6 +465,7 @@
})
{ IsBackground = true }.Start();
}
+
#region 鍦烘櫙鐩稿叧
/// <summary>
/// 娣诲姞鍦烘櫙
--
Gitblit v1.8.0