Merge branch 'test'

# Conflicts:
#	dlg/switch.aardio
This commit is contained in:
sunbeam 2023-08-17 14:36:19 +08:00
commit 6d2a0fc3e9

View File

@ -5,34 +5,42 @@ import console;
show = win.form(text="P417上位机";right=984;bottom=602;bgcolor=16777215;border="dialog frame";style=33554432)
show.add(
bkplus={cls="bkplus";left=49;top=93;right=880;bottom=372;ah=1;aw=1;background="\res\P417.png";z=1};
button={cls="button";text="Button";left=364;top=417;right=490;bottom=443;hide=1;z=31};
button={cls="button";text="Button";left=381;top=425;right=507;bottom=451;hide=1;z=31};
checkbox={cls="checkbox";text="点亮";left=112;top=31;right=198;bottom=68;ah=1;aw=1;bgcolor=16777215;font=LOGFONT(h=-22);z=3};
checkbox2={cls="checkbox";text="白天";left=208;top=32;right=294;bottom=69;ah=1;aw=1;bgcolor=16777215;checked=1;font=LOGFONT(h=-22);z=20};
plLeft={cls="plus";left=103;top=129;right=334;bottom=331;ah=1;aw=1;border={color=-7114533;width=1};z=2};
plRight={cls="plus";left=596;top=131;right=827;bottom=333;ah=1;aw=1;border={color=-7114533;width=1};z=26};
stDebug={cls="static";text="Static";left=376;top=455;right=618;bottom=482;hide=1;transparent=1;z=27};
stDebug2={cls="static";text="Static";left=376;top=494;right=618;bottom=521;hide=1;transparent=1;z=28};
stDebug={cls="static";text="Static";left=378;top=465;right=493;bottom=492;hide=1;transparent=1;z=27};
stDebug2={cls="static";text="Static";left=376;top=498;right=512;bottom=525;hide=1;transparent=1;z=28};
stKeyL1={cls="static";text="Static";left=276;top=136;right=321;bottom=182;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=4};
stKeyL2={cls="static";text="Static";left=276;top=204;right=321;bottom=250;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=5};
stKeyL3={cls="static";text="Static";left=276;top=276;right=321;bottom=322;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=6};
stKeyLdown={cls="static";text="Static";left=139;top=544;right=184;bottom=590;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=11};
stKeyLleft={cls="static";text="Static";left=85;top=498;right=130;bottom=544;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=9};
stKeyLok={cls="static";text="Static";left=141;top=500;right=186;bottom=546;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=8};
stKeyLright={cls="static";text="Static";left=202;top=501;right=247;bottom=547;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=10};
stKeyLup={cls="static";text="Static";left=134;top=450;right=179;bottom=496;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=7};
stKeyR1={cls="static";text="Static";left=682;top=454;right=727;bottom=500;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=12};
stKeyR2={cls="static";text="Static";left=681;top=491;right=726;bottom=537;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=13};
stKeyR3={cls="static";text="Static";left=681;top=527;right=726;bottom=573;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=14};
stKeyRdown={cls="static";text="Static";left=792;top=542;right=837;bottom=588;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=17};
stKeyRleft={cls="static";text="Static";left=741;top=501;right=786;bottom=547;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=18};
stKeyRok={cls="static";text="Static";left=792;top=500;right=837;bottom=546;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=16};
stKeyRright={cls="static";text="Static";left=833;top=498;right=878;bottom=544;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=19};
stKeyRup={cls="static";text="Static";left=791;top=465;right=836;bottom=511;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=15};
stKeyLdown={cls="static";text="Static";left=13;top=127;right=38;bottom=152;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=11};
stKeyLleft={cls="static";text="Static";left=13;top=165;right=38;bottom=190;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;notify=1;z=9};
stKeyLok={cls="static";text="Static";left=13;top=202;right=38;bottom=227;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=8};
stKeyLright={cls="static";text="Static";left=13;top=240;right=38;bottom=265;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=10};
stKeyLup={cls="static";text="Static";left=13;top=89;right=38;bottom=114;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=7};
stKeyR1={cls="static";text="Static";left=904;top=60;right=929;bottom=85;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=12};
stKeyR2={cls="static";text="Static";left=904;top=97;right=929;bottom=122;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=13};
stKeyR3={cls="static";text="Static";left=904;top=135;right=929;bottom=160;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=14};
stKeyRdown={cls="static";text="Static";left=904;top=210;right=929;bottom=235;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=17};
stKeyRleft={cls="static";text="Static";left=904;top=247;right=929;bottom=272;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=18};
stKeyRok={cls="static";text="Static";left=904;top=322;right=929;bottom=347;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=16};
stKeyRright={cls="static";text="Static";left=904;top=285;right=929;bottom=310;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=19};
stKeyRup={cls="static";text="Static";left=904;top=172;right=929;bottom=197;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=15};
stLocl={cls="static";left=180;top=225;right=192;bottom=237;bgcolor=255;color=255;font=LOGFONT(name='FontAwesome');z=29};
stLocr={cls="static";left=790;top=226;right=802;bottom=238;bgcolor=255;color=255;font=LOGFONT(name='FontAwesome');z=30};
stZBl={cls="static";text="坐标";left=10;top=393;right=430;bottom=441;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=24};
stZBr={cls="static";text="坐标";left=542;top=393;right=962;bottom=441;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=25};
stZBl={cls="static";text="坐标";left=4;top=384;right=424;bottom=432;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=24};
stZBr={cls="static";text="坐标";left=481;top=384;right=901;bottom=432;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=25};
static2={cls="static";text="亮度:";left=348;top=30;right=420;bottom=69;ah=1;align="center";aw=1;center=1;font=LOGFONT(h=-22);transparent=1;z=23};
static3={cls="static";text="触摸错误
压力错误
震动错误
其它错误";left=89;top=453;right=180;bottom=562;font=LOGFONT(h=-18);transparent=1;z=32};
static4={cls="static";text="触摸错误
压力错误
震动错误
其它错误";left=624;top=460;right=715;bottom=569;font=LOGFONT(h=-18);transparent=1;z=33};
stlight={cls="static";text="7";left=416;top=30;right=460;bottom=69;ah=1;align="center";aw=1;center=1;font=LOGFONT(h=-22);transparent=1;z=22};
trackbar={cls="trackbar";left=472;top=39;right=882;bottom=69;ah=1;aw=1;bgcolor=16777215;max=15;min=0;z=21}
)
@ -62,7 +70,7 @@ DisplayKey = function(){
show.stKeyL1.hide = keyL1==0?1:0;
show.stKeyL2.hide = keyL2==0?1:0;
show.stKeyL3.hide = keyL3==0?1:0;
/*
show.stKeyLup.text = keyLup;
show.stKeyLdown.text = keyLdown;
show.stKeyLleft.text = keyLleft;
@ -77,7 +85,7 @@ DisplayKey = function(){
show.stKeyRleft.text = keyRleft;
show.stKeyRright.text = keyRright;
show.stKeyRok.text = keyRok;
*/
Displayl("get 0x300 (" + plx + ',' + ply + ') status:' + pls);
if((plx == 0)&&(ply == 0))
{
@ -244,6 +252,7 @@ show.wndproc = function(hwnd,message,wparam,lparam){
}
//无返回值则继续调用默认回调函数
}
show.show();
FreshPos();
return win.loopMessage();