DO

video/script1.ev

@@ -1,15 +1,23 @@
 Var MainfileSize = 0
 DEBUGVAR BoxID
 
-If SystemDateMonthInt = 4 Then
+If SystemDateMonthInt = 6 Then
 	GetFileSizeK "taobin_project/video/main_page_event.mp4" MainfileSize
 	DEBUGVAR MainfileSize
-	If MainfileSize = 8071197 Then
+	If MainfileSize = 7184295 Then
 		
 		Var EventTurnOn = 1		
 	EndIf
 EndIf
 
+If BoxID = 173149 Then
+	Var EventTurnOn = 1
+EndIf
+
+If BoxID = 172644 Then
+	Var EventTurnOn = 1
+EndIf
+
 If EventTurnOn = 1 Then
 	Var CountDownShowButton = 0
 	Var ShowButtonClickFull = "Invisible"

video/script2.ev

@@ -4,7 +4,7 @@ GetFileSizeK "taobin_project/video/taobin_thank1_event.mp4" MainfileSize
 DEBUGVAR MainfileSize
 
 If EventTurnOn = 1 Then
-	If MainfileSize = 7539282 Then
+	If MainfileSize = 7120208 Then
 		
 		Var video_file_name = "ROOT/taobin_project/video/taobin_thank1_event.mp4"
 		

video/sync_1.file

@@ -1,18 +1,18 @@
-total 93572
+total 102372
 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4
 -rw-rw---- 1 root sdcard_rw  8321419 2023-03-10 14:23 brewing_adv3.mp4
 -rw-rw---- 1 root sdcard_rw  9268737 2022-09-28 15:26 main_page.mp4
 -rw-rw---- 1 root sdcard_rw 19087285 2023-01-23 16:15 main_page_en.mp4
--rw-rw---- 1 root sdcard_rw  8071197 2023-03-16 17:27 main_page_event.mp4
+-rw-rw---- 1 root sdcard_rw  7184295 2023-05-23 11:02 main_page_event.mp4
--rw-rw---- 1 root sdcard_rw  8071833 2023-03-16 17:26 main_page_event_en.mp4
+-rw-rw---- 1 root sdcard_rw  8679952 2022-09-28 02:41 main_page_event_alter.mp4
--rw-rw---- 1 root sdcard_rw      501 2023-03-28 13:49 script1.ev
+-rw-rw---- 1 root sdcard_rw  7185758 2023-05-23 11:02 main_page_event_en.mp4
--rw-rw---- 1 root sdcard_rw      295 2023-03-23 15:22 script2.ev
+-rw-rw---- 1 root sdcard_rw      503 2023-05-27 22:13 script1.ev
--rw-rw---- 1 root sdcard_rw        0 2023-04-08 00:49 sync_1.file
+-rw-rw---- 1 root sdcard_rw      295 2023-05-27 22:13 script2.ev
--rw-rw---- 1 root sdcard_rw   557065 2021-02-18 15:05 taobin_brewing.mov
+-rw-rw---- 1 root sdcard_rw        0 2023-05-05 20:18 sync_1.file
--rw-rw---- 1 root sdcard_rw   920095 2021-02-18 15:05 taobin_drink_ok.mov
 -rw-rw---- 1 root sdcard_rw  4806758 2022-06-13 18:43 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2022-06-13 18:43 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2022-06-13 18:43 taobin_save_world3.mp4
 -rw-rw---- 1 root sdcard_rw  2084830 2022-06-13 18:43 taobin_thank1.mp4
--rw-rw---- 1 root sdcard_rw  7539282 2023-03-16 10:25 taobin_thank1_event.mp4
+-rw-rw---- 1 root sdcard_rw  7120208 2023-05-23 11:03 taobin_thank1_event.mp4
+-rw-rw---- 1 root sdcard_rw  3999239 2022-09-27 02:04 taobin_thank1_event_alter.mp4
 -rw-rw---- 1 root sdcard_rw  1631940 2022-06-13 18:43 taobin_thank2.mp4

