From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/FunctionList.cs | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 0a3615e..d15b97e 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -565,6 +565,33 @@
}
bool lockReadFunctionStatus = false;
+
+ /// <summary>
+ /// 璇诲彇绗笁鏂硅澶囩姸鎬�
+ /// </summary>
+ public void Read3tyFunctionStatus()
+ {
+ //璇诲彇娑傞甫璁惧鐘舵��
+ if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0)
+ {
+ var page = new List<string>();
+ int count = 0;
+ foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya))
+ {
+ page.Add(function.deviceId);
+ count++;
+ if (count > 9)
+ {
+ DriverLayer.Control.Ins.ReadFunctionsInfo(page);
+ page.Clear();
+ count = 0;
+ }
+ }
+ DriverLayer.Control.Ins.ReadFunctionsInfo(page);
+ }
+
+ }
+
/// <summary>
/// 璇诲彇鍏ㄩ儴鍔熻兘鐨勭姸鎬�
/// </summary>
@@ -586,24 +613,7 @@
lockReadFunctionStatus = true;
try
{
- //璇诲彇娑傞甫璁惧鐘舵��
- if (GetDeviceFunctionList(SPK.BrandType.Tuya).Count > 0)
- {
- var page = new List<string>();
- int count = 0;
- foreach (var function in GetDeviceFunctionList(SPK.BrandType.Tuya))
- {
- page.Add(function.deviceId);
- count++;
- if (count > 9)
- {
- DriverLayer.Control.Ins.ReadFunctionsInfo(page);
- page.Clear();
- count = 0;
- }
- }
- DriverLayer.Control.Ins.ReadFunctionsInfo(page);
- }
+ Read3tyFunctionStatus();
if (DriverLayer.Control.Ins.IsRemote)
{
--
Gitblit v1.8.0