Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/menu_catalog_new.xml

@@ -0,0 +1,506 @@
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080 </Width>
+<Height> 1540 </Height>
+<Color> "0xeae6e1" </Color>
+</Image>
+
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    If NextPage = "-" Then
+
+    Else
+            If CupOnArm = "true" Then
+                If Timeout > 9 Then
+                    SAVELOG "COA9"
+                    Open NextPage
+                EndIf
+            Else
+                If Timeout > 30 Then
+                    SAVELOG "COA30"
+                    Open NextPage
+                EndIf
+            EndIf
+    EndIf
+
+    If Timeout > 60 Then
+        SAVELOG "Timeout"
+        If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            SAVELOG "Back"
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
+    EndIf
+
+    If BrewCommand = "RefreshAll" Then
+        Var BrewCommand = "-"
+        Open CurrentXMLFileName2
+    EndIf
+
+    If Seeker = "curr" Then
+        If DoorCupPosition = "bottom" Then
+            ; It normal 
+            Var EmergencyStop = "false"
+        Else
+            Var EmergencyStop = "true"
+            
+            ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" 
+
+        EndIf
+    EndIf
+
+    If IgnoreNetCore = "true" Then
+
+    Else
+        ;stop_now
+        If NETCORE_LOST_CNT > 120 Then
+            Var stop_now = "true"
+            Var MachineErrorDetailAll = "???"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+        EndIf
+    EndIf
+
+    Var Timeout = Timeout + 1
+    TimerReset
+</EventTimeout> 
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+;<Video>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Width> 1080</Width>
+;<Height> 380 </Height>
+;<Loop> "true" </Loop>
+;<Filename> video_menu_1 </Filename>
+;</Video>
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 494 </Y>
+<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
+</Image>
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 358 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 397 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    If SpiralOnline = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" 
+    
+    Else
+	   Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 1000 </X>
+<Y> 415 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; eng
+    If show_eng = "true" Then 
+        Var show_eng = "false"
+    Else
+        Var show_eng = "true"
+    EndIf
+    
+
+    Open CurrentXMLFileName2
+</EventClick>
+</Button>
+
+;
+
+<Button>
+<X> 92 </X>
+<Y> 395 </Y>
+<State> Menu1Selected </State>
+<Filename> Var( DirImage + "/bn_bestseller.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_bestseller.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+     If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 99 </X>
+<Y> 395 </Y>
+<State> Menu1Selected2 </State>
+<Filename> Var( DirImage + "/bn_recommend2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_recommend2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+
+
+
+<Button>
+<X> 243 </X>
+<Y> 395 </Y>
+<State> Menu2Selected </State>
+<Filename> Var( DirImage + "/bn_coffee.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 227 </X>
+<Y> 395 </Y>
+<State> Menu2Selected2 </State>
+<Filename> Var( DirImage + "/bn_coffee2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_coffee2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 394 </X>
+<Y> 395 </Y>
+<State> Menu3Selected </State>
+<Filename> Var( DirImage + "/bn_tea.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 355 </X>
+<Y> 395 </Y>
+<State> Menu3Selected2 </State>
+<Filename> Var( DirImage + "/bn_tea2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_tea2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+    EndIf
+
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 545 </X>
+<Y> 395 </Y>
+<State> Menu4Selected </State>
+<Filename> Var( DirImage + "/bn_cho_ca.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 483 </X>
+<Y> 395 </Y>
+<State> Menu4Selected2 </State>
+<Filename> Var( DirImage + "/bn_cho_ca2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cho_ca2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+    EndIf
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu7Selected </State>
+<Filename> Var( DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu7Selected2 </State>
+<Filename> Var( DirImage + "/bn_protein2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_protein2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu11Selected </State>
+<Filename> Var( DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu11Selected2 </State>
+<Filename> Var( DirImage + "/bn_appfast2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_appfast2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu21Selected </State>
+<Filename> Var( DirImage + "/bn_forkid.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+</EventClick>
+</Button>
+<Button>
+<X> 611 </X>
+<Y> 395 </Y>
+<State> Menu21Selected2 </State>
+<Filename> Var( DirImage + "/bn_forkid2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 696 </X>
+<Y> 395 </Y>
+<State> Menu8Selected </State>
+<Filename> Var( DirImage + "/bn_cocktail.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu8Selected2 </State>
+<Filename> Var( DirImage + "/bn_cocktail2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_cocktail2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 847 </X>
+<Y> 395 </Y>
+<State> Menu6Selected </State>
+<Filename> Var( DirImage + "/bn_sodada.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+    EndIf
+</EventClick>
+</Button>
+<Button>
+<X> 739 </X>
+<Y> 395 </Y>
+<State> Menu6Selected2 </State>
+<Filename> Var( DirImage + "/bn_sodada2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_sodada2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+    EndIf
+</EventClick>
+</Button>
+
+<Button>
+<X> 867 </X>
+<Y> 395 </Y>
+<State> MenuVSelected2 </State>
+<Filename> Var( DirImage + "/bn_vending2.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_vending2.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    Var NextPage = "-"
+    Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" 
+</EventClick>
+</Button>
+
+<EventWebApp>
+
+    DEBUGVAR web_ready
+    If web_ready = "true" Then
+        If web_ref = QRCODE99x Then
+
+            Var web_readyOK = web_ready
+            Var web_telnumOK = web_telnum
+            
+            Var web_app_prepar = "true"
+            Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+        EndIf
+    Else
+    EndIf
+ 
+</EventWebApp>
+

xml/page_catalog.xml

@@ -10,6 +10,9 @@
 	TopView "show"
 	; On open
 
+	READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow
+	DEBUGVAR ToppingNewShow
+
 	Var NextPage = "-"
 
 	Var Seeker.thankLidFlag = 0

xml/page_catalog_group_appfast.skt

@@ -1,5 +1,6 @@
 <?hurr 
     #include=menu_head.py 
+    echo param
 ?>
 
 <Popup>
@@ -51,7 +52,13 @@
 
 
 <?hurr 
-    #include=menu_catalog.xml
+    echo $param
+    if $param == "new-layout":
+        echo "using new layout hurr"
+        #include=menu_catalog.xml
+    else:
+        #include=menu_catalog.xml
+
 ?>
 
 

xml/page_payment_camera.xml

@@ -241,7 +241,7 @@
 
 <Button>
 <X> 784 </X>
-<Y> 1415 </Y>
+<Y> 1425 </Y>
 <State> "Enable" </State>
 <Filename> Var( DirImage + "/bn_shoot.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_shoot.png" )</FilenamePress>
@@ -269,7 +269,7 @@
 
 <CameraX> 
 <X> 735 </X>
-<Y> 1189 </Y>
+<Y> 1179 </Y>
 <Name>"usbfront"</Name>
 <Width> 326 </Width>
 <Height> 235 </Height>
@@ -279,5 +279,11 @@
 
 		
 </EventCamera>
+<EventIDCard>
 
+    DEBUGVAR IDCardStatus
+    DEBUGVAR IDCardReady
+    DEBUGVAR IDCardData
+    DEBUGVAR IDBirthdate
+</EventIDCard>
 </Popup>

xml/page_payment_cash.xml

@@ -1933,6 +1933,27 @@
 <Filename> Var( DirImage + "/img_popup4.png" )</Filename>
 </Image>
 
+<Image>
+<X> 838 </X>
+<Y> 1350 </Y>
+<State> eval(  
+	 Var return = "Invisible"
+
+	 If AdultState1 = "Enable" Then
+	 	If AdultState2 = "Invisible" Then
+	 		Var return = "Enable"
+	 	EndIf
+ 	EndIf
+ 	DEBUGVAR return
+	)  
+</State>
+<Animation>
+	<Style> "Bounce" </Style>
+	<OnEvent> "TimerSec=3" </OnEvent>
+</Animation>
+<Filename> "ROOT/taobin_project/image/anmi/arrow_1.png" </Filename>
+</Image>
+
 <Button>
 <X> 360 </X>
 <Y> 1373 </Y>

xml/page_thankyouConti.xml

@@ -274,6 +274,7 @@
 			If PaySuccessWithDaemonTask = 1 Then
 
 			Else
+				Var LastMakeDrinkResult = "-"
        			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
        	
        		EndIf

xml/page_topping_select4.xml

@@ -7,6 +7,12 @@
 <EventOpen>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 			
+	DEBUGVAR ToppingNewShow
+	If ToppingNewShow = "true" Then
+		SAVELOG "open page_topping_select5"
+		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
+	EndIf
+
 	Var UserSeletedSugar = 0
 
 	Var y_topping_bg = 912

xml_main/startup.xml

@@ -106,8 +106,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.62"
-	Var XMLPageVersionInt = 662
+	Var XMLPageVersion = "6.64"
+	Var XMLPageVersionInt = 664
 </EventOpen>
 
 <Text>