xml/menu_catalog_new.xml

@@ -84,15 +84,30 @@
     If CupOnArm = "true" Then
 
         If CheckCupStateDoorCupClose = "" Then
+            If buttonRemoveCup =  "Enable" Then
+
+            Else
+                Refresh
+            EndIf
+
             Var buttonRemoveCup = "Enable"
+
         EndIf
 
         If CheckCupStateDoorCupClose = "done" Then
+            If buttonRemoveCup =  "Enable" Then
+
+            Else
+                Refresh
+            EndIf
+            
             Var buttonRemoveCup = "Enable"
+       
         EndIf
     Else
         If buttonRemoveCup = "Enable" Then
             Var buttonRemoveCup = "Invisible"
+            Refresh
         EndIf
     EndIf
 

xml/menu_new_layout_gen_v2.py

@@ -1,9 +1,9 @@
   if "v2" in param:
-    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
+    def GenMenuProductCodeBlock( str_hot_product_code, str_cold_product_code, str_blend_product_code):
         print(" size " + str( len(spl)) + " img=" + spl[ idx_img][1] )
         out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n')  
         menu_img = spl[ idx_img][1]
-        out_xml( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code] + ' ' + spl[ idx_name][ idx_blend_product_code]+ ' \r\n')
+        out_xml( '\t; '+ str_hot_product_code + ' ' + str_cold_product_code + ' ' + str_blend_product_code+ ' \r\n')
         out_xml( '<Block>\r\n')
         out_xml('\t<MarginLeft> 33 </MarginLeft>\r\n')
         out_xml('\t<MarginTop> 22 </MarginTop>\r\n')
@@ -14,23 +14,23 @@
         #print("#########################################################################################################################")
         #print( str( spl))
         #print("#########################################################################################################################")
-        if spl[ idx_name][ idx_hot_product_code] != '-':
+        if str_hot_product_code != '-':
-          str_con += spl[ idx_name][ idx_hot_product_code] + '.Button,'
+          str_con += str_hot_product_code + '.Button,'
         
-        if spl[ idx_name][ idx_cold_product_code] != '-':
+        if str_cold_product_code != '-':
-          str_con += spl[ idx_name][ idx_cold_product_code] + '.Button,'
+          str_con += str_cold_product_code + '.Button,'
         
-        if spl[ idx_name][ idx_blend_product_code] != '-':
+        if str_blend_product_code != '-':
-          str_con += spl[ idx_name][ idx_blend_product_code] + '.Button,'
+          str_con += str_blend_product_code + '.Button,'
    
-        if spl[ idx_name][ idx_hot_product_code] != '-':
+        if str_hot_product_code != '-':
-          str_con_var += spl[ idx_name][ idx_hot_product_code] + '-'
+          str_con_var += str_hot_product_code + '-'
         
-        if spl[ idx_name][ idx_cold_product_code] != '-':
+        if str_cold_product_code != '-':
-          str_con_var += spl[ idx_name][ idx_cold_product_code] + '-'
+          str_con_var += str_cold_product_code + '-'
         
-        if spl[ idx_name][ idx_blend_product_code] != '-':
+        if str_blend_product_code != '-':
-          str_con_var += spl[ idx_name][ idx_blend_product_code] + '-'
+          str_con_var += str_blend_product_code + '-'
    
         str_con_var = str_con_var.replace("-", "")
         if touch_less_gen == True:
@@ -40,21 +40,21 @@
 
         out_xml( '\t<State> Flag( '+ str_con + ') </State> \r\n')
         
-        pd_code_1 = spl[ idx_name][ idx_hot_product_code]
+        pd_code_1 = str_hot_product_code
-        pd_stage1 = '$' + spl[ idx_name][ idx_hot_product_code] + '.Button'
+        pd_stage1 = '$' + str_hot_product_code + '.Button'
-        if spl[ idx_name][ idx_hot_product_code] == "-" or len(spl[ idx_name][ idx_hot_product_code]) == 0 :
+        if str_hot_product_code == "-" or len(str_hot_product_code) == 0 :
           pd_code_1 = pd_code_available
           pd_stage1 = '"Disable2"'
 
-        pd_code_2 = spl[ idx_name][ idx_cold_product_code]
+        pd_code_2 = str_cold_product_code
-        pd_stage2 = '$' + spl[ idx_name][ idx_cold_product_code] + '.Button'
+        pd_stage2 = '$' + str_cold_product_code + '.Button'
-        if spl[ idx_name][ idx_cold_product_code] == "-" or len(spl[ idx_name][ idx_cold_product_code]) == 0:
+        if str_cold_product_code == "-" or len(str_cold_product_code) == 0:
           pd_code_2 = pd_code_available
           pd_stage2 = '"Disable2"'
         
-        pd_code_3 = spl[ idx_name][ idx_blend_product_code]
+        pd_code_3 = str_blend_product_code
-        pd_stage3 = '$' + spl[ idx_name][ idx_blend_product_code] + '.Button'
+        pd_stage3 = '$' + str_blend_product_code + '.Button'
-        if spl[ idx_name][ idx_blend_product_code] == "-" or len(spl[ idx_name][ idx_blend_product_code]) == 0:
+        if str_blend_product_code == "-" or len(str_blend_product_code) == 0:
           pd_code_3 = pd_code_available
           pd_stage3 = '"Disable2"'
 
@@ -79,9 +79,9 @@
               
         out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
 
-        out_xml( '\t\tVar PriceD1 = $' + spl[ idx_name][ idx_hot_product_code] + '.Price\r\n')
+        out_xml( '\t\tVar PriceD1 = $' + str_hot_product_code + '.Price\r\n')
-        out_xml( '\t\tVar PriceD2 = $' + spl[ idx_name][ idx_cold_product_code] + '.Price\r\n')
+        out_xml( '\t\tVar PriceD2 = $' + str_cold_product_code + '.Price\r\n')
-        out_xml( '\t\tVar PriceD3 = $' + spl[ idx_name][ idx_blend_product_code] + '.Price\r\n')
+        out_xml( '\t\tVar PriceD3 = $' + str_blend_product_code + '.Price\r\n')
         
         out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
         out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
@@ -143,14 +143,14 @@
 
         out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
         #out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[ idx_name][ idx_cold_product_code] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ str_cold_product_code +'"\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 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[ idx_name][ idx_hot_product_code] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ str_hot_product_code +'"\r\n')
         out_xml( '\t\t\tElse\r\n')
         #out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
-        out_xml( '\t\t\tTopping "Load" "'+ spl[ idx_name][ idx_blend_product_code] +'"\r\n')
+        out_xml( '\t\t\tTopping "Load" "'+ str_blend_product_code +'"\r\n')
         out_xml( '\t\t\tEndIf\r\n')
         out_xml( '\t\tEndIf\r\n')
 
@@ -241,12 +241,12 @@
         out_xml( '\t</Image>\r\n')
 
         ice_tab_hot_show = True
-        shw = "$" + spl[ idx_name][ idx_hot_product_code] + ".Button"
+        shw = "$" + str_hot_product_code + ".Button"
-        if spl[ idx_name][ idx_hot_product_code] == "-" :
+        if str_hot_product_code == "-" :
           shw = '"Invisible"'
           ice_tab_hot_show = False
 
-        if len(spl[ idx_name][ idx_hot_product_code]) == 0 :
+        if len(str_hot_product_code) == 0 :
           shw = '"Invisible"'
           ice_tab_hot_show = False
 
@@ -276,19 +276,19 @@
           if "free" in param:
             out_xml( '\t<Value> "Free" </Value>\r\n')
           else:
-            out_xml( '\t<Value> StringFmt(  $' + spl[ idx_name][ idx_hot_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+            out_xml( '\t<Value> StringFmt(  $' + str_hot_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
         else:
-          out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_name][ idx_hot_product_code] + '.Price ) </Value>\r\n')
+          out_xml( '\t<Value> Var( "฿" + $' + str_hot_product_code + '.Price ) </Value>\r\n')
         out_xml( '\t</Text>\r\n')
         
         ice_tab_ice_show = True
 
-        shw = "$" + spl[ idx_name][ idx_cold_product_code] + ".Button"
+        shw = "$" + str_cold_product_code + ".Button"
-        if spl[ idx_name][ idx_cold_product_code] == "-" :
+        if str_cold_product_code == "-" :
           shw = '"Invisible"'
           ice_tab_ice_show = False
 
-        if len(spl[ idx_name][ idx_cold_product_code]) == 0 :
+        if len(str_cold_product_code) == 0 :
           shw = '"Invisible"'
           ice_tab_ice_show = False
 
@@ -313,19 +313,19 @@
           if "free" in param:
             out_xml( '\t<Value> "Free" </Value>\r\n')
           else:
-            out_xml( '\t<Value> StringFmt( $' + spl[ idx_name][ idx_cold_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+            out_xml( '\t<Value> StringFmt( $' + str_cold_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
         else:
-          out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_name][ idx_cold_product_code] + '.Price ) </Value>\r\n')
+          out_xml( '\t<Value> Var( "฿" + $' + str_cold_product_code + '.Price ) </Value>\r\n')
         out_xml( '\t</Text>\r\n')
     
         ice_tab_blend_show = True
 
-        shw = "$" + spl[ idx_name][ idx_blend_product_code] + ".Button"
+        shw = "$" + str_blend_product_code + ".Button"
-        if spl[ idx_name][ idx_blend_product_code] == "-" :
+        if str_blend_product_code == "-" :
           shw = '"Invisible"'
           ice_tab_blend_show = False
 
-        if len(spl[ idx_name][ idx_blend_product_code]) == 0 :
+        if len(str_blend_product_code) == 0 :
           shw = '"Invisible"'
           ice_tab_blend_show = False
 
@@ -352,9 +352,9 @@
           if "free" in param:
             out_xml( '\t<Value> "Free" </Value>\r\n')
           else:
-            out_xml( '\t<Value> StringFmt(  $' + spl[ idx_name][ idx_blend_product_code] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
+            out_xml( '\t<Value> StringFmt(  $' + str_blend_product_code + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
         else:
-          out_xml( '\t<Value> Var( "฿" + $' + spl[ idx_name][ idx_blend_product_code] + '.Price ) </Value>\r\n')
+          out_xml( '\t<Value> Var( "฿" + $' + str_blend_product_code + '.Price ) </Value>\r\n')
         out_xml( '\t</Text>\r\n')
         
         out_xml( '\t<Image>\r\n')
@@ -447,6 +447,10 @@
 
         out_xml( '</Block>\r\n')
     
+    def GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
+        GenMenuProductCodeBlock( spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )
+        
+
     idx_lang_malay = 5
     idx_lang_japan = 4
     idx_lang_china = 3
@@ -555,16 +559,33 @@
         #product_code = s
         #if spl[ idx_of_eng] == "IGNORE":
         #  continue
+        print( '\t; '+ spl[ idx_name][ idx_hot_product_code] + ' ' + spl[ idx_name][ idx_cold_product_code]  + ' ' + spl[ idx_name][ idx_blend_product_code]  + ' \r\n')
         
+        if "," in spl[ idx_name][ idx_hot_product_code] and  "," in spl[ idx_name][ idx_cold_product_code] and "," in spl[ idx_name][ idx_blend_product_code]:
+            #print(" hot = " + spl[ idx_name][ idx_hot_product_code])
+            hot_pd = spl[ idx_name][ idx_hot_product_code].split(',')
+            cold_pd = spl[ idx_name][ idx_cold_product_code].split(',')
+            blend_pd = spl[ idx_name][ idx_blend_product_code].split(',')
+
+            #print(' size = ' + str( len( hot_pd)) + ' size = ' + str( len( cold_pd)) + ' size = ' + str( len( blend_pd))  + '\r\n')
+            list_size = len( hot_pd)
+            for idx in range( list_size):
+              print(' hot = ' + hot_pd[ idx] + ' cold = ' + cold_pd[ idx]+ ' blend_pd = ' +  blend_pd[ idx] + '\r\n')
+              if hot_pd[ idx] == '-' and  cold_pd[ idx] == '-' and  blend_pd[ idx] == '-':
+                  print("\t\t==> ignore ")
+              else:
+                  print("\t\t==> gen ")
+                  GenMenuProductCodeBlock( hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
+        else:
             GenMenuBlock( idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
             #out_xml( '\t; parallel '+ spl[ idx_name][ idx_hot_product_code2] + ' ' + spl[ idx_name][ idx_cold_product_code2] + ' ' + spl[ idx_name][ idx_blend_product_code2] + ' \r\n')
             #print("++++++++++++++++++++++++++++++ " + str( count_test) )
             #count_test = count_test + 1
             #if count_test > 5 :
             #  break
+            if len( spl[idx_name] ) >= 11:
                 if spl[ idx_name][ idx_hot_product_code2] != "-" or spl[ idx_name][ idx_cold_product_code2] != "-" or spl[ idx_name][ idx_blend_product_code2] != "-":
                   GenMenuBlock( idx_hot_product_code2, idx_cold_product_code2, idx_blend_product_code2)
-          out_xml( '; hurr\r\n')
 
     out_xml('</FrameScroll>\r\n')
 

xml/page_brewing3.xml

@@ -325,10 +325,11 @@
 
 	; copy stage
 	Var bg_lidProblem_ST2 = bg_lidProblem_ST
+	DEBUGVAR bg_lidProblem_ST2
 	
 	; zone Language
 	If LanguageObjectShow = "Enable" Then
-		Var XStraw = 300
+		Var XStraw = 350
 		Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 
@@ -338,10 +339,13 @@
 		Var GetLidButtonState = "Invisible"
 		Var bg_strawProblem_ST = "Invisible"
 		var EnableGetMoreStrawFileName = "Invisible"
+		var EnableGetMoreStrawFileName2 = "Enable"
+
 		Var bg_strawProblem_ST2 = "Invisible"
 		If bg_lidProblem_ST2 = "Invisible" Then 
 			Var GetLidButtonState2 = "Enable"
-			
+		Else
+			Var GetLidButtonState2 = "Invisible"
 		EndIf
 
 	EndIf
@@ -1318,6 +1322,8 @@
 		EndIf
 
 	EndIf
+	DEBUGVAR bg_lidProblem_ST2
+	
 
 	If GetLidButtonCountDown > 0 Then
 		Var GetLidButtonCountDown = GetLidButtonCountDown - 1
@@ -1340,7 +1346,7 @@
 		If GetLidButtonCountDown = 1 Then
 			Var GetLidButtonState2 = "Invisible"
 			Var bg_lidProblem_ST2 = "Enable"
-			Var XStraw = 370
+			Var XStraw = 365
 
 		EndIf
 	EndIf

xml/page_catalog.lxml

@@ -263,6 +263,7 @@
 
 	If countDownRetrun = 0 Then
 		 If  Seeker = "next" Then 
+		 	RootLayoutVisible 3 "hide"
             Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
         Else
             Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -345,6 +346,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	If  Seeker = "next" Then 
+		RootLayoutVisible 3 "hide"
         Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"

xml/topview2.xml

@@ -51,7 +51,7 @@
 <X> 1 </X>
 <Y> 1 </Y>
 <Font> KanitTTF </Font>
-<Size> 20 </Size>
+<Size> 12 </Size>
 <Width> 1080 </Width>
 <Color> 0xFF0000 </Color>
 <Value>  XMLPageVersion</Value>