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 18:16:19 +07:00
commit b11e33eb57
16 changed files with 126 additions and 76 deletions

View file

@ -10,6 +10,8 @@
; tab_menu hide
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
RootLayoutVisible 3 "hide"
DEBUGVAR LangProcess
Var ToggleAfterEventProfileOff = 0
@ -1320,9 +1322,8 @@
; enable helper
Var EnableHelperShow = 0
;Var FromDrinkOk = 1
Var CurrHelpCenter = 0
Var EnableHelperShow = 1
Var FromDrinkOk = 1
If EnableHelperShow = 1 Then
; enable btn_change_langs
Var EnableBtnLangWithHelper = 1
@ -1341,10 +1342,14 @@
Var FromPaymentCash = "Invisible"
Var FromBrewingProcess = "Enable"
RootLayoutVisible 15 "show"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
RootLayoutVisible 14 "show"
If CurrHelpCenter = 1 Then
;do not thing
Else
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
EndIf
Else
RootLayoutVisible 15 "hide"
RootLayoutVisible 14 "hide"
EndIf
Else
RootLayoutVisible 3 "hide"
@ -2120,11 +2125,9 @@ PRICE "Reset" "-"
DEBUGVAR InternationalEnable
DEBUGVAR CountryName
Var BaseOnPageBoard = 0
If CurrHelpCenter = 1 Then
; do not thing when open the helper
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
Else
Var BaseOnPageBoard = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
@ -2303,7 +2306,7 @@ PRICE "Reset" "-"
If CurrHelpCenter = 1 Then
;do not thing
Else
OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml"
EndIf
EndIf
EndIf
@ -2604,7 +2607,7 @@ PRICE "Reset" "-"
Var OpenFromPageBoard = 1
If CurrHelpCenter = 1 Then
; do not thing when open the helper
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
Else
Var BaseOnPageBoard = 0

View file

@ -2782,8 +2782,7 @@
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
;RootLayoutVisible 15 "show"
OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
</EventClick>
</Button>

View file

@ -76,6 +76,8 @@
Var ButtonLanguageListWidth = 70
l 86
Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10
DEBUGVAR ENABLE_LANGUAGE_COUNT
If ENABLE_LANGUAGE_COUNT = "" Then
LanguageControl "UpdateList" 1
@ -502,7 +504,7 @@
</ListView1>
<ListView1>
<X> ButtonLanguageListXPositionIcon </X>
<X> ButtonLanguageListXPositionIconForFlag </X>
<Y> ButtonLanguageListYPositionIcon </Y>
<Width> 1080 </Width>
<Height> "auto" </Height>