diff --git a/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png b/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png index 2765c562..d8d70a6b 100644 Binary files a/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png and b/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png differ diff --git a/inter/mys/xml/e_receipt/page_show_e_receipt.lxml b/inter/mys/xml/e_receipt/page_show_e_receipt.lxml index cff9eda5..da927999 100644 --- a/inter/mys/xml/e_receipt/page_show_e_receipt.lxml +++ b/inter/mys/xml/e_receipt/page_show_e_receipt.lxml @@ -15,6 +15,7 @@ Var ProductDesc = "" Var Timeout = 0 + Var TimeoutAfterShowQR = 0 Var service = "eInvoice.mys" Var EReceiptQR = "" @@ -82,9 +83,13 @@ 1000 - +DEBUGVAR TimeoutAfterShowQR DEBUGVAR VendingTSID -Var Seeker.VendingTSID = VendingTSID +If VendingTSID = "" Then + +Else + Var Seeker.VendingTSID = VendingTSID +EndIf DEBUGVAR Seeker.VendingTSID DEBUGVAR LOADING_STATE @@ -93,31 +98,43 @@ DEBUGVAR QR_STATE DEBUGVAR Seeker.e_receipt -Var Timeout = Timeout + 1 +If Seeker.VendingTSID = "" Then + Var Timeout = Timeout + 1 +Else + If TimeoutAfterShowQR = 0 Then + Var LOADING_STATE = "Invisible" + SAVELOG "TSID should be ready!" + TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev" + Var TimeoutAfterShowQR = 1 + Refresh + EndIf +EndIf -If Timeout = 5 Then - Var LOADING_STATE = "Invisible" - SAVELOG "TSID should be ready!" - TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev" +If Seeker.VendingTSID = "" Then + Var QR_STATE = "Invisible" + Refresh +Else + If TimeoutAfterShowQR > 2 Then + Var QR_STATE = "Enable" + EndIf + If TimeoutAfterShowQR > 0 Then + Var TimeoutAfterShowQR = TimeoutAfterShowQR + 1 + EndIf Refresh EndIf -If Timeout > 5 Then +If Timeout > 25 Then - Var QR_STATE = "Enable" - Refresh -EndIf - -If Timeout > 15 Then + SAVELOG "Timeout after waiting .." Open "ROOT/taobin_project/xml/page_drinkok.xml" EndIf - - - - +If TimeoutAfterShowQR > 25 Then + SAVELOG "Timeout QR OK" + Open "ROOT/taobin_project/xml/page_drinkok.xml" +EndIf Refresh TimerReset @@ -143,10 +160,10 @@ TimerReset ; need-change-position - 415 - 875 - 250 - 250 + 350 + 845 + 360 + 360 QR_STATE service @@ -155,7 +172,7 @@ TimerReset 175 - 1200 + 1230 300 320 Seeker.PictureDrink