merge

xml/menu_catalog.xml

@@ -44,10 +44,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 

xml/menu_new_layout_gen.py

@@ -6,13 +6,78 @@
   out_xml('<ScrollHeight> "auto" </ScrollHeight>\r\n')
   out_xml('<Scroll> "Vertical" </Scroll>\r\n')
   out_xml('<Column> 4 </Column>\r\n')
+  out_xml('<Script>\r\n') 
+
+  print("current_file_name " + current_file_name)
+
+  if current_file_name == "page_catalog_group_recommend.skt":
+    touch_less_gen = True
+  else:
+    touch_less_gen = False
+  
+  if touch_less_gen == False:
+
+    out_xml('\t Var block_index_override = 0\r\n')
+    out_xml('\t Var block_index_move = 0\r\n')
+  else:
+
+    out_xml('\t Var block_index_override = 4\r\n')
+    out_xml('\t Var block_index_move = 1\r\n')
+
+
+    out_xml('\tIf Seeker = "curr" Then\r\n')
+    out_xml('\t\tVar TouchLessStg = "Enable"\r\n')
+    out_xml('\t\tVar TouchLessQrStg = "Enable"\r\n')
+    out_xml('\tElse\r\n')
+    out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
+    out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
+    out_xml('\tEndIf\r\n')
+
+    out_xml('\tIf WebAppShow = "Invisible" Then\r\n')
+    out_xml('\t\tVar TouchLessStg = "Disable"\r\n')
+    out_xml('\t\tVar TouchLessQrStg = "Invisible"\r\n')
+    out_xml('\tEndIf\r\n')
+    
+  
+  out_xml('</Script>\r\n')
   
   pd_code_available = '##-##-##-####'
-      
+  count = 0
   count_test = 0
+  if touch_less_gen == True:
+    out_xml( '<Block>\r\n')
+    out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
+    out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
+    out_xml('\t<Width> 225 </Width>\r\n')
+    out_xml('\t<Height> 296 </Height>\r\n')
+    out_xml('\t<State> "Enable" </State> \r\n')
+    out_xml('\t<Image>\r\n')
+    out_xml('\t<X> 0 </X>\r\n')
+    out_xml('\t<Y> 0 </Y>\r\n')
+    out_xml('\t<State> TouchLessStg </State> \r\n')
+    out_xml('\t<Filename> Var( DirImage + "/touch_less_order.png" )</Filename>\r\n')
+    out_xml('\t<FilenameDisable> Var( DirImage + "/touch_less_order_db.png" )</FilenameDisable>\r\n')
+    out_xml('\t</Image>\r\n')
+    out_xml('\t<QRCode>\r\n')
+    out_xml('\t<X> 40 </X>\r\n')
+    out_xml('\t<Y> 153 </Y>\r\n')
+    out_xml('\t<Width> 150 </Width>\r\n')
+    out_xml('\t<Color> "0xeae6e1" </Color>\r\n')
+    out_xml('\t<QRColor> "0x513C2F" </Color>\r\n')
+    out_xml('\t<Height> 150 </Height>\r\n')
+    
+    #out_xml('\t<State> TouchLessQrStg </State>\r\n')
+    #out_xml('\t<Service> "Herr" </Service>\r\n')
+    out_xml('\t<State> TouchLessQrStg </State>\r\n')
+    out_xml('\t<Service> testservice </Service>\r\n')
+    
+    out_xml('\t</QRCode>\r\n')
+    out_xml('</Block>\r\n')
+
   out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n')
   for spl in  menu_new_list:
       #product_code = s
+        
       menu_img = spl[7]
       out_xml( '\t; '+ spl[4] + ' ' + spl[5] + ' ' + spl[6]+ ' \r\n')
       out_xml( '<Block>\r\n')
@@ -63,9 +128,6 @@
       out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
       out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
       
-
-      out_xml( '\t\tTopping "Load" "'+ spl[5] +'"\r\n')
-
       out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
             
       out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
@@ -84,15 +146,19 @@
 
       out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
       out_xml( '\t\t\tVar PD_STAGE_2 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n')
       out_xml( '\t\tElse\r\n')
       out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
       out_xml( '\t\t\t\tVar PD_STAGE_1 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n')
       out_xml( '\t\t\tElse\r\n')
       out_xml( '\t\t\t\tVar PD_STAGE_3 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n')
       out_xml( '\t\t\tEndIf\r\n')
       out_xml( '\t\tEndIf\r\n')
 
 
+
       out_xml( '\t\tVar menu_name_eng_hot = $' + pd_code_1 + '.NameE\r\n')
       out_xml( '\t\tVar menu_desc_eng_hot = $' + pd_code_1 + '.descriptionE\r\n')
       out_xml( '\t\tVar menu_name_thai_hot = $' + pd_code_1 + '.Name\r\n')
@@ -112,9 +178,9 @@
 
       
       out_xml( '\t\t\r\n')
-      out_xml( '\t\tDEBUGVAR menu_name_eng_hot\r\n')
-      out_xml( '\t\tDEBUGVAR menu_name_eng_cold\r\n')
-      out_xml( '\t\tDEBUGVAR menu_name_eng_blender\r\n')
+      out_xml( '\t\tDEBUGVAR PD_STAGE_1\r\n')
+      out_xml( '\t\tDEBUGVAR PD_STAGE_2\r\n')
+      out_xml( '\t\tDEBUGVAR PD_STAGE_3\r\n')
       out_xml( '\t\t\r\n')
       out_xml( '\t\t\r\n')
       out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n')

xml/page_board.xml

@@ -414,6 +414,24 @@
 
 	;READ_FILE "/mnt/sdcard/spiral" SpiralOnline
 
+	READ_FILE "/mnt/sdcard/new_layout" new_layout
+		
+
+	DEBUGVAR JXMLVersionInt
+
+
+	If JXMLVersionInt > 389 Then
+		Var new_layout = "true"
+	EndIf
+
+	DEBUGVAR new_layout
+
+	If new_layout = "true" Then
+		Machine MenuLayoutNew
+	Else
+		Machine MenuLayoutOld
+	EndIf
+
 	DEBUGVAR SpiralOnline
 	
 	Topping "ClearNextOrder" "-"
@@ -448,9 +466,10 @@
 
 
 		;stop_now
-		If NETCORE_LOST_CNT > 15 Then
+		If NETCORE_LOST_CNT > 120 Then
 			Var stop_now = "true"
 			Var MachineErrorDetailAll = "???"
+			SAVELOG "NETCORE_LOST_CNT"
 			Open "ROOT/taobin_project/xml/page_show_error.xml"
 		EndIf
 	EndIf

xml/page_brewing3Conti.xml

@@ -13,6 +13,8 @@
 		CoinBack
 	EndIf
 
+	Var PayCredit = 0
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
@@ -23,7 +25,7 @@
 
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
 	Var next_pic_bp = DirImage + "/bp_add_order.png"
-	Var text_next_order = DirImage + "/text_add_order.png"
+	Var text_next_order = DirImage + "/text_next_order.png"
 
 	If NextOrder = "true" Then
 		Var EnableSelectMenuBetweenBrew = "Invisible"
@@ -882,12 +884,20 @@
 ;<Filename> BottomText </Filename>
 ;</Image>
 
-<Button>
-<X> 78 </X>
-<Y> 1652 </Y>
-<State>EnableSelectMenuBetweenBrewBlink</State>
+<Image>
+<X> 0 </X>
+<Y> 1655 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
 <Filename> text_next_order </Filename>
-<Button>
+<Image>
+
+<Image>
+<X> 835 </X>
+<Y> 1735 </Y>
+<State>EnableSelectMenuBetweenBrewBlink</State>
+<Filename> "ROOT/taobin_project/image/page_payment/arrow_1.png" </Filename>
+<Image>
+
 
 
 

xml/page_cannotConti.xml

@@ -0,0 +1,709 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	Var CountDownThankyou = 4
+	Var CountDownBrewing = BrewTime
+	Var CountUpBrewing = 0
+	SAVELOG BrewTime
+	Var ShowCountDownBrewing = CountDownBrewing
+	Var Timeout = 0
+	Var ChangeFlag = 0
+	Var ErrTimeout = 0
+	Var ActionOKCase = 0
+	Var ChangeTimeout = 0
+	Var ChangeOK = 0
+	
+	Var MachineState_Result = 0
+
+	Var FailedCount = 0
+	Var ChangeAmountSum = 0
+	
+	Var Tel_Confirm_Flag = 0
+	Var LastMakeDrinkResult = "-"
+	
+	DEBUGVAR MachineStage
+	DEBUGVAR NextOrderStatus
+
+	If show_eng = "true" Then 
+		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" 
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+		Var BottomText = PicturePath + "text_bottom_eng.png"
+        Var TextErrorShow = "Sorry, unable to produce the next order"
+	Else
+		Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" 
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var BottomText = PicturePath + "text_bottom_thai2.png"
+
+        Var TextErrorShow = "เต่าบินขัดข้องไม่สามารถทำเครื่องดื่มได้"
+	EndIf
+
+	DEBUGVAR StarwState
+	DEBUGVAR LidState
+	DEBUGVAR BottomText
+
+	DEBUGVAR Seeker.TNumberTaobinCredit
+	DEBUGVAR TelephoneNumber
+	DEBUGVAR Seeker.StoreCreditFlag
+
+
+     If Seeker = "curr" Then
+    	SAVELOG "Call from thankyou Conti"
+    	
+		Topping "Select" Seeker.selected_a_drink
+
+		; Set option toppinng and pack 
+		Topping "Select1-ID" Seeker.topping1
+		Topping "Select2-ID" Seeker.topping2
+		Topping "Select3-ID" Seeker.topping3
+
+		; Pack
+		Topping "Pack" ExtendData
+
+	
+
+		Var SessionID2 = SelectSlot + ":"
+		Var SessionID2 = SessionID2 + ExtendData
+	
+
+		Topping "ClearNextOrder" "-"
+	EndIf
+
+    Var LastMakeDrinkResult = "fail"
+    Var NextOrderStatus = "Disable"
+
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineStage
+	DEBUGVAR NextOrderStatus
+
+    ; page_brewing3.xml
+    DEBUGVAR MachineStage
+
+    Var PayReference = ""
+	Var PayType = ""
+    
+
+	Var SelectDrink = Seeker.selected_a_drink
+	Var ServiceAmount2 = Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.selected_a_drink
+	DEBUGVAR  Seeker.ServiceAmount2
+
+	; On open move from page_brewing3.xml
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+	Var waitAckPay = 0
+	Var VendingTSIDTmp = ""
+	Var VendingTSIDProblem = ""
+	Var CreditReference = ""
+	Var PayCredit = 0
+
+	
+	If Seeker.PayWithQR = 1 Then
+		Var VendingTSIDTmp = Seeker.VendingTSID
+
+		If Seeker.TNumberTaobinCredit = "" Then
+			Var TelephoneNumber = "0899999999"
+			Var PayO2 = ""
+		Else
+			Var TelephoneNumber = Seeker.TNumberTaobinCredit
+			Var PayO2 = Seeker.CoffeePinNumber
+		EndIf
+
+
+		If ChangeFlag2 = 1 Then
+					Var TelephoneNumber = "0899999999"
+					Var PayO2 = ""
+					Var VendingDiscount = 0
+					Var VendingCampaign = 0
+					Var ServiceType = "credit"
+					Var SessionID2 = SelectDrink
+					Var ServiceCredit = "coffee"
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+					
+		Else
+
+					If Seeker.StoreCreditFlag = 1 Then
+						Var VendingDiscount = 0
+						Var VendingCampaign = 0
+						Var ServiceType = "credit"
+						Var SessionID2 = SelectDrink
+						Var ServiceCredit = "coffee"
+						Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+						
+
+					EndIf
+		EndIf
+	EndIf
+
+	If Seeker.TNumberTaobinCredit = "" Then
+
+		If Seeker.TNumberTaobinMember = "" Then
+			Var TelephoneNumberProblem = ""
+		Else
+			Var TelephoneNumberProblem = Seeker.TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumberProblem = Seeker.TNumberTaobinCredit
+	EndIf
+
+	If TelephoneNumberProblem = "" Then
+		;Var TelephoneNumberProblem = ""
+    	Var ShowTextNumber = "Enable"
+    	Var Tel_Confirm_State = "Disable"
+	Else
+		Var ShowTextNumber = "Invisible"
+    	Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var AddData = 0
+
+	If Seeker.TNumberTaobinMember = "" Then
+
+	Else
+		If Seeker.PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		Else
+			Var VendingTSID = ""
+		EndIf 	
+
+
+		Var BmiYear = Seeker.PointTaobinStr
+		Var PointCrm = ""
+		If Seeker.FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+		Var GetScore = VendingTSID
+		If Seeker.TaobinErrorNetwork = 0 Then
+			Var Cid = 11
+			Var AddData = 1
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+		Else
+			Var PointCrm = ""
+			Var Cid = 14
+			Var AddData = 1
+			;AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+		EndIf
+		
+		Var VendingTSID = ""
+	EndIf
+
+	Var CreditReference = Seeker.CreditReferenceTmp
+	Var VendingDiscount = Seeker.VendingDiscount
+	Var VendingCampaign = Seeker.VendingCampaign
+
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+	EndIf
+
+	DEBUGVAR show_eng 
+
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+
+	DEBUGVAR VendingCampaign
+
+
+</EventOpen>
+
+<EventActionOk>
+
+	
+	If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 142."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+
+	If waitAckPay = 1 Then	
+		SAVELOG "waitAckPay = 1"
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+		
+	EndIf
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 204."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			
+		Else 
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+       
+    Else
+
+		
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	
+	Var Timeout = Timeout + 1
+
+	If Timeout > 540 Then
+		SAVELOG "back_to_main from line  > 217."
+		Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+	EndIf
+	
+
+	If Timeout > 480 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+	If  waitAckPay = 1 Then  
+		If Timeout > 60 Then
+			Var VendingTSID = ""
+			SAVELOG "TIMEOUT=60"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
+		EndIf
+	EndIf
+
+	If  waitAckPay = 2 Then  
+		If Timeout > 10 Then
+
+			If Seeker.CodeChannel = 1 Then 
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "coffee"
+				Var ECommerce = ""
+				Var ECommerce = ECommerce + PriceDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + DiscountDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SessionID2 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SelectDrink 
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C:"
+				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				;Var Timeout = 0
+			EndIf
+				
+			SAVELOG "back_to_main from line  > 309."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+
+			EndIf
+
+
+
+			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+
+			;If Seeker.CodeChannel = 0 Then 
+			;	SAVELOG "back_to_main from line  > 315."
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			;EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+
+			EndIf
+
+			;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
+
+			
+			Var ServiceType = "coffee"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+			;If Seeker.CodeChannel = 0 Then 
+			;	SAVELOG "back_to_main from line  > 357."
+			;	Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			;EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		If ActionOKCase = 0 Then
+
+			Var SVT = "coffee"
+			Var ACC = "0899999999"
+
+			If Seeker.TNumberTaobinMember = "" Then
+			Else
+				Var ACC = Seeker.TNumberTaobinMember
+			EndIf
+
+
+			If NextOrderStatus = "Disable" Then
+				Var PayDetail="1/F:1221/0/"
+			Else
+
+
+				Var PayDetail = "1/" + HURR_FOREVER
+				Var PayDetail = PayDetail + "/"  
+				Var PayDetail = PayDetail + SAMESALARY
+				Var PayDetail = PayDetail + "/"
+				Var PayDetail = PayDetail + NOBONUS
+				
+			EndIf
+
+
+
+
+			Var DEE = PayDetail
+
+			PAYEXT SVT ACC VendingTSIDTmp DEE
+		
+			Var ActionOKCase = 1
+			If Seeker.CodeChannel = 0 Then 
+				SAVELOG "back_to_main from line  > 391."
+				Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
+			EndIf
+
+			Var waitAckPay = 2
+			Var Timeout = 5
+
+
+
+
+		EndIf
+	EndIf
+
+
+	
+
+	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			If AddData = 1 Then
+				AddData Cid Seeker.TNumberTaobinMember  BmiYear PointCrm GetScore
+			EndIf
+
+
+			If Seeker.PayWithQR = 0 Then 
+				If Seeker.CodeChannel = 0 Then
+					If ChangeFlag = 0 Then
+						Var ChangeFlag = 1 
+
+						If Seeker.StoreCreditFlag = 1 Then
+							Var ChangeOK = 2
+						Else
+							If GetFreeFromError = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount2
+							EndIf
+							
+						EndIf
+							
+					EndIf
+
+				Else
+
+					If CoinAmount > 0 Then
+					
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount3
+							EndIf
+							
+						EndIf
+					Else
+						Var ChangeOK = 2
+					EndIf
+
+
+				EndIf
+
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+			
+			
+		EndIf
+	EndIf
+
+	
+
+	
+	Refresh
+	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_0 </Filename>
+</Video>
+
+<Text>
+<X> 0 </X>
+<Y> 427 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 46 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Refresh> "Enable" </Refresh>
+<Value> TextErrorShow </Value>
+</Text>
+
+
+<Image>
+<X> 375 </X>
+<Y> 623 </Y>
+<Width> 331 </Width>
+<Height> 435 </Height>
+<Filename> Seeker.PictureDrink </Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 938 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> Seeker.showname </Value>
+</Text>
+
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+
+</Popup>

