Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

This commit is contained in:
wanlop run 2025-05-14 12:32:57 +07:00
commit edd9fab1d4
24 changed files with 18 additions and 17 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View file

@ -65,7 +65,7 @@
DEBUGVAR DirImage
Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
Var RandomImage = "ROOT/taobin_project/inter/aus/image/close_en/Frame" + index
Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage
DEBUGVAR Seeker

View file

@ -41,16 +41,16 @@
Var CurrHelpCenter = 1
Var Timeout = 0
Var TimeoutHelperProccess = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR Timeout
DEBUGVAR TimeoutHelperProccess
If Timeout > 70 Then
SAVELOG "Timeout"
If TimeoutHelperProccess > 70 Then
SAVELOG "TimeoutHelperProccess"
Var CurrHelpCenter = 0
If BaseOnPageBoard = 1 Then
Var BaseOnPageBoard = 0
@ -60,14 +60,14 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
Var Timeout = Timeout + 1
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
Refresh
TimerReset
@ -131,7 +131,7 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"

View file

@ -10,7 +10,7 @@
RootLayoutVisible 3 "show"
Var Timeout = 0
Var TimeoutHelperProccess = 0
Var TelephoneNumber = ""
@ -22,12 +22,12 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR Timeout
DEBUGVAR TimeoutHelperProccess
SAVELOG MachineStage
Var Timeout = Timeout + 1
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
If Timeout > 300 Then
If TimeoutHelperProccess > 300 Then
Var CurrHelpCenter = 0
If MachineStage = "remove-cup" Then
OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml"
@ -44,7 +44,7 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"

View file

@ -7,15 +7,16 @@
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var TimeoutHelperProccess = 0
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR TimeoutHelperProccess
Var Timeout = Timeout + 1
Var TimeoutHelperProccess = TimeoutHelperProccess + 1
If Timeout > 5 Then
If TimeoutHelperProccess > 5 Then
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml"
@ -26,7 +27,7 @@
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 590
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml"
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf