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

release 10.03

Browse source
This commit is contained in:
wanlop run 2025-06-13 10:55:49 +07:00
parent 73044b0ea3
commit c1781e66ee
16 changed files with 23674 additions and 20319 deletions
Download patch file Download diff file Expand all files Collapse all files

6
adv/sync_1.file
View file

@ -1,10 +1,10 @@
total 131964
-rw-rw---- 1 root sdcard_rw 0 2025-05-28 13:47 sync_1.file
total 131968
-rw-rw---- 1 root sdcard_rw 0 2025-06-12 15:11 sync_1.file
-rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
-rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
-rw-rw---- 1 root sdcard_rw 7570852 2025-05-16 09:08 taobin_adv_menu_02.mp4
-rw-rw---- 1 root sdcard_rw 11268391 1980-01-01 00:00 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 11272524 2025-06-12 15:08 taobin_adv_menu_03.mp4
-rw-rw---- 1 root sdcard_rw 1209432 1980-01-01 00:00 taobin_adv_menu_04.mp4
-rw-rw---- 1 root sdcard_rw 13899670 2025-03-04 15:57 taobin_adv_menu_05.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4

BIN
adv/taobin_adv_menu_03.mp4
View file

Binary file not shown.

11
inc/button_topping_select_confirm_order.inc
View file

@ -392,17 +392,6 @@ EndIf
GetLongTimeInMinute LastTimeClickOrder
If CART_COUNT = 0 Then
If UserSelectProductCode = "-" Then
Else
If SelectDrinkType = 1 Then
; Move to MenuReady
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
EndIf
DEBUGVAR SelectToppingType
If SelectDrinkType = 0 Then

30
inc/remove_cup_on_arm_step.inc
View file

@ -1,4 +1,5 @@
;setvarint DebugRemoveCup 1
;Var DebugRemoveCup = 1
If DebugRemoveCup = 1 Then
DEBUGVAR TimeoutForProtectButtonHideLongTime
@ -13,7 +14,7 @@ If DebugRemoveCup = 1 Then
DEBUGVAR Seeker
DEBUGVAR CountDownCupOnArmCertainStage
DEBUGVAR CountDownCupOnArmSuccessDelay
DEBUGVAR CH9991_Status
DEBUGVAR CH9992_Status
DEBUGVAR CH9993_Status
@ -28,10 +29,12 @@ EndIf
If TimeoutInstance0 = "" Then
Var TimeoutInstance0 = 0
Var CountDownCupOnArmCertainStage = 0
Var CountDownCupOnArmSuccessDelay = 8
Var CountDownDrinkOK = 8
EndIf
If TimeoutInstance0 = 3 Then
SAVELOG "remove cup on arm 1.1"
SAVELOG "remove cup on arm 1.4"
EndIf
Var CupOnAnyArm = 0
@ -49,6 +52,29 @@ If CH9994_Status = "SUCCESS" Then
Var CupOnAnyArm = 1
EndIf
; from drink_ok.xml break show button.
If CountDownDrinkOK > 0 Then
If DoorCupPosition = "bottom" Then
Var CountDownDrinkOK = CountDownDrinkOK - 1
DEBUGVAR CountDownDrinkOK
Var CountDownCupOnArmSuccessDelay = 10
EndIf
Var CupOnAnyArm = 0
Else
EndIf
If CupOnAnyArm = 1 Then
If CountDownCupOnArmSuccessDelay = 0 Then
Else
Var CountDownCupOnArmSuccessDelay = CountDownCupOnArmSuccessDelay - 1
Var CupOnAnyArm = 0
DEBUGVAR CountDownCupOnArmSuccessDelay
EndIf
EndIf
If CupOnAnyArm = 0 Then
If Seeker = "curr" Then
If CupOnArm = "true" Then

17540
inter/aus/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

7126
inter/aus/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

7120
inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml
View file

File diff suppressed because it is too large Load diff

8788
inter/aus/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

3271
inter/tha/xml/multi/v3/page_catalog_group_pro_taiwanese_tea.lxml Normal file
View file

File diff suppressed because it is too large Load diff

23
xml/event/tricker.ev
View file