xml/page_catalog.xml

@@ -72,7 +72,7 @@
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 
-		GenHashWithTimeStamp QRCODE99
+		;GenHashWithTimeStamp QRCODE99x
 		WEB "ENABLE"
 		
 	Else
@@ -141,8 +141,7 @@
 	
 	EndIf
 
-	READ_FILE "/mnt/sdcard/new_layout" new_layout
-
+	
 	Var menu_name_eng_hot = ""
 	Var menu_desc_eng_hot = ""
 	Var menu_name_thai_hot = ""

xml/page_catalog_choose_drink.xml

@@ -116,10 +116,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -210,7 +212,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -223,7 +229,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink1.xml

@@ -183,10 +183,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -277,7 +279,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -290,7 +296,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink11.xml

@@ -171,10 +171,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -265,7 +267,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -278,7 +284,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink2.xml

@@ -159,10 +159,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -253,7 +255,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -266,7 +272,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink3.pml

@@ -7,6 +7,7 @@
  product_code = []
  product_code.append('12-02-01-0001')
  product_code.append('12-02-01-0002')
+ product_code.append('12-02-01-0024')
  
  product_code.append('12-02-01-0020')
  
@@ -22,6 +23,8 @@
  
  product_code.append('12-02-01-0021')
  
+
+
  product_code.append('12-02-01-0007')
  product_code.append('12-02-01-0008')
  product_code.append('12-02-01-0019')
@@ -46,8 +49,9 @@
 
  product_code.append('12-02-02-0004')
  product_code.append('12-02-02-0026')
-
+ #12-02-02-0024
  product_code.append('12-02-02-0005')
+ product_code.append('12-02-02-0024')
  product_code.append('12-02-02-0006')
  product_code.append('12-02-02-0007')
 

xml/page_catalog_choose_drink3.xml

@@ -158,10 +158,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -252,7 +254,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -265,7 +271,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 
@@ -777,7 +787,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=3 12-02-01-0020 
+	; button i=3 12-02-01-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0024.Button  </State> 
+	<Button>
+	<State> $12-02-01-0024.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0024.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0024.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0024.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0024.Self
+		Var NameDrink = $12-02-01-0024.NameE
+		Var NameDrinkTH = $12-02-01-0024.Name
+		Var DrinkDescriptionTH = $12-02-01-0024.description
+		Var DrinkDescription = $12-02-01-0024.descriptionE
+		Var PriceDrink = $12-02-01-0024.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-01-0024.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0024.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-02-01-0024.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-01-0024.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-01-0024.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-02-01-0024.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-02-01-0024.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-02-01-0024.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=4 12-02-01-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -883,7 +999,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=4 12-02-01-0003 
+	; button i=5 12-02-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -989,7 +1105,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=5 12-02-01-0025 
+	; button i=6 12-02-01-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1095,7 +1211,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=6 12-02-01-0004 
+	; button i=7 12-02-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1201,7 +1317,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=7 12-02-01-0026 
+	; button i=8 12-02-01-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1307,7 +1423,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=8 12-02-01-0006 
+	; button i=9 12-02-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1413,7 +1529,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=9 12-02-01-0021 
+	; button i=10 12-02-01-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1519,7 +1635,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=10 12-02-01-0007 
+	; button i=11 12-02-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1625,7 +1741,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=11 12-02-01-0008 
+	; button i=12 12-02-01-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1731,7 +1847,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=12 12-02-01-0019 
+	; button i=13 12-02-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1837,7 +1953,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=13 12-02-01-0009 
+	; button i=14 12-02-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1943,7 +2059,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=14 12-02-01-0022 
+	; button i=15 12-02-01-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2049,7 +2165,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=15 12-02-01-0010 
+	; button i=16 12-02-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2155,7 +2271,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=16 12-02-01-0011 
+	; button i=17 12-02-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2261,7 +2377,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=17 12-02-01-0027 
+	; button i=18 12-02-01-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2367,7 +2483,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=18 12-02-01-0012 
+	; button i=19 12-02-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2473,7 +2589,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=19 12-02-01-0028 
+	; button i=20 12-02-01-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2579,7 +2695,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=20 12-02-01-0017 
+	; button i=21 12-02-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2685,7 +2801,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=21 12-02-01-0031 
+	; button i=22 12-02-01-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2791,7 +2907,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=22 12-02-01-0032 
+	; button i=23 12-02-01-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2897,7 +3013,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=23 12-02-02-0020 
+	; button i=24 12-02-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3003,7 +3119,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=24 12-02-02-0001 
+	; button i=25 12-02-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3109,7 +3225,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=25 12-02-02-0002 
+	; button i=26 12-02-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3215,7 +3331,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=26 12-02-02-0003 
+	; button i=27 12-02-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3321,7 +3437,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=27 12-02-02-0025 
+	; button i=28 12-02-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3427,7 +3543,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=28 12-02-02-0004 
+	; button i=29 12-02-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3533,7 +3649,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=29 12-02-02-0026 
+	; button i=30 12-02-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3639,7 +3755,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=30 12-02-02-0005 
+	; button i=31 12-02-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3745,7 +3861,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=31 12-02-02-0006 
+	; button i=32 12-02-02-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-02-0024.Button  </State> 
+	<Button>
+	<State> $12-02-02-0024.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0024.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0024.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0024.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-02-0024.Self
+		Var NameDrink = $12-02-02-0024.NameE
+		Var NameDrinkTH = $12-02-02-0024.Name
+		Var DrinkDescriptionTH = $12-02-02-0024.description
+		Var DrinkDescription = $12-02-02-0024.descriptionE
+		Var PriceDrink = $12-02-02-0024.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-02-0024.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0024.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-02-02-0024.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-02-0024.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-02-02-0024.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-02-02-0024.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-02-02-0024.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-02-02-0024.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=33 12-02-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3851,7 +4073,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=32 12-02-02-0007 
+	; button i=34 12-02-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3957,7 +4179,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=33 12-02-02-0008 
+	; button i=35 12-02-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4063,7 +4285,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=34 12-02-02-0019 
+	; button i=36 12-02-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4169,7 +4391,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=35 12-02-02-0009 
+	; button i=37 12-02-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4275,7 +4497,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=36 12-02-02-0022 
+	; button i=38 12-02-02-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4381,7 +4603,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=37 12-02-02-0010 
+	; button i=39 12-02-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4487,7 +4709,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=38 12-02-02-0011 
+	; button i=40 12-02-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4593,7 +4815,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=39 12-02-02-0027 
+	; button i=41 12-02-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4699,7 +4921,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=40 12-02-02-0012 
+	; button i=42 12-02-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4805,7 +5027,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=41 12-02-02-0028 
+	; button i=43 12-02-02-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -4911,7 +5133,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=42 12-05-02-0027 
+	; button i=44 12-05-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5017,7 +5239,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=43 12-02-02-0031 
+	; button i=45 12-02-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -5123,7 +5345,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=44 12-02-02-0032 
+	; button i=46 12-02-02-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>

xml/page_catalog_choose_drink4.xml

@@ -156,10 +156,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -250,7 +252,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -263,7 +269,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink5.xml

@@ -149,10 +149,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -243,7 +245,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -256,7 +262,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink6.xml

@@ -155,10 +155,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -249,7 +251,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -262,7 +268,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink7.xml

@@ -171,10 +171,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -265,7 +267,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -278,7 +284,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_choose_drink8.xml

@@ -151,10 +151,12 @@
 
     Else
         ;stop_now
-        If NETCORE_LOST_CNT > 15 Then
+        If NETCORE_LOST_CNT > 120 Then
             Var stop_now = "true"
             Var MachineErrorDetailAll = "???"
-            Open "ROOT/taobin_project/xml/page_show_error.xml"
+            SAVELOG "NETCORE_LOST_CNT"
+            
+            Open "ROOT/taobin_project/xml/page_back_to_error.xml"
         EndIf
     EndIf
 
@@ -245,7 +247,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+     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>
@@ -258,7 +264,11 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    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>
 

xml/page_catalog_group_coffee.skt

@@ -41,25 +41,11 @@
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
 
 <?hurr 
     #include=menu_new_layout_gen.py
 ?>
 
 
+
 </Popup>