From a701116db249da668d1e1022aeb0b2908a5a1ea2 Mon Sep 17 00:00:00 2001
From: sunbeam <fcb1995@163.com>
Date: Wed, 23 Apr 2025 16:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dlg/msg.aardio  |  5 ++++-
 dlg/show.aardio | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/dlg/msg.aardio b/dlg/msg.aardio
index 3206c23..8d20056 100644
--- a/dlg/msg.aardio
+++ b/dlg/msg.aardio
@@ -7,7 +7,8 @@ msg301_test4 = 0;
 msg301_test5 = 0;
 msg301_FanState = 0;
 msg301_HeatState = 0;
-
+msg301_SM_KBState = 0;
+msg301_SM_ZDState = 0;
 
 getbitdata = function(byte,startbit,len){
 	return ((byte>>startbit) & ((1<<len) - 1)); 
@@ -50,6 +51,8 @@ MsgPro = function(id,data){
 		case 0x301 {
 			msg301_FanState = getbitdata(data[3],0,2);
 			msg301_HeatState = getbitdata(data[3],2,2);
+			msg301_SM_KBState = getbitdata(data[3],4,2);
+			msg301_SM_ZDState = getbitdata(data[3],6,2);
 			msg301_test1 = data[4];
 			msg301_test2 = data[5];
 			msg301_test3 = data[6];
diff --git a/dlg/show.aardio b/dlg/show.aardio
index bb91667..21bfd46 100644
--- a/dlg/show.aardio
+++ b/dlg/show.aardio
@@ -6,14 +6,14 @@ import console;
 show = win.form(text="P417上位机";right=984;bottom=602;bgcolor=16777215;border="dialog frame";style=33554432)
 show.add(
 bkplus={cls="bkplus";left=128;top=14;right=573;bottom=510;ah=1;aw=1;background="\res\座椅.png";z=1};
-btn_Fan={cls="AntdUI.button";text="通风";left=736;top=31;right=817;bottom=106;bgcolor=65280;z=10};
+btn_Fan={cls="AntdUI.button";text="通风";left=713;top=31;right=794;bottom=106;bgcolor=65280;z=10};
 btn_HG_F={cls="AntdUI.button";left=52;top=367;right=133;bottom=442;bgcolor=65280;z=6};
 btn_HG_R={cls="AntdUI.button";left=479;top=367;right=560;bottom=442;bgcolor=65280;z=7};
-btn_Heat={cls="AntdUI.button";text="加热";left=736;top=117;right=817;bottom=192;bgcolor=65280;z=11};
+btn_Heat={cls="AntdUI.button";text="加热";left=713;top=117;right=794;bottom=192;bgcolor=65280;z=11};
 btn_KB_F={cls="AntdUI.button";left=263;top=87;right=344;bottom=162;bgcolor=16777215;z=2};
 btn_KB_R={cls="AntdUI.button";left=584;top=72;right=665;bottom=147;bgcolor=65280;z=3};
-btn_Massage={cls="AntdUI.button";text="靠背按摩";left=737;top=203;right=818;bottom=278;bgcolor=65280;z=17};
-btn_Massage_ZD={cls="AntdUI.button";text="坐垫按摩";left=736;top=295;right=817;bottom=370;bgcolor=65280;z=26};
+btn_Massage={cls="AntdUI.button";text="靠背按摩";left=714;top=203;right=795;bottom=278;bgcolor=65280;z=17};
+btn_Massage_ZD={cls="AntdUI.button";text="坐垫按摩";left=713;top=295;right=794;bottom=370;bgcolor=65280;z=26};
 btn_PGL_M={cls="AntdUI.button";text="-";left=737;top=534;right=818;bottom=573;bgcolor=65280;z=23};
 btn_PGL_P={cls="AntdUI.button";text="+";left=737;top=487;right=818;bottom=526;bgcolor=65280;z=22};
 btn_PGR_M={cls="AntdUI.button";text="-";left=840;top=533;right=921;bottom=570;bgcolor=65280;z=25};
@@ -30,7 +30,11 @@ btn_YT1_P={cls="AntdUI.button";text="+";left=735;top=391;right=816;bottom=430;bg
 btn_YT2_M={cls="AntdUI.button";text="-";left=840;top=437;right=921;bottom=476;bgcolor=65280;z=21};
 btn_YT2_P={cls="AntdUI.button";text="+";left=737;top=437;right=818;bottom=476;bgcolor=65280;z=20};
 btn_ZY_D={cls="AntdUI.button";left=479;top=444;right=560;bottom=519;bgcolor=65280;z=5};
-btn_ZY_U={cls="AntdUI.button";left=479;top=291;right=560;bottom=366;bgcolor=65280;z=4}
+btn_ZY_U={cls="AntdUI.button";left=479;top=291;right=560;bottom=366;bgcolor=65280;z=4};
+stFanState={cls="static";text="Static";left=806;top=46;right=856;bottom=89;transparent=1;z=27};
+stSMKBState={cls="static";text="Static";left=807;top=215;right=857;bottom=258;transparent=1;z=29};
+stSMZDState={cls="static";text="Static";left=806;top=309;right=856;bottom=352;transparent=1;z=30};
+static={cls="static";text="Static";left=806;top=137;right=856;bottom=180;transparent=1;z=28}
 )
 /*}}*/
 
@@ -41,9 +45,15 @@ import win.timer
 var showtimer = win.timer( show ,50);
 showtimer.onTimer = function(){
 	CT_UpdateCANTxMsg(0x201,10,txdata);
-	//signaldislay();
+	ShowSignalDiaplay();
 }
 
+ShowSignalDiaplay = function(){
+	show.stSMZDState.text = msg301_SM_ZDState;
+	show.stSMKBState.text = msg301_SM_KBState;
+}
+
+
 //图标 https://ant-design.antgroup.com/components/icon-cn
 AntdUI.setThemes(show,"Light")
 show.btn_KB_F.Type = 2;