From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index be9b2c6..7055171 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -414,12 +414,15 @@
for (int b = 0; b < dicList.Count; b++)
{
var dic = dicList[b];
- var userId = dic["value"].ToString();
- var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
- s += FaceItem.userName;
+ //var userId = dic["value"].ToString();
+ //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
+ //s += FaceItem.userName;
+ //s += ",";
+ //tag += FaceItem.userId;
+ //tag += "_";
+ var userName = dic["value"].ToString();
+ s += userName;
s += ",";
- tag += FaceItem.userId;
- tag += "_";
}
inputView.btnState.Text = s;
}
@@ -445,10 +448,10 @@
var FaceItem = this.GetFaceItem(userId, device.deviceId);
s += FaceItem.userName;
s += ",";
+
+
}
- //string userId = this.GetKeyValue("user_id",dicList);
- //var FaceItem = this.GetFaceItem(userId, device.deviceId);
- //inputView.btnState.Text = FaceItem.userName;
+
}
inputView.btnState.Text = s;
}
@@ -2170,12 +2173,15 @@
for (int b = 0; b < dicList.Count; b++)
{
var dic = dicList[b];
- var userId = dic["value"].ToString();
- var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
- s += FaceItem.userName;
+ //var userId = dic["value"].ToString();
+ //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
+ //s += FaceItem.userName;
+ //s += ",";
+ //tag += FaceItem.userId;
+ //tag += "_";
+ var userName = dic["value"].ToString();
+ s += userName;
s += ",";
- tag += FaceItem.userId;
- tag += "_";
}
button1.Text = s;
button1.Tag = tag;
--
Gitblit v1.8.0