From bee7814dba8e033d0f36060926275b90c85c779c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 06 九月 2023 14:39:57 +0800
Subject: [PATCH] 2023年09月06日14:39:55
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs | 2 +-
HDL_ON/DAL/Server/HttpUtil.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 5235064..b659327 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index b9b260f..1e2e788 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
#endif
return list;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
index ade04dc..a3bfaf0 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/brightnessView.cs
@@ -217,7 +217,7 @@
//{
// return;
//}
- action(brightnesValue.ToString(), UnitSring(stateValue));
+ action(seekBarVol.Progress.ToString(), UnitSring(seekBarVol.Progress.ToString()));
//绉婚櫎fLayout鐣岄潰
fLayout.RemoveFromParent();
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
index 0e3bf7b..c599ae8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -28,6 +28,13 @@
SelectedImagePath = "AksIcon/shang_selected.png",
Name = "涓�",
};
+
+ Button btnTopClick = new Button
+ {
+ X = Application.GetRealWidth(52),
+ Width = Application.GetRealWidth(76),
+ Height = Application.GetRealHeight(40),
+ };
Button btnBottom = new Button
{
Y = Application.GetRealWidth(144),
@@ -37,6 +44,13 @@
UnSelectedImagePath = "AksIcon/xia.png",
SelectedImagePath = "AksIcon/xia_selected.png",
Name = "涓�",
+ };
+ Button btnBottomClick = new Button
+ {
+ Y = Application.GetRealWidth(128),
+ X = Application.GetRealWidth(52),
+ Width = Application.GetRealWidth(76),
+ Height = Application.GetRealHeight(52),
};
Button btnLeft = new Button
{
@@ -49,6 +63,14 @@
Name = "宸�",
};
+
+ Button btnLeftClick = new Button
+ {
+ Y = Application.GetRealWidth(52),
+ Width = Application.GetRealWidth(52),
+ Height = Application.GetRealHeight(76),
+
+ };
Button btnRight = new Button
{
Y = Application.GetRealWidth(78),
@@ -58,6 +80,15 @@
UnSelectedImagePath = "AksIcon/you.png",
SelectedImagePath = "AksIcon/you_selected.png",
Name = "鍙�",
+
+ };
+
+ Button btnRightClick = new Button
+ {
+ X = Application.GetRealWidth(128),
+ Y = Application.GetRealWidth(52),
+ Width = Application.GetRealWidth(52),
+ Height = Application.GetRealHeight(76),
};
@@ -85,11 +116,17 @@
public void AddView(FrameLayout layout)
{
this.AddChidren(btnTop);
+ this.AddChidren(btnTopClick);
this.AddChidren(btnBottom);
+ this.AddChidren(btnBottomClick);
this.AddChidren(btnLeft);
+ this.AddChidren(btnLeftClick);
this.AddChidren(btnRight);
+ this.AddChidren(btnRightClick);
this.AddChidren(btnOkbj);
this.AddChidren(btnOk);
+
+
layout.AddChidren(this);
//btnBottom.Y = btnOkbj.Bottom + Application.GetRealWidth(16);
@@ -107,6 +144,7 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnTop.MouseUpEventHandler += UpClick;
+ btnTopClick.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -119,6 +157,7 @@
action?.Invoke(keypadEntity);
};
btnTop.MouseDownEventHandler += DownClick;
+ btnTopClick.MouseDownEventHandler += DownClick;
}
/// <summary>
@@ -135,6 +174,7 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnBottom.MouseUpEventHandler += UpClick;
+ btnBottomClick.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -147,6 +187,7 @@
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
};
btnBottom.MouseDownEventHandler += DownClick;
+ btnBottomClick.MouseDownEventHandler += DownClick;
}
/// <summary>
/// 宸�
@@ -160,6 +201,7 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnLeft.MouseUpEventHandler += UpClick;
+ btnLeftClick.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -172,6 +214,8 @@
//鎸変笅鍘绘敼鍙樿儗鏅鑹�
};
btnLeft.MouseDownEventHandler += DownClick;
+ btnLeftClick.MouseDownEventHandler += DownClick;
+
}
/// <summary>
/// 鍙�
@@ -185,6 +229,7 @@
//寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
};
btnRight.MouseUpEventHandler += UpClick;
+ btnRightClick.MouseUpEventHandler += UpClick;
EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -197,6 +242,7 @@
action?.Invoke(keypadEntity);
};
btnRight.MouseDownEventHandler += DownClick;
+ btnRightClick.MouseDownEventHandler += DownClick;
}
--
Gitblit v1.8.0