pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/aus/image/close_en/Frame1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
inter/aus/image/close_en/Frame10.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 111 KiB

BIN
inter/aus/image/close_en/Frame11.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 75 KiB

BIN
inter/aus/image/close_en/Frame12.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 61 KiB

BIN
inter/aus/image/close_en/Frame13.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
inter/aus/image/close_en/Frame14.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 45 KiB

BIN
inter/aus/image/close_en/Frame15.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB

BIN
inter/aus/image/close_en/Frame16.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
inter/aus/image/close_en/Frame17.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 61 KiB

BIN
inter/aus/image/close_en/Frame18.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 72 KiB

BIN
inter/aus/image/close_en/Frame19.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 89 KiB

BIN
inter/aus/image/close_en/Frame2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 73 KiB

BIN
inter/aus/image/close_en/Frame20.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 58 KiB

BIN
inter/aus/image/close_en/Frame3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 101 KiB

BIN
inter/aus/image/close_en/Frame4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 62 KiB

BIN
inter/aus/image/close_en/Frame5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 115 KiB

BIN
inter/aus/image/close_en/Frame6.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
inter/aus/image/close_en/Frame7.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
inter/aus/image/close_en/Frame8.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 66 KiB

BIN
inter/aus/image/close_en/Frame9.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 55 KiB

2
inter/aus/xml/page_show_error.lxml
View file

@ -65,7 +65,7 @@
DEBUGVAR DirImage 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" Var RandomImage = RandomImage + ".png"
DEBUGVAR RandomImage DEBUGVAR RandomImage
DEBUGVAR Seeker DEBUGVAR Seeker

14
inter/tha/xml/page_help_center.lxml
View file

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

10
inter/tha/xml/page_help_center_sending.lxml
View file

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

9
inter/tha/xml/page_help_center_sending_conti.lxml
View file

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