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-28 12:44:41 +07:00
commit d9da7fee97
120 changed files with 142302 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_NewBrewing3.xml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3.lxml"
EndIf
RootLayoutVisible 3 "hide"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payext_setup.ev"

4
xml/page_NewBrewing3Conti.xml
View file

@ -6,6 +6,10 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3Conti.lxml"
EndIf
Var ActionOKCase = 0
Var Seeker = "curr"

14
xml/page_board.xml
View file

@ -1143,6 +1143,10 @@
SetLanguage "MTC"
LanguageControl "UpdateList" "-"
If BoxID = 210699 Then
Var CatalogLayoutV3 = 1
EndIf
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
@ -2137,7 +2141,15 @@ PRICE "Reset" "-"
If CountDownPauseVideo = 1 Then
If EnablePepsiFullscreen = 0 Then
TapScreen 860 1004
If CountryName = "HongKong" Then
If CatalogLayoutV3 = 1 Then
;do-not-thing
Else
TapScreen 860 1004
EndIf
Else
TapScreen 860 1004
EndIf
EndIf
EndIf

23
xml/page_payment_cash-GBR.xml
View file

@ -16,6 +16,7 @@
;EndIf
Var ErrorCause = ""
Var MAX_EMA_CODE = 6
Var PreScaleCanculate = 100
@ -411,7 +412,7 @@
Else
Var CameraState = "Invisible"
Var alphaState = "Enable"
Var PopupCancelButtonState = "Enable"
Var PopupCancelButtonState = "Disable"
Var EMAEnterNumberButtonState = "Disable"
Var popup_cancel_button_y = 1390
@ -818,9 +819,11 @@
Var QR_POPUP = "/img_popup8-2.png"
Var EMAPopupErrorState = "Enable"
Var PopupCancelButtonState = "Enable"
Var popup_cancel_button_y = 1225
Var EMAEnterNumberButtonState = "Invisible"
Var LOADING_STATE = "Invisible"
Var popup_cancel_button_y = 1225
EndIf
EndIf
Else
@ -1437,13 +1440,18 @@
<EventScanQRResult>
SAVELOG "SCAN_QR_RESULT"
DEBUGVAR scanresult
DEBUGVAR scanmsg
If scanresult = "true" Then
StrLen scanmsg textLen
If textLen = 8 Then
DEBUGVAR textLen
If textLen = MAX_EMA_CODE Then
Var EMAMemberID = scanmsg
@ -1519,11 +1527,13 @@
EndIf
Else
Var QR_POPUP = "/img_popup8-2.png"
Var EMAPopupErrorState = "Enable"
Var alphaState = "Enable"
Var EMAPopupErrorState = "Enable"
Var PopupCancelButtonState = "Enable"
Var popup_cancel_button_y = 1225
Var LOADING_STATE = "Invisible"
Var EMAEnterNumberButtonState = "Invisible"
Var popup_cancel_button_y = 1225
EndIf
EndIf
@ -1976,7 +1986,7 @@ EndIf
<State> EMAEnterNumberButtonState </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_ema_enter_code.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_ema_enter_code.png" </FilenamePress>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_ema_enter_code.png" </FilenameDisable>
<EventClick>
Open "ROOT/taobin_project/inter/gbr/xml/page_payment_with_ema.lxml"
</EventClick>
@ -2062,6 +2072,7 @@ EndIf
<State> PopupCancelButtonState </State>
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>

3129
xml/page_test_color.xml Normal file
View file

File diff suppressed because it is too large Load diff

17
xml/vending_info.xml
View file

@ -1037,7 +1037,24 @@
</Text>
;Color
<Image>
<X> info2_startX </X>
<Y> info_15Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_test_color.xml"
</EventClick>
</Image>
<Text>
<X> info2_text_startX </X>
<Y> info_text_15Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> "Test RGB" </Value>
</Text>