From c06382f1b619e1dc7f37be36a0cee126239abdee Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 30 十月 2024 11:35:22 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Admin.NET/WCS.Application/Util/LedDll.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/LedDll.cs b/Admin.NET/WCS.Application/Util/LedDll.cs
index 372a9fa..75ce53f 100644
--- a/Admin.NET/WCS.Application/Util/LedDll.cs
+++ b/Admin.NET/WCS.Application/Util/LedDll.cs
@@ -1030,25 +1030,28 @@
AreaRect.left = 0;
AreaRect.top = 0;
AreaRect.width = m_ledWidth;
- AreaRect.height = 106;
+ AreaRect.height = m_ledHeight;
+
LedDll.LV_AddImageTextArea(hProgram, 0, 2, ref AreaRect, 1);
// 鍖哄煙瀛椾綋鍙橀噺 鍙傛暟璁惧畾
LedDll.FONTPROP FontProp = new LedDll.FONTPROP();//鏂囧瓧灞炴��
FontProp.FontName = "瀹嬩綋";
- FontProp.FontSize = 20;
+ FontProp.FontSize = 16;
FontProp.FontColor = LedDll.COLOR_RED;
FontProp.FontBold = 1;
+
// 鍖哄煙瀛椾綋杩愯閫熷害 甯﹀叆鏂瑰紡
LedDll.PLAYPROP PlayProp = new LedDll.PLAYPROP();
PlayProp.InStyle = 0;
PlayProp.DelayTime = 3;
PlayProp.Speed = 2;
+
// 澶氭枃鏈尯鍩� 鐢ㄤ簬鏄剧ず鎵樼洏淇℃伅
- nResult = LedDll.LV_AddMultiLineTextToImageTextArea(hProgram, 0, 2, LedDll.ADDTYPE_STRING, m_text, ref FontProp, ref PlayProp, 0, 0);
+ nResult = LedDll.LV_AddMultiLineTextToImageTextArea(hProgram, 0, 2, LedDll.ADDTYPE_STRING, m_text, ref FontProp, ref PlayProp, 0, 1);
// 鍙戦�佸埌LED灞忓箷
nResult = LedDll.LV_Send(ref CommunicationInfo, hProgram);
--
Gitblit v1.8.0