@ -205,8 +205,6 @@ EndIf
If BoxID = 201714 Then
Var Catalog20BahtEnable = 1
Var AppleFarmFestivalPro = 1
EndIf
If BoxID = 201729 Then
@ -214,8 +212,27 @@ If BoxID = 201729 Then
EndIf
If BoxID = 123456 Then
Var AppleFarmFestivalPro = 0
Var HappyTriosPro = 0
Var TaiwaneseTeaPro = 1
Var SchoolOvaltinePro = 1
EndIf
If BoxID = 173149 Then
Var AppleFarmFestivalPro = 0
Var HappyTriosPro = 0
Var TaiwaneseTeaPro = 1
Var SchoolOvaltinePro = 1
EndIf
If BoxID = 200435 Then
Var AppleFarmFestivalPro = 0
Var HappyTriosPro = 0
Var TaiwaneseTeaPro = 1
Var SchoolOvaltinePro = 1
EndIf
DEBUGVAR ConfigNumer
If ConfigNumer >= 1762 Then
Var ToppingNewUINewSystem = 1
@ -327,6 +344,8 @@ EndIf
Var CurrentMainVideoTemp = 0
DEBUGVAR TaiwanesePowderEnable
DEBUGVAR TaiwaneseTeaPro
; Check reward out of stock

21
xml/page_NewBrewing3.xml
View file

@ -643,6 +643,12 @@
__CMD "SetErrorCodeHandleByXML" 1030 "-" "-"
__CMD "SetErrorCodeHandleByXML" 1031 "-" "-"
Var IndexCharWhenTImeZero = 0
Var ArrayCharWhenTImeZero[0] = "- "
Var ArrayCharWhenTImeZero[1] = "\ "
Var ArrayCharWhenTImeZero[2] = "| "
Var ArrayCharWhenTImeZero[3] = "/ "
</EventOpen>
<EventLanguageOnChange>
Var XPosiShowCountDownBrew = 768
@ -790,7 +796,6 @@
Var MOVE_CUP_TO_DOOR = "false"
EndIf
Var CountDownBrewing = BREW_CNT
@ -825,8 +830,6 @@
EndIf
Var ShowCountDownBrewing = CountDownBrewing
; TODO
DEBUGVAR EnableDoubleCupNoError
@ -844,6 +847,10 @@
EndIf
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
If BREW_CNT = 0 Then
If CountUpWhenBREW_CNT > 56 Then
Var CountUpWhenBREW_CNT = 0
@ -858,6 +865,14 @@
Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
If IndexCharWhenTImeZero > 3 Then
Var IndexCharWhenTImeZero = 0
EndIf
EndIf
If Timeout > 480 Then

8
xml/page_NewBrewing3Conti.xml
View file

@ -308,7 +308,15 @@
Var ShowCountDownBrewing = CountDownBrewing
If CountDownBrewing = 0 Then
Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero]
Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1
If IndexCharWhenTImeZero > 3 Then
Var IndexCharWhenTImeZero = 0
EndIf
EndIf
If Timeout > 540 Then
SAVELOG "back_to_main from line > 217."

13
xml/page_board.xml
View file

@ -1356,13 +1356,6 @@
EndIf
EndIf
If BoxID = 173372 Then
Var SpiralOnline = "true"
Var InternationalShow = 1
EndIf
If EnableMultiInstanceFromBoxID = 1 Then
If CountryName = "Thailand" Then
@ -1414,7 +1407,7 @@
Var InternationalShow = 0
EndIf
If BoxID = 201193 Then
If BoxID = 201729 Then
Var InternationalShow = 1
EndIf
@ -1517,6 +1510,10 @@
DEBUGVAR OpenFileXML
TRY OpenFileXML
If CountryName = "Thailand" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
EndIf
Else
Var LanguageObjectShow = "Invisible"
Var NoLangObjectShow = "Enable"

1
xml/page_drinkok.xml
View file

@ -16,6 +16,7 @@
DEBUGVAR DrinkOKStringVersion
Var CountDownDrinkOK = 4
WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"

16
xml/page_topping_select8.xml
View file

@ -978,6 +978,22 @@
Var MenuReady = "WaitSpiral"
EndIf
EndIf
If UserSelectProductCode = "-" Then
Var MenuReady = "error-pd"
EndIf
If UserSelectProductCode = "" Then
Var MenuReady = "error-pd2"
Else
Strlen UserSelectProductCode UserSelectProductCodeLen
If UserSelectProductCodeLen = 13 Then
Else
Var MenuReady = "error-pd3"
EndIf
EndIf
DEBUGVAR MenuReady
If MenuReady = "YES" Then
DEBUGVAR ToppingDetail

19
xml/vending_info.xml
View file

@ -457,8 +457,15 @@
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
Var StartUpExt = "-"
ReloadAll
; FINISH
If ReloadAllPressButton = "" Then
Var ReloadAllPressButton = 0
EndIf
If ReloadAllPressButton = 2 Then
ReloadAll
EndIf
Var ReloadAllPressButton = ReloadAllPressButton + 1
</EventClick>
</Image>
@ -467,7 +474,13 @@
<Y> info_3Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
FINISH
If FinishPressButton = "" Then
Var FinishPressButton = 0
EndIf
If FinishPressButton = 2 Then
FINISH
EndIf
Var FinishPressButton = FinishPressButton + 1
</EventClick>
</Image>