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

Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Pakin 2024-04-29 15:46:35 +07:00
commit e35c9cd595
23 changed files with 722 additions and 645 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xml/page_board.xml
View file

@ -574,6 +574,7 @@
; ignore collection point
Var SettingIgnoreCollectPoint = 0
Var SettingVideoBrewingUseCommon = 0
Var adver_brewing_en = 1
@ -819,10 +820,14 @@
STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
Var SettingDisableTaobinCredit = "true"
Var SettingDisableTaobinCode = "true"
; Singapore disable point
Var SettingIgnoreCollectPoint = 1
Var SettingVideoBrewingUseCommon = 1
EndIf
;inter-page-board

2
xml/page_catalog.lxml
View file

@ -85,7 +85,7 @@
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
;Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Var QRCODE99 = ""
WEB "DISABLE"

42
xml/page_lid_straw.xml
View file

@ -16,18 +16,6 @@
Var StepVideo = 1
Var PreviseStepVideo = 90
;SAVELOG CountUpBrewing
;SAVELOG AnimationOn
;SAVELOG AnimationVideoPlayTime
;SAVELOG VideoID1
;SAVELOG VideoID2
;SAVELOG VideoID3
;SAVELOG VideoID4
;SAVELOG VideoID5
;SAVELOG VideoID6
;SAVELOG VideoAnimationCount
Var Timeout = 0
If show_eng = "true" Then
@ -58,18 +46,20 @@
EndIf
If InternationalEnable = 1 Then
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
Var PictureBegin = "txt_"
Var PictureEnd = "_en.png"
;inter-play-list
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
If SettingVideoBrewingUseCommon = 1 Then
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/inter/common/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
Else
;inter-play-list
Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
Var VideoFileBegin = "TaoBin2_draft02_art"
Var VideoFileEnd = ".mp4"
EndIf
Var PicturePath = CountryRootPath + "/image/page_doing/"
Var PictureBegin = "txt_"
@ -106,10 +96,6 @@
Var PictureFile = PictureFile + PictureEnd
;If lidAndStrawOldPageIgnore = "true" Then
; Var lidAndStrawOldPageIgnore = "false"
If Seeker.PayWithQR = 0 Then
@ -178,7 +164,6 @@
EndIf
EndIf
;EndIf
Var LidState = Lid1Status
;Lid1Status
@ -280,11 +265,6 @@
<Value> ShowCountDownBrewing </Value>
</Text>
;<GIF>
;<X> 182 </X>
;<Y> 700 </Y>
;<Filename> GIFShowProcess </Filename>
;</GIF>
<EventMachine>

2
xml/page_payment.xml
View file

@ -614,7 +614,7 @@
<Y> 938 </Y>
<Width> 1080</Width>
<Align> Center </Align>
<Size> 72 </Size>
<Size> 66 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Value> showname </Value>

2
xml/page_payment_cash-AUS.xml
View file

@ -372,7 +372,7 @@
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Else
Var PayOfflineMode = 0

11
xml/page_payment_cash-IDR.xml
View file

@ -364,7 +364,6 @@
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Else
Var PayOfflineMode = 0
@ -384,16 +383,6 @@
Var SELLONLINE = 1
EndIf
;If NetworkStatus = "ACTIVATE" Then
; Var ShowNetworkProblem = "Invisible"
; Var ShowNetworkProblemText = ""
;
;Else
; Var ShowNetworkProblem = "Enable"
; Var ShowButtonClick2 = "Invisible"
; Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
;EndIf
Var pay_with_credit_image = DirImage + "/bp_pay_with_credit.png"

23
xml/page_payment_cash-SGP.xml
View file

@ -221,10 +221,8 @@
Var showRemaining !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
EndIf
Var Seeker.PayWithQR = 0
Var NoGotoMenupage = "false"
If show_eng = "true" Then
@ -370,7 +368,7 @@
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Else
Var PayOfflineMode = 0
@ -462,6 +460,15 @@
Var PayState4 = "Invisible"
EndIf
If SettingDisableTaobinCode = "true" Then
Var PayState2 = "Invisible"
EndIf
Var PayState5 = "Invisible"
DEBUGVAR SettingDisableTaobinCredit
</EventOpen>
@ -832,8 +839,12 @@
If RoadShow = "true" Then
Else
Var PayState3 = "Disable"
Var PayState5 = "Disable"
If PayState3 = "Enable" Then
Var PayState3 = "Disable"
EndIf
If PayState5 = "Enable" Then
Var PayState5 = "Disable"
EndIf
EndIf
Var LOADING_STATE = "Invisible"
@ -1623,7 +1634,7 @@ EndIf
<Y> 938 </Y>
<Width> 1080</Width>
<Align> Center </Align>
<Size> 72 </Size>
<Size> 66 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Value> showname </Value>

3
xml/page_payment_cash-UAE.xml
View file

@ -397,8 +397,7 @@
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
Else
Var PayOfflineMode = 0

2
xml/sometime/top_spender.xml
View file

@ -220,7 +220,7 @@
EndIf
Else
If TimeDiff <= -20 Then
VAR "capture top spender time!!!"
DEBUGVAR "capture top spender time!!!"
If GettingData = "false" Then
GETACCEXT dummyPhone 34
Var GettingData = "true"

2
xml/vending_info.xml
View file

@ -155,6 +155,8 @@
Var CountDownReset = 0
Var strTouchScreen = " Reset Touch : disable."
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>