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-04-02 18:55:58 +07:00
commit a1a347abd7
87 changed files with 7627 additions and 7661 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xml/page_board.xml
View file

@ -1083,7 +1083,10 @@
If CountryName = "HongKong" Then
If EnableMultiInstance = "true" Then
; Change lang icon for hkg
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
Var InternationalEnable = 1
Var CurrentPageShowError = 0
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
@ -1098,7 +1101,7 @@
Var show_eng = "true"
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
Var ShowNetworkProblemText = "Network error. Payment Cash only."
Var ShowNetworkProblemText = "Network error."
Var CountryRootPath = "ROOT/taobin_project/inter/hkg/"
Var CountryShortName = "hkg"
@ -1111,7 +1114,7 @@
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
Var PriceUnitText = "HKG$"
Var PriceUnitText = "HK$"
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
@ -1228,7 +1231,7 @@
If CountryName = "Thailand" Then
Var MyanmarLangEnable = "true"
If BoxID = 123456 Then
Var CatalogLayoutV3 = 1
Else
@ -1255,7 +1258,7 @@
Var WebAppShow = "Invisible"
Var ENABLE_UAE_DUBAI = "Invisible"
Var LanguageShow = "THAI"
Var LanguageShow = "THAI"
EnableLanguage "ENG"
EnableLanguage "THAI"

251
xml/page_payment_cash-HKG.xml
View file

