Merge remote-tracking branch 'origin/wso' into wso
This commit is contained in:
commit
a82a22c724
9 changed files with 251 additions and 162 deletions
|
|
@ -39,9 +39,7 @@
|
|||
EndIf
|
||||
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
|
||||
|
||||
RootLayoutVisible 13 "show"
|
||||
RootLayoutVisible 3 "show"
|
||||
RootLayoutVisible 13 "show"
|
||||
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
SAVELOG PreviseXMLFileName2
|
||||
|
||||
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
Var Timeout = 0
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
RootLayoutVisible 12 "show"
|
||||
|
||||
Var Timeout = 0
|
||||
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
RootLayoutVisible 12 "show"
|
||||
|
||||
Var Timeout = 0
|
||||
;include=""ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
|
||||
|
||||
SetInstanceIgnoreTouch
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
; open from page_catalog.lxml
|
||||
|
||||
|
||||
RootLayoutVisible 3 "show"
|
||||
RootLayoutVisible 3 "show"
|
||||
RootLayoutVisible 13 "show"
|
||||
|
||||
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
|
||||
|
|
|
|||
|
|
@ -2695,6 +2695,7 @@
|
|||
<X> 0 </X>
|
||||
<Y> 752 </Y>
|
||||
<Width> 1080</Width>
|
||||
<WidthText> 900 </WidthText>
|
||||
<Align> Center </Align>
|
||||
<Size> Auto </Size>
|
||||
<Font> KanitMediumTTF </Font>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue