Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/vending_info2.xml

@@ -165,6 +165,7 @@
 	Var alphaPasswordPromptWithKeyboard = "Invisible"
 
 	Var ClickOn = ""
+	Var PermissionLevel = ""
 
 
 </EventOpen>

xml/vending_tasks_pre_main.xml

@@ -4,6 +4,42 @@
 <Volume> SoundVolume </Volume>
 <Background> "0x2c2928" </Background>
 
+<EventOpen>
+
+    Var EnableTestSystem = "Enable"
+    Var EnableServiceOp = "Enable"
+    Var EnableMaintenance = "Enable"
+    Var EnableConfigureMachine = "Enable"
+
+
+    Var Timeout = 0
+
+
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    Var Timeout = Timeout + 1
+
+    If Timeout > 30 Then
+        Open "ROOT/taobin_project/xml/page_board.xml"
+    EndIf
+
+
+    Var Text1_9 = SystemTime
+	Var Text1_9 = Text1_9 + "  "
+	Var Text1_9 = Text1_9 + SystemDate
+
+    Var BackToMainTime = 30 - Timeout
+
+
+    Refresh
+    TimerReset
+
+</EventTimeout>
+
+
 ; header
 <Image>
 <X> 0 </X>
@@ -27,10 +63,125 @@
 	Open "ROOT/taobin_project/xml/vending_info2.xml"
 
 </EventClick>
+
 </Button>
+<Text>
+<X> 100 </X>
+<Y> 20 </Y>
+<Size> 19 </Size>
+<Font> fontType1 </Font>
+<Color> 0xe2e2e2 </Color>
+<Value> BackToMainTime </Value>
+</Text>
+
+<Text>
+<X> 800 </X>
+<Y> 20 </Y>
+<Size> 19 </Size>
+<Font> fontType1 </Font>
+<Color> 0xe2e2e2 </Color>
+<Value> Text1_9 </Value>
+</Text>
+
 
 ;task
 
+<Image>
+<X> 280 </X>
+<Y> 150 </Y>
+<Height> 40 </Height>
+<Width> 560 </Width>
+<Volume> SoundVolume </Volume>
+<Filename> "ROOT/taobin_project/image/new_vending_info/tasks_header.png" </Filename>
+</Image>
+
+<FrameScroll>
+
+<Max> 4 </Max>
+<X> 280 </X>
+<Y> 200 </Y>
+<Width> 600 </Width>
+<ScrollHeight> "auto" </ScrollHeight>
+<Scroll> "Vertical" </Scroll>
+<Column> 1 </Column>
+
+<Block>
+    <MarginLeft> 0 </MarginLeft>
+    <MarginTop> 22 </MarginTop>
+    <Width> 560 </Width>
+    <Height> 80 </Height>
+    <State> EnableTestSystem </State> 
+
+    <Button>
+    <Filename> "ROOT/taobin_project/image/new_vending_info/test_sys_only.png" </Filename>
+    <EventOnClick>
+        MainMenu
+
+    </EventOnClick>
+    </Button>
+</Block>
+<Block>
+    <MarginLeft> 0 </MarginLeft>
+    <MarginTop> 22 </MarginTop>
+    <Width> 560 </Width>
+    <Height> 142 </Height>
+    <State> EnableServiceOp </State> 
+
+    <Button>
+    <Filename> "ROOT/taobin_project/image/new_vending_info/service_ops.png" </Filename>
+    <EventOnClick>
+        MainMenu
+
+    </EventOnClick>
+    </Button>
+</Block>
+<Block>
+    <MarginLeft> 0 </MarginLeft>
+    <MarginTop> 22 </MarginTop>
+    <Width> 560 </Width>
+    <Height> 142 </Height>
+    <State> EnableMaintenance </State> 
+
+    <Button>
+    <Filename> "ROOT/taobin_project/image/new_vending_info/maintenance_repair.png" </Filename>
+    <EventOnClick>
+        MainMenu
+
+    </EventOnClick>
+    </Button>
+</Block>
+<Block>
+    <MarginLeft> 0 </MarginLeft>
+    <MarginTop> 22 </MarginTop>
+    <Width> 560 </Width>
+    <Height> 142 </Height>
+    <State> EnableConfigureMachine </State> 
+
+    <Button>
+    <Filename> "ROOT/taobin_project/image/new_vending_info/configure_machine.png" </Filename>
+    <EventOnClick>
+        MainMenu
+
+    </EventOnClick>
+    </Button>
+</Block>
+
+
+</FrameScroll>
+
+
+
+<Button>
+<X> 50  </X>
+<Y> info_cancel_y </Y>
+<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Open "ROOT/taobin_project/xml/page_board.xml"
+</EventClick>
+</Button>
 
 
 </Page>