Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
BIN
inter/uae_dubai/image/page_doing/img2.png
Normal file
|
After Width: | Height: | Size: 5.1 KiB |
BIN
inter/uae_dubai/image/page_doing/img2_eng.png
Normal file
|
After Width: | Height: | Size: 4.6 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_back.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_back2.png
Normal file
|
After Width: | Height: | Size: 2.7 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_back_arrow2.png
Normal file
|
After Width: | Height: | Size: 2.9 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_cancel.png
Normal file
|
After Width: | Height: | Size: 3 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_cancel2.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_cancel3.png
Normal file
|
After Width: | Height: | Size: 3.2 KiB |
BIN
inter/uae_dubai/image/page_payment_cash/bn_cancel_all.png
Normal file
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 15 KiB |
1
inter/uae_dubai/note.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
adb push ./taobin_project/inter/uae_dubai/support_langs /sdcard/coffeevening/country/support_langs
|
||||
|
|
@ -41,8 +41,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@
|
|||
Var XStraw = 274
|
||||
EndIf
|
||||
|
||||
DEBUGVAR IMG_CNT
|
||||
|
||||
Var waitAckPay = 0
|
||||
Var VendingTSIDTmp = ""
|
||||
Var VendingTSIDProblem = ""
|
||||
|
|
@ -720,6 +722,10 @@
|
|||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
DEBUGVAR IMG_CNT
|
||||
DEBUGVAR LanguageObjectShow
|
||||
DEBUGVAR LanguageShow
|
||||
DEBUGVAR show_eng
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
|
|
|
|||
1240
inter/uae_dubai/xml/page_brewing3Conti.lxml
Normal file
|
|
@ -208,8 +208,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -181,8 +181,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -200,8 +200,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -209,8 +209,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -200,8 +200,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -198,8 +198,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -199,8 +199,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -198,8 +198,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -200,8 +200,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -205,8 +205,11 @@
|
|||
|
||||
If Timeout > 60 Then
|
||||
SAVELOG "Timeout"
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
SAVELOG "Back"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
|
|
|
|||
|
|
@ -329,9 +329,12 @@
|
|||
|
||||
If Timeout > 40 Then
|
||||
Var Timeout = 0
|
||||
|
||||
Var brewing3ContiInter = CountryRootPath + "/xml/page_brewing3Conti.lxml"
|
||||
|
||||
If Seeker = "next" Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
Open brewing3ContiInter
|
||||
Else
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
|
|
|||