Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project
This commit is contained in:
commit
52bcce20d4
7 changed files with 28 additions and 62 deletions
|
|
@ -2957,29 +2957,6 @@
|
|||
</Text>
|
||||
|
||||
|
||||
|
||||
<Image>
|
||||
<State> showText8 </State>
|
||||
<X> 600 </X>
|
||||
<Y> 6 </Y>
|
||||
<Filename> Var( DirImage + "/text8.png" ) </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
<Image>
|
||||
<State> oreo_topping_wed_free </State>
|
||||
<X> text_x_free_topping </X>
|
||||
<Y> 6 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_free.png" </Filename>
|
||||
</Image>
|
||||
<Image>
|
||||
<State> oreo_topping_wed_topping</State>
|
||||
<X> text_x_free_topping </X>
|
||||
<Y> 6 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/page3/img_oreo_wed_topping.png" </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
</Row1>
|
||||
|
||||
|
||||
|
|
@ -3481,8 +3458,7 @@
|
|||
|
||||
If SelectDrinkType = 1 Then
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
|
||||
;Open "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
Open "ROOT/taobin_project/xml/page_identityChildren_consent.xml"
|
||||
Open "ROOT/taobin_project/xml/page_identity_verification.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue