From 75d4c6a612f69815af7aa7117351c45a581fb93e Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 13:38:58 +0800
Subject: [PATCH] CS-DL30F-V100 门锁隐藏视频功能
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 4 ++++
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs | 6 ++++++
HDL_ON/UI/UI1-Login/LoginPage.cs | 6 +++---
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 703ff9a..a89c424 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -309,7 +309,7 @@
//etAccount.Text = "13922115008";//鍒樻��
//etAccount.Text = "support7@hdlautomation.com";
etAccount.Text = "13336018868";
- //etAccount.Text = "15262988048";
+ etAccount.Text = "13435693712";
}
@@ -334,9 +334,9 @@
{
etPassword.Text = "zzy20020928";
}
- else if(etAccount.Text == "18600200915")
+ else if(etAccount.Text == "13435693712")
{
- etPassword.Text = "ZJtiaoshi";
+ etPassword.Text = "a123456";
}else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index c0e43e7..7c6cfa8 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -231,6 +231,10 @@
};
foreach (var f in room.GetRoomFunctions(false))
{
+ //if(f.spk == SPK.OtherCommon)
+ //{
+ // continue;
+ //}
if (f.trait_on_off.curValue.ToString() == "on")
{
btn.Visible = true;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index 1f4a5c5..c21f027 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -264,6 +264,7 @@
rtvFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/RTV.png";
rtvFL.GetTextButton().TextID = StringId.shishishipin;
+
//涓存椂瀵嗙爜
pswFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
whiteFl.AddChidren(pswFL);
@@ -273,6 +274,11 @@
pswFL.AddTextButtonView();
pswFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/OneOpenLock.png";
pswFL.GetTextButton().TextID = StringId.linshimima1;
+ if (device.omodel.Contains("CS-DL30F-V100"))
+ {
+ rtvFL.Visible = rtvFL.Enable = false;
+ pswFL.X = Application.GetRealWidth(26);
+ }
//鍘嗗彶璁板綍
recordFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
--
Gitblit v1.8.0