@ -106,6 +106,7 @@
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
Var CodeButtonState = "Disable"
Var PayAmount = PriceDrink
Var RemainAmount = PayAmount - Seeker.IntVendingCampaign
@ -165,51 +166,26 @@
If RoadShow = "true" Then
Var CreditCardButtonState = "Invisible"
Var QRCodeButtonState = "Invisible"
Var CodeButtonState = "Invisible"
Var showRemaining = "Free"
Else
;Var PayState1 = "Enable"
;If cash_disable = "1" Then
; Var PayState1 = "Press"
;EndIf
Var CreditCardButtonState = "Enable"
Var QRCodeButtonState = "Enable"
;If Seeker.IntVendingCampaign = 0 Then
; Var CreditCardButtonState = "Enable"
; Var QRCodeButtonState = "Enable"
;Else
; SAVELOG "Cash only IntVendingCampaign"
; Var PayState2 = "Disable"
; Var PayState4 = "Disable"
; Var PayState5 = "Enable"
; Var PayState6 = "Disable"
;EndIf
If Seeker.IntVendingCampaign = 0 Then
Var CodeButtonState = "Enable"
Else
SAVELOG "CreditCard and QRCode only IntVendingCampaign"
Var CodeButtonState = "Disable"
EndIf
;Var PayState3 = "Enable"
DEBUGVAR CoinAmount
If CoinAmount > 0 Then
SAVELOG "Cash only CoinAmount"
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
Var CoinInFlag = 1
If Seeker.IntVendingCredit > 0 Then
SAVELOG "CreditCard and QRCode only IntVendingCredit"
Var CodeButtonState = "Disable"
EndIf
;If Seeker.IntVendingCredit > 0 Then
; SAVELOG "Cash only IntVendingCredit"
; Var PayState2 = "Disable"
; Var PayState4 = "Disable"
; Var PayState5 = "Disable"
; Var PayState6 = "Disable"
;EndIf
Var showRemaining = charOfBaht + RemainAmountStr
If show_eng = "true" Then
@ -398,20 +374,23 @@
EndIf
If SELLONLINE = 0 Then
SAVELOG "Cash only NetworkStatus down"
If IgnoreNetCore = "true" Then
Var PayState2 = "Disable"
Var PayState3 = "Disable"
Var PayState4 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
Else
SAVELOG "Offline in page_payment_cash-HKG"
EndIf
Var PayOfflineMode = 1
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var PayState2 = "Disable"
Var PayState3 = "Disable"
Var PayState4 = "Disable"
Var PayState5 = "Disable"
Var PayState6 = "Disable"
Var PayOfflineMode = 1
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Else
Var PayOfflineMode = 0
@ -421,10 +400,6 @@
DEBUGVAR NOCashFlag
If NOCashFlag = 1 Then
Var PayState1 = "Disable"
EndIf
;cancel order
If SELLSTATUS = "DEACTIVE" Then
Var SELLONLINE = 1
@ -441,7 +416,7 @@
;If DisableUsingCode = "true" Then
If DisableUsingCode = "-" Then
SAVELOG "Diable code because using topping."
Var PayState2 = "Disable"
Var CodeButtonState = "Disable"
Var pay_with_code_image = DirImage + "/bd_pay_with_code.png"
Else
@ -477,30 +452,11 @@
;Open "ROOT/taobin_project/xml/page_page_camera.xml"
If RoadShow = "true" Then
Var PayState1 = "Invisible"
Var PayState2 = "Invisible"
Var PayState3 = "Invisible"
Var PayState4 = "Invisible"
Var PayState5 = "Invisible"
Var PayState6 = "Invisible"
EndIf
;Disable taobin credit
Var TopRowY = 1297
Var BotRowY = 1499
Var PayState4 = "Invisible"
If SettingDisableTaobinCode = "true" Then
Var PayState2 = "Invisible"
EndIf
DEBUGVAR SettingDisableTaobinCredit
Var CancelContinue = 0
</EventOpen>
@ -882,23 +838,19 @@
If Timeout >= 120 Then
Var alphaState = "Invisible"
Var alphaState = "Invisible"
If RoadShow = "true" Then
Else
If PayState3 = "Enable" Then
Var PayState3 = "Disable"
If RoadShow = "true" Then
Else
Var CreditCardButtonState = "Disable"
Var QRCodeButtonState = "Disable"
EndIf
If PayState5 = "Enable" Then
Var PayState5 = "Disable"
EndIf
EndIf
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var QRErrorState = "Invisible"
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var QRErrorState = "Invisible"
EndIf
@ -976,9 +928,6 @@
If CoinInOK = 1 Then
Var PayState5 = "Disable"
Var CoinInCounter = CoinInCounter + 1
If CoinInCounter = 1 Then
@ -989,10 +938,6 @@
Var PayOK = 1
EndIf
Else
Var PayState5 = "Enable"
EndIf
Var stringLog = "Timeout " + Timeout
@ -1664,35 +1609,8 @@
<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
</Image>
;<Button>
;<X> 664 </X>
;<Y> 1276</Y>
;<State> PayState2</State>
;<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
;<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
;<FilenameDisable> pay_with_code_image </FilenameDisable>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
; If alphaState = "Invisible" Then
;
; If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; Var TelephoneNumber = ""
; Var Tel_Confirm_State = "Disable"
;
; Var UserChoosePayment = "Code"
; Open "ROOT/taobin_project/xml/page_payment_code.xml"
; EndIf
; EndIf
;
; EndIf
;</EventClick>
;</Button>
<Button>
<X> 223 </X>
<X> 73 </X>
<Y> TopRowY </Y>
<State> CreditCardButtonState </State>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
@ -1746,7 +1664,7 @@ EndIf
</Button>
<Button>
<X> 566 </X>
<X> 394 </X>
<Y> TopRowY </Y>
<State> QRCodeButtonState </State>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
@ -1788,38 +1706,32 @@ EndIf
</EventClick>
</Button>
<Button>
<X> 715 </X>
<Y> TopRowY </Y>
<State> CodeButtonState </State>
<Filename> Var( CountryRootPath + "/image/page_payment/bn_code.png") </Filename>
<FilenamePress> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenamePress>
<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bn_code.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If alphaState = "Invisible" Then
;<Button>
;<X> 439 </X>
;<Y> 1276 </Y>
;<State> PayState4</State>
;<Filename> Var( DirImage + "/bn_pay_with_credit.png") </Filename>
;<FilenamePress> Var( DirImage + "/bp_pay_with_credit.png") </FilenamePress>
;<FilenameDisable> pay_with_credit_image </FilenameDisable>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
;
; If alphaState = "Invisible" Then
;
; If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
; Var TelephoneNumber = ""
; Var Tel_Confirm_State = "Disable"
;
; Var UserChoosePayment = "Credit"
; Open "ROOT/taobin_project/xml/page_payment_credit.xml"
; EndIf
; EndIf
;
; EndIf
;
;
;</EventClick>
;</Button>
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
Var TelephoneNumber = ""
Var Tel_Confirm_State = "Disable"
Var UserChoosePayment = "Code"
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
EndIf
EndIf
</EventClick>
</Button>
<Button>
<X> 360 </X>
@ -2494,27 +2406,6 @@ eval(
<Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
</Image>
;<Text>
;<X> 267 </X>
;<Y> 1065 </Y>
;<Width> 516 </Width>
;<Height> 75 </Height>
;<Size> 48 </Size>
;<Font> RobotoBold </Font>
;<Color> eval(
;If AlphaLoadingState = "Enable" Then
;Var return = 0xFFFFFF
;Else
;Var return = 0x5A5A5A
;EndIf
;)
;</Color>
;<Align> Center </Align>
;<State> LOADING_STATE </State>
;<Value> "Just Moment, Please" </Value>
;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
;</Text>
<Image>
<X> LOADING_STATE_X </X>
<Y> 1065 </Y>
@ -2567,28 +2458,4 @@ eval(
</Text>
<EventUnitTest1>
Var SELLONLINE = 1
Var EnoughChange = "nay"
Var PayState1 = "Enable"
</EventUnitTest1>
<EventUnitTest2>
Var SELLONLINE = 1
Var EnoughChange = "yes"
Var PayState1 = "Enable"
</EventUnitTest2>
<EventUnitTest3>
MakeDrinkV1 SelectDrink SelectSugarID
Open "ROOT/taobin_project/xml/page_thankyou.xml"
</EventUnitTest3>
</Popup>

14
xml/page_payment_code.xml
View file

@ -44,9 +44,19 @@
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf
If LanguageShow = "MSC" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
If CountryName = "HongKong" Then
If LanguageShow = "MSC" Then
Var DirImage = "ROOT/taobin_project/inter/hkg/image/collectiing_msc/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage = "ROOT/taobin_project/inter/hkg/image/collectiing_mtc/"
EndIf
Else
If LanguageShow = "MSC" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_msc/"
EndIf
EndIf
If web_readyOK = "true" Then
Var web_readyOK = "false"

7
xml/page_show_error.lxml
View file

@ -206,7 +206,12 @@
<EventLanguageOnChange>
DEBUGVAR LanguageShow
Var LanguageButtonEnable = "Enable"
If CountryName = "HongKong" Then
Var LanguageButtonEnable = "Invisible"
Else
Var LanguageButtonEnable = "Enable"
EndIf
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 648

14
xml/testscanQRcode.xml
View file

@ -6,8 +6,6 @@
<EventOpen>
Var KornCameraXW = 800
Var KornCameraXH = 800
Var scanresult = ""
Var scanmsg = ""
@ -60,13 +58,13 @@
</Button>
<CameraX>
<X> 200 </X>
<Y> 400 </Y>
<CameraX>
<X> 120 </X>
<Y> 900 </Y>
<Name>"usbfront"</Name>
<Width> KornCameraXW </Width>
<Height> KornCameraXH </Height>
<State> Enable </State>
<Width> 850 </Width>
<Height> 800 </Height>
<State> CameraState </State>
</CameraX>

2
xml/testscanQRcodeResult.xml
View file

@ -38,7 +38,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
Open "ROOT/taobin_project/xml/testscanQRcode.xml"
</EventClick>
</Button>

4
xml/topview2.xml
View file

@ -95,8 +95,8 @@
Var BtnLangCurrentXPosition = 990
Var BtnLangCurrentYPosition = 648
Else
Var BtnLangCurrentXPosition = 1005
Var BtnLangCurrentYPosition = 458 - 48
Var BtnLangCurrentXPosition = 990
Var BtnLangCurrentYPosition = 458 - 65
EndIf
If LanguageShowByIndex = 0 Then

37
xml/vending_info.xml
View file

@ -172,7 +172,7 @@
DEBUGVAR TestArrary[Index]
DEBUGVAR TestArrary[2]
DEBUGVAR TestArrary[3]
@ -891,6 +891,41 @@
<Value> "Enable CreditCard" </Value>
</Text>
<Image>
<X> info_startX </X>
<Y> info_13Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<State> eval(
If CameraCount > 0 Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
) </State>
<EventClick>
Open "/mnt/sdcard/coffeevending/taobin_project/xml/testscanQRcode.xml"
</EventClick>
</Image>
<Text>
<X> info_text_startX </X>
<Y> info_text_13Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<State> eval(
If CameraCount > 0 Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
) </State>
<Value> "QR Scanner" </Value>
</Text>
;EnableNewBrewUI
<Image>
<X> info2_startX </X>