Merge branch 'masterpiece' into feat/sgp-new-payment
This commit is contained in:
commit
e6703097f2
1117 changed files with 200327 additions and 141852 deletions
|
|
@ -8,6 +8,14 @@
|
|||
; On open
|
||||
Machine AndroidTemperatureUpdateNow
|
||||
|
||||
DEBUGVAR CH9991_Status
|
||||
DEBUGVAR CH9992_Status
|
||||
DEBUGVAR CH9993_Status
|
||||
DEBUGVAR CH9994_Status
|
||||
DEBUGVAR GetFreeFromError
|
||||
DEBUGVAR FailErrorHappend
|
||||
|
||||
|
||||
Var info_startX = 11
|
||||
Var info_1Y = 250
|
||||
Var info_2Y = 320
|
||||
|
|
@ -175,8 +183,7 @@
|
|||
DEBUGVAR TestArrary[2]
|
||||
DEBUGVAR TestArrary[3]
|
||||
|
||||
DEBUGVAR SmoothieMode
|
||||
|
||||
Var CountTouchButton = 0
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
@ -323,7 +330,40 @@
|
|||
<Y> info_3Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
OpenInst 4 ""
|
||||
If CountTouchButton = 4 Then
|
||||
|
||||
Var TimeOutSmoothiesProcess = 181
|
||||
Var SelectDrink = "12-00-07-0000"
|
||||
Var Seeker.selected_a_drink = SelectDrink
|
||||
Var Seeker.TNumberTaobinCredit = "0899999999"
|
||||
Var Seeker.StoreCreditFlag = 0
|
||||
Var Seeker.CoffeePinNumber = ""
|
||||
Var Seeker.VendingTSI = ""
|
||||
|
||||
Var RemainAmountStr = "Free###size=150"
|
||||
|
||||
Var RoadShowMarketCode = "EFR01"
|
||||
|
||||
Var Seeker.VendingCode = RoadShowMarketCode
|
||||
DEBUGVAR RoadShowMarketCode
|
||||
|
||||
Var Seeker.IntVendingCampaign = PriceDrink
|
||||
Var Seeker.FreeVendingCampaign = 1
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var Seeker.CodeNumber = IDNum
|
||||
|
||||
If New_Payment = 1 Then
|
||||
Var Seeker.ORDER_ID = ""
|
||||
GenHashWithTimeStamp Seeker.ORDER_ID
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
|
||||
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
|
||||
TopView "show"
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
|
|
@ -1001,33 +1041,28 @@
|
|||
</Text>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;Color
|
||||
<Image>
|
||||
<X> info1_startX </X>
|
||||
<Y> info_14Y </Y>
|
||||
<State> SmoothieMode</State>
|
||||
<X> info2_startX </X>
|
||||
<Y> info_15Y </Y>
|
||||
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
|
||||
<EventClick>
|
||||
;include="ROOT/taobin_project/xml/open_file_instance0_to_instance2.inc"
|
||||
OpenInst 2 "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
|
||||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_test_color.xml"
|
||||
</EventClick>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> info1_text_startX </X>
|
||||
<Y> info_text_14Y </Y>
|
||||
<X> info2_text_startX </X>
|
||||
<Y> info_text_15Y </Y>
|
||||
<Size> 30 </Size>
|
||||
<State> SmoothieMode</State>
|
||||
<Font> fontType1 </Font>
|
||||
<Color> 0x000000 </Color>
|
||||
<Value> " Smoothie menu." </Value>
|
||||
<Value> "Test RGB" </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 431 </X>
|
||||
<Y> info_cancel_y </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue