Merge remote-tracking branch 'origin/masterpiece' into hkg_multi
This commit is contained in:
commit
ab2c6e6976
1068 changed files with 345745 additions and 284584 deletions
|
|
@ -60,7 +60,6 @@
|
|||
Cart "DeleteMenuID" "ALL"
|
||||
Var MultiPayEnable = "false"
|
||||
;Var MultiPayEnable = "true"
|
||||
Var ShoppyPayEnable = "true"
|
||||
Var PayType = ""
|
||||
|
||||
Var Seeker.CurrCreditAmount = 0
|
||||
|
|
@ -126,9 +125,9 @@
|
|||
Var RoadShow = "false"
|
||||
Var IgnorePoint = "true"
|
||||
|
||||
Var ShowButtonClick = "Enable"
|
||||
Var ShowButtonClick = "Invisible"
|
||||
Var ShowButtonClickFull = "Invisible"
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
|
||||
;SAVELOG DisplayType
|
||||
|
||||
|
|
@ -170,12 +169,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; take a look file page_board_1.xml
|
||||
|
||||
|
||||
If XMLProfile = "" Then
|
||||
CacheVarStr "get" XMLProfile
|
||||
Else
|
||||
|
|
@ -218,6 +211,8 @@
|
|||
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
|
||||
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
|
||||
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
|
||||
|
||||
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
If AppFastEnable = "true" Then
|
||||
|
|
@ -323,28 +318,6 @@
|
|||
|
||||
|
||||
|
||||
If SELLONLINE = 1 Then
|
||||
Var ShowNetworkProblem = "Invisible"
|
||||
Var ShowNetworkProblemText = ""
|
||||
Machine NetworkUp
|
||||
Else
|
||||
|
||||
|
||||
|
||||
Var ShowNetworkProblem = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
|
||||
|
||||
|
||||
If NetworkStatus = "DOWN" Then
|
||||
Machine NetworkDown
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Var ShowPrice = "Enable"
|
||||
If RoadShow = "true" Then
|
||||
|
|
@ -436,20 +409,6 @@
|
|||
StrLen AdvertiseProfile AdvertiseProfileLen
|
||||
|
||||
|
||||
STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
|
||||
|
||||
DEBUGVAR taobin_notopup
|
||||
If taobin_notopup = "true" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
Else
|
||||
If SELLSTATUS = "SELLNOCASH" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
Else
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR XMLPageVersionInt
|
||||
|
||||
; forever
|
||||
|
|
@ -556,6 +515,52 @@
|
|||
|
||||
DEBUGVAR LangProcess
|
||||
|
||||
|
||||
; Check POS machine flag
|
||||
Var ConnectWithPOSMachine = 0
|
||||
If CountryName = "Thailand" Then
|
||||
READ_FILE "/mnt/sdcard/coffeevending/app_manager/app_list/king_power_service/enable" POSMachineFlag
|
||||
DEBUGVAR POSMachineFlag
|
||||
If POSMachineFlag = 1 Then
|
||||
Var ConnectWithPOSMachine = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If SELLONLINE = 1 Then
|
||||
Var ShowNetworkProblem = "Invisible"
|
||||
Var ShowNetworkProblemText = ""
|
||||
Machine NetworkUp
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Else
|
||||
Var ShowNetworkProblem = "Enable"
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
|
||||
|
||||
If NetworkStatus = "DOWN" Then
|
||||
Machine NetworkDown
|
||||
EndIf
|
||||
|
||||
If ConnectWithPOSMachine = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR ButtontoTopupMenu
|
||||
STRCONTAIN "taobin_notopup" XMLProfile taobin_notopup
|
||||
|
||||
DEBUGVAR taobin_notopup
|
||||
If taobin_notopup = "true" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
Else
|
||||
If SELLSTATUS = "SELLNOCASH" Then
|
||||
Var ButtontoTopupMenu = "Disable"
|
||||
Else
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var InternationalEnable = 0
|
||||
Var InternationalEnableStr = "false"
|
||||
Var cups_sold_text = "เสิร์ฟแล้ว ( CUPS SOLD )"
|
||||
|
|
@ -1027,6 +1032,8 @@
|
|||
Var MinPhoneNumber = 9
|
||||
Var MaxPhoneNumber = 9
|
||||
|
||||
Var ShowCountDownAsPercent = 1
|
||||
|
||||
Var UsePepsiTheme = 1
|
||||
Var TargetThemeNum = 2
|
||||
|
||||
|
|
@ -1175,21 +1182,24 @@
|
|||
EndIf
|
||||
|
||||
; New mode
|
||||
; Inter + Multi-Instance available ./inter/tha/multi
|
||||
; Inter + Multi-Instance available ./inter/tha/multi
|
||||
|
||||
; Below. Pendding from XMLProfile
|
||||
DEBUGVAR MyanmarLangEnable
|
||||
DEBUGVAR EnableMultiInstance
|
||||
;Var MyanmarLangEnable = "true"
|
||||
|
||||
STRCONTAIN "MyanmarLang" XMLProfile MyanmarLangEnable
|
||||
Var MyanmarLangEnable = "false"
|
||||
;Var MyanmarLangEnable = ""
|
||||
|
||||
|
||||
|
||||
|
||||
If MyanmarLangEnable = "" Then
|
||||
|
||||
Else
|
||||
If EnableMultiInstance = "true" Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
||||
|
|
@ -1216,7 +1226,7 @@
|
|||
If MyanmarLangEnable = "true" Then
|
||||
EnableLanguage "MYANMAR"
|
||||
EndIf
|
||||
|
||||
|
||||
SetLanguage "THAI"
|
||||
LanguageControl "UpdateList" "-"
|
||||
Var show_eng = "false"
|
||||
|
|
@ -1228,7 +1238,7 @@
|
|||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
Var CurrentPageShowError = 0
|
||||
|
||||
|
|
@ -1239,7 +1249,7 @@
|
|||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
|
||||
Var XButtonMember = 384
|
||||
Var XButtonMember = 212
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
|
|
@ -1252,7 +1262,7 @@
|
|||
Var MaxPhoneNumber = 10
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -1307,6 +1317,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR SELLONLINE
|
||||
|
||||
If GameInstalled = "" Then
|
||||
CheckApp "com.NDF.taobin" GameInstalled
|
||||
EndIf
|
||||
|
|
@ -1399,44 +1411,6 @@
|
|||
|
||||
Var SlientRefreshEnable = 0
|
||||
|
||||
Var ShouldShowNamHomCoconutRemainReward = 0
|
||||
Var ShowNamHomCoconutRemainReward = "Invisible"
|
||||
Var GetNamHomCoconutRemainReward = 0
|
||||
Var NamHomCoconutRemainReward_Y = 1071
|
||||
Var NamHomCoconutRemainRewardNumber_Y = 1130
|
||||
Var dummyPhone = "089999999"
|
||||
|
||||
If GetNamHomCoconutRemainRewardLastTime = "" Then
|
||||
Var GetNamHomCoconutRemainRewardLastTime = 0
|
||||
EndIf
|
||||
|
||||
DEBUGVAR NamHomCoconutPro
|
||||
DEBUGVAR CurrentMainVideo
|
||||
If NamHomCoconutPro = 1 Then
|
||||
If CurrentMainVideo = 2 Then
|
||||
Var ShouldShowNamHomCoconutRemainReward = 1
|
||||
DEBUGVAR GetNamHomCoconutRemainRewardLastTime
|
||||
DEBUGVAR SystemTimeMinuteInt
|
||||
Var TimeDiff = SystemTimeMinuteInt - GetNamHomCoconutRemainRewardLastTime
|
||||
DEBUGVAR TimeDiff
|
||||
If TimeDiff >= 15 Then
|
||||
DEBUGVAR "update nam hom coconut remain reward!!!"
|
||||
DEBUGVAR GetNamHomCoconutRemainReward
|
||||
If GetNamHomCoconutRemainReward = 0 Then
|
||||
GETACCEXT dummyPhone 34
|
||||
Var GetNamHomCoconutRemainReward = 1
|
||||
EndIf
|
||||
Else
|
||||
If TimeDiff <= -15 Then
|
||||
DEBUGVAR "update nam hom coconut remain reward!!!"
|
||||
If GetNamHomCoconutRemainReward = 0 Then
|
||||
GETACCEXT dummyPhone 34
|
||||
Var GetNamHomCoconutRemainReward = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var CurrentMainVideo = CurrentMainVideoTemp
|
||||
|
|
@ -1464,87 +1438,6 @@
|
|||
|
||||
Var RedirectToNormalVersion = 0
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/MyanmarLangEnable" MyanmarLangEnable
|
||||
DEBUGVAR MyanmarLangEnable
|
||||
|
||||
If MyanmarLangEnable = "" Then
|
||||
|
||||
Else
|
||||
If EnableMultiInstance = "true" Then
|
||||
If MyanmarLangEnable = "" Then
|
||||
Var MyanmarLangEnable = "false"
|
||||
EndIf
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
Var InternationalEnable = 1
|
||||
DEBUGVAR InternationalEnable
|
||||
|
||||
;TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/video/script_video.ev"
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/multi_ads/ads_path.ev"
|
||||
|
||||
;specified to unittest4
|
||||
Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
|
||||
DEBUGVAR OpenFileXML
|
||||
TRY OpenFileXML
|
||||
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
;EnableLanguage "MYANMAR"
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
If MyanmarLangEnable = "true" Then
|
||||
EnableLanguage "MYANMAR"
|
||||
Var RedirectToNormalVersion = 0
|
||||
EndIf
|
||||
|
||||
SetLanguage "THAI"
|
||||
LanguageControl "UpdateList" "-"
|
||||
Var show_eng = "false"
|
||||
|
||||
;Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/tha/"
|
||||
Var CountryShortName = "tha"
|
||||
|
||||
Var TextPriceMenuSize = 12
|
||||
Var TextPriceMenuY = 266
|
||||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page/bp_main_page_member.png"
|
||||
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png"
|
||||
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
|
||||
Var XButtonMember = 384
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/tha/menu/lang.tsv"
|
||||
EndIf
|
||||
|
||||
Var cups_sold_text = "Cups Sold Worldwide"
|
||||
|
||||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 10
|
||||
|
||||
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If UsePepsiTheme = 1 Then
|
||||
If InternationalEnable = 1 Then
|
||||
; enable-color
|
||||
|
|
@ -1556,7 +1449,7 @@
|
|||
;Var img_rest_main_page = MainStartPepsiThemeDir + "bn_main_page_start.png"
|
||||
Var img_press_main_page = ""
|
||||
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc.mp4"
|
||||
Var VideoMainPage = "ROOT/taobin_project/inter/whatthecup/common/video/video_main_wtc_new.mp4"
|
||||
|
||||
Var ShowButtonClickFull = "Enable"
|
||||
|
||||
|
|
@ -2128,7 +2021,7 @@ PRICE "Reset" "-"
|
|||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
;Var EmergencyStop = "true"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2185,6 +2078,12 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
|
||||
|
||||
If SleepModeXML = "ON" Then
|
||||
Var BackgroundColor = "0x2C2F4E"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
Open "ROOT/taobin_project/xml/page_sleepmode.xml"
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
|
||||
TimerReset
|
||||
|
|
@ -2437,6 +2336,14 @@ PRICE "Reset" "-"
|
|||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
Else
|
||||
__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue