Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
705ab50146
312 changed files with 64716 additions and 623 deletions
|
|
@ -207,6 +207,7 @@
|
|||
STRCONTAIN "1206" MaterialAvailable EnergyDrinkEnable
|
||||
STRCONTAIN "1216" MaterialAvailable CoconutSyrupEnable
|
||||
STRCONTAIN "1042" MaterialAvailable CocoaPowderEnable
|
||||
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
If AppFastEnable = "true" Then
|
||||
|
|
@ -1118,6 +1119,8 @@
|
|||
EndIf
|
||||
DEBUGVAR ShowButtonClick2
|
||||
|
||||
Machine OrderCheck
|
||||
|
||||
DEBUGVAR CLOSE_ORDER_NOW
|
||||
|
||||
; move to TRY actoin.
|
||||
|
|
@ -1229,10 +1232,20 @@
|
|||
</EventUnitTest3>
|
||||
|
||||
<EventUnitTest4>
|
||||
Var XMLProfile = "$School"
|
||||
PRICE "Load" "-"
|
||||
PRICE "Check" XMLProfile
|
||||
PRICE "CheckAndApply" XMLProfile
|
||||
|
||||
DEBUGVAR ProfileIndex[0]
|
||||
DEBUGVAR ProfileIndex[1]
|
||||
DEBUGVAR ProfileIndex[2]
|
||||
|
||||
</EventUnitTest4>
|
||||
|
||||
<EventUnitTest6>
|
||||
PushFile "/sdcard/" "RootManPicture" "scn_240703193755.png"
|
||||
</EventUnitTest6>
|
||||
|
||||
<EventDrink>
|
||||
SAVELOG "EventDrink EventDrink EventDrink EventDrink EventDrink "
|
||||
</EventDrink>
|
||||
|
|
@ -1703,7 +1716,7 @@
|
|||
OpenInst 2 ChackMemberPage
|
||||
EndIf
|
||||
Else
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
|
||||
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_before_check_member.xml"
|
||||
EndIf
|
||||
|
||||
TopView "show"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue