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

2025-07-17 11:20:46 +07:00 · 2025-07-17 11:20:46 +07:00 · ae8ac858a1
commit ae8ac858a1
parent 61c89f9fcf 6fc0940036
38 changed files with 156773 additions and 143995 deletions
--- a/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png
+++ b/inter/mys/image/page_e_receipt/img_popup_eReceiptPrompt_result.png
--- a/inter/mys/xml/e_receipt/page_show_e_receipt.lxml
+++ b/inter/mys/xml/e_receipt/page_show_e_receipt.lxml
@ -15,6 +15,7 @@
    Var ProductDesc = ""

    Var Timeout = 0
+    Var TimeoutAfterShowQR = 0
    Var service = "eInvoice.mys"

    Var EReceiptQR = ""
@ -82,9 +83,13 @@

 <Timeout> 1000 </Timeout>
 <EventTimeout>
-
+DEBUGVAR TimeoutAfterShowQR
 DEBUGVAR VendingTSID
-Var Seeker.VendingTSID = VendingTSID
+If VendingTSID = "" Then
+
+Else
+    Var Seeker.VendingTSID = VendingTSID
+EndIf
 DEBUGVAR Seeker.VendingTSID

 DEBUGVAR LOADING_STATE
@ -93,31 +98,43 @@ DEBUGVAR QR_STATE
 DEBUGVAR Seeker.e_receipt


-Var Timeout = Timeout + 1
+If Seeker.VendingTSID = "" Then
+    Var Timeout = Timeout + 1
+Else
+    If TimeoutAfterShowQR = 0 Then
+        Var LOADING_STATE = "Invisible"
+        SAVELOG "TSID should be ready!"
+        TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev"
+        Var TimeoutAfterShowQR = 1
+        Refresh
+    EndIf
+EndIf

-If Timeout = 5 Then
-    Var LOADING_STATE = "Invisible"
-    SAVELOG "TSID should be ready!"
-    TRY "ROOT/taobin_project/inter/mys/xml/process/e_receipt.ev"
+If Seeker.VendingTSID = "" Then
+    Var QR_STATE = "Invisible"
+    Refresh
+Else
+    If TimeoutAfterShowQR > 2 Then
+        Var QR_STATE = "Enable"
+    EndIf
+    If TimeoutAfterShowQR > 0 Then
+        Var TimeoutAfterShowQR = TimeoutAfterShowQR + 1
+    EndIf
    Refresh
 EndIf

-If Timeout > 5 Then
+If Timeout > 25 Then

-    Var QR_STATE = "Enable"
-    Refresh
-EndIf
-
-If Timeout > 15 Then
+    SAVELOG "Timeout after waiting .."

    Open "ROOT/taobin_project/xml/page_drinkok.xml"

 EndIf

-
-
-
-
+If TimeoutAfterShowQR > 25 Then
+    SAVELOG "Timeout QR OK"
+    Open "ROOT/taobin_project/xml/page_drinkok.xml"
+EndIf

 Refresh
 TimerReset
@ -143,10 +160,10 @@ TimerReset

 ; need-change-position
 <QRCode>
-<X> 415 </X>
-<Y> 875 </Y>
-<Width> 250 </Width>
-<Height> 250 </Height>
+<X> 350 </X>
+<Y> 845 </Y>
+<Width> 360 </Width>
+<Height> 360 </Height>
 <State> QR_STATE </State>
 <Service> service </Service>
 </QRCode>
@ -155,7 +172,7 @@ TimerReset

 <Image>
 <X> 175 </X>
-<Y> 1200 </Y>
+<Y> 1230 </Y>
 <Height> 300 </Height>
 <Width> 320 </Width>
 <Filename> Seeker.PictureDrink </Filename>
--- a/inter/sgp/animation01/play_list.tsv
+++ b/inter/sgp/animation01/play_list.tsv
@ -885,3 +885,9 @@ PEPSI Max BANANA	52-05-02-0077	1	14	56	23	13					24	120	14:00	23
 PEPSI Max YUZU	52-05-02-0076	1	14	53	23	13					24	120	4:00	23
 PEPSI MINT	52-05-02-0068	1	14	59	12	23					24	120	15:00	23
 Almost Dirty	52-21-02-0071	1	2	3	4	5	6	7			24	66	6:06	32
+ICED  SANTA GINGER	12-03-02-0081	1	7	22	23						24	49	10:01	23
+ICED  SANTA GINGER	12-23-02-0081	1	7	22	23						24	49	10:01	23
+CHOCO SNOWFLAKE SMOOTHIE	12-03-03-0088	1	15	7	22	40	41				24	49	10:01	23
+REINDEER PEPPERMINT SMOOTHIE	12-03-03-0089	1	59	7	19	41					24	49	10:01	23
+ICED CHRISTMAS CAFE LATTE	12-01-02-0084	1	6	7	12	22	23				24	49	10:01	23
+ICED CHRISTMAS CAFE LATTE	12-21-02-0084	1	6	7	12	22	23				24	49	10:01	23
--- a/inter/sgp/xml/menu_catalog_new.lxml
+++ b/inter/sgp/xml/menu_catalog_new.lxml
@ -22,6 +22,8 @@
        Var ice_tab_process_show = "Invisible"
    EndIf

+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+

    If NextPage = "-" Then

--- a/inter/sgp/xml/menu_new_layout_gen_v2.py
+++ b/inter/sgp/xml/menu_new_layout_gen_v2.py
@ -850,6 +850,8 @@
        })

    def GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code):
+        if "skip_blend" in param:
+            spl[ idx_name][ idx_blend_product_code] = "-"
        GenMenuProductCodeBlock(spl, spl[ idx_name][ idx_hot_product_code], spl[ idx_name][ idx_cold_product_code] , spl[ idx_name][ idx_blend_product_code] )


@ -1027,6 +1029,8 @@
                    print("\t\t==> ignore ")
                else:
                    print("\t\t==> gen ")
+                    if "skip_blend" in param:
+                        blend_pd[ idx] = "-"
                    GenMenuProductCodeBlock(spl, hot_pd[ idx], cold_pd[ idx], blend_pd[ idx] )
          else:
              GenMenuBlock(spl, idx_hot_product_code, idx_cold_product_code, idx_blend_product_code)
@ -1092,6 +1096,8 @@
    out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
    out_xml('</EventClick>\r\n')
    out_xml('</Button>\r\n')
+
+    out_xml(';include="ROOT/taobin_project/inc/button_remove_cup.inc"\r\n')
  # if "v2" in param:


--- a/inter/sgp/xml/page_catalog_group_appfast.lxml
+++ b/inter/sgp/xml/page_catalog_group_appfast.lxml
@ -219,6 +219,8 @@
        Var ice_tab_process_show = "Invisible"
    EndIf

+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+

    If NextPage = "-" Then

@ -2089,6 +2091,7 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/sgp/xml/page_catalog_group_coffee.lxml
+++ b/inter/sgp/xml/page_catalog_group_coffee.lxml
--- a/inter/sgp/xml/page_catalog_group_forkid.lxml
+++ b/inter/sgp/xml/page_catalog_group_forkid.lxml
--- a/inter/sgp/xml/page_catalog_group_health.lxml
+++ b/inter/sgp/xml/page_catalog_group_health.lxml
@ -211,6 +211,8 @@
        Var ice_tab_process_show = "Invisible"
    EndIf

+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+

    If NextPage = "-" Then

@ -8190,6 +8192,7 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/sgp/xml/page_catalog_group_milk.lxml
+++ b/inter/sgp/xml/page_catalog_group_milk.lxml
--- a/inter/sgp/xml/page_catalog_group_other.lxml
+++ b/inter/sgp/xml/page_catalog_group_other.lxml
--- a/inter/sgp/xml/page_catalog_group_recommend.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend.lxml
--- a/inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
+++ b/inter/sgp/xml/page_catalog_group_recommend_multi_pro.lxml
--- a/inter/sgp/xml/page_catalog_group_tea.lxml
+++ b/inter/sgp/xml/page_catalog_group_tea.lxml
--- a/inter/sgp/xml/page_catalog_group_whey.lxml
+++ b/inter/sgp/xml/page_catalog_group_whey.lxml
@ -216,6 +216,8 @@
        Var ice_tab_process_show = "Invisible"
    EndIf

+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+

    If NextPage = "-" Then

@ -5465,6 +5467,7 @@
 	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
 </EventClick>
 </Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"



--- a/inter/whatthecup/sgp/xml/page_catalog.lxml
+++ b/inter/whatthecup/sgp/xml/page_catalog.lxml
@ -229,23 +229,7 @@
        EndIf
 	EndIf

-
-
-	; zone cup on arm
-    If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"


 	Refresh
@ -711,6 +695,8 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>

+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
 ; Cart
 <Button>
 <X> 915 </X>
@ -801,5 +787,6 @@
    DEBUGVAR buttonRemoveCup
 </EventUnitTest3>

+;include="ROOT/inc/remove_cup_tag_on_arm.inc"

 </Popup>
--- a/xml/page_NewBrewing3.xml
+++ b/xml/page_NewBrewing3.xml
@ -852,7 +852,8 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+		;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
 	EndIf

 	If BREW_CNT = 0 Then
--- a/xml/page_NewBrewing3Conti.xml
+++ b/xml/page_NewBrewing3Conti.xml
@ -309,7 +309,8 @@

 	Var ShowCountDownBrewing = CountDownBrewing
 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+		;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
 	EndIf

 	If CountDownBrewing = 0 Then
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@ -932,7 +932,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
+	    ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
 	EndIf

 	DEBUGVAR EnableDoubleCupNoError
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@ -397,8 +397,8 @@


 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
-	    LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
 	EndIf


--- a/xml/page_collect_point_1-2.xml
+++ b/xml/page_collect_point_1-2.xml
@ -50,7 +50,7 @@
 	DEBUGVAR Timeout

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf

 	Var Timeout = Timeout + 1
--- a/xml/page_collect_point_1-3.xml
+++ b/xml/page_collect_point_1-3.xml
@ -154,7 +154,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf

 	StrLen TelephoneNumber TelNumLen
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@ -243,7 +243,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf


--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@ -77,7 +77,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf


--- a/xml/page_collect_point_3.xml
+++ b/xml/page_collect_point_3.xml
@ -975,7 +975,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf


--- a/xml/page_collect_point_3_28.xml
+++ b/xml/page_collect_point_3_28.xml
@ -959,7 +959,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf


--- a/xml/page_collect_point_3_28_lucky_draw_campaign.xml
+++ b/xml/page_collect_point_3_28_lucky_draw_campaign.xml
@ -1058,7 +1058,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf


--- a/xml/page_display_get_free.xml
+++ b/xml/page_display_get_free.xml
@ -95,7 +95,7 @@
 	Var ShowCountDownBrewing = CountDownBrewing

 	If FrontDoorVersionInt > 19999 Then
-	    TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	    ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
 	EndIf

 	Var Timeout = Timeout + 1
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -331,7 +331,7 @@
 	EndIf

 	If FrontDoorVersionInt > 19999 Then
-	    LEDv4Playlist "reset" "-" "-"
+	    ;LEDv4Playlist "reset" "-" "-"
 		TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev"
 	EndIf

--- a/xml/page_test_color.xml
+++ b/xml/page_test_color.xml
@ -35,6 +35,13 @@
    Var bn_off = TestColorImageDir + "bn_off.png"
    Var bp_off = TestColorImageDir + "bp_off.png"

+    Var bn_10s = TestColorImageDir + "bn_10s.png"
+    Var bp_10s = TestColorImageDir + "bp_10s.png"
+    Var bn_20s = TestColorImageDir + "bn_20s.png"
+    Var bp_20s = TestColorImageDir + "bp_20s.png"
+    Var bn_60s = TestColorImageDir + "bn_60s.png"
+    Var bp_60s = TestColorImageDir + "bp_60s.png"
+
    Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png"
    Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png"

@ -181,7 +188,7 @@
    Var LEDv4Toggle[41] = "Enable"
    Var LEDv4Toggle[42] = "Enable"

-
+    Var PlayTestLEDv4 = "false"

 </EventOpen>

@ -189,7 +196,36 @@
 <EventTimeout>
    Var Timeout = Timeout + 1

-    If Timeout > 60 Then
+    DEBUGVAR CountDownBrewing
+    DEBUGVAR LEDv4PlaylistStatus
+    DEBUGVAR PlayTestLEDv4
+    DEBUGVAR LEDv4CountDownValue
+
+    DEBUGVAR GEN4_POS
+
+
+    If CountDownBrewing > 0 Then
+        Var CountDownBrewing = CountDownBrewing - 1
+    Else
+        If PlayTestLEDv4 = "true" Then
+            LEDv4Playlist "reset" "-" "-"
+        EndIf
+        Var PlayTestLEDv4 = "false"
+    EndIf
+
+    If PlayTestLEDv4 = "true" Then
+        ; check-playlist-state
+        If LEDv4PlaylistStatus = "Ready" Then
+            LEDv4Playlist "play" "-" "-"
+        EndIf
+
+        If LEDv4PlaylistStatus = "Running" Then
+            ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
+        EndIf
+
+    EndIf
+
+    If Timeout > 120 Then
        Open "ROOT/taobin_project/xml/vending_info.xml"
    EndIf

@ -2241,4 +2277,26 @@ Var Timeout = 0
 </EventClick>
 </Button>

+
+<Button>
+<X> LEDv4HorizontalX1 </X>
+<Y> 700 </Y>
+<Filename> bn_10s </Filename>
+<FilenamePress> bp_10s </FilenamePress>
+<EventClick>
+
+    LEDv2 LedV4Top Off 0 0 0 1 0
+    LEDv2 LedV4Mid Off 0 0 0 1 0
+
+
+    Var CountDownBrewing = 10
+    Var Timeout = 0
+    LEDv4Playlist "new" "XX-XX-XX-TEST" CountDownBrewing
+
+    Var PlayTestLEDv4 = "true"
+    SAVELOG "TestLEDAnime60s"
+
+</EventClick>
+</Button>
+
 </Page>
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -221,7 +221,7 @@

 	Var CountDownBrewing = BREW_CNT

-	TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"

 	Var TimeoutThankyou = TimeoutThankyou + 1
 	If TimeoutThankyou = TimeoutToNext Then
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -17,7 +17,7 @@
 	SAVELOG BrewTime
 	Var ShowCountDownBrewing = CountDownBrewing

-	TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"

 	Var Timeout = 0
 	Var ChangeFlag = 0
@ -348,7 +348,7 @@

 		Var ShowCountDownBrewing = CountDownBrewing

-		TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+		;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"

 		Var MachineState_Result = 0

@ -416,7 +416,7 @@

 	Var ShowCountDownBrewing = CountDownBrewing

-	TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+	;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"


 	;include=ROOT/taobin_project/inc/remove_cup_step.inc
--- a/xml/page_thankyouMore.xml
+++ b/xml/page_thankyouMore.xml
@ -135,7 +135,7 @@
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing

-		TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
+		;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"

 		Open "ROOT/taobin_project/xml/page_brewing3Multi.xml"

--- a/xml/process/ledv4_process.ev
+++ b/xml/process/ledv4_process.ev
@ -2,7 +2,7 @@ DEBUGVAR FrontDoorVersionInt
 If FrontDoorVersionInt > 19999 Then
    DEBUGVAR StartLEDBrewingAnimation
    If StartLEDBrewingAnimation = 0 Then
-        LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing
+        ;LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing
        Var StartLEDBrewingAnimation = 1
    EndIf

@ -17,7 +17,7 @@ If FrontDoorVersionInt > 19999 Then
        Else
            ;
 				If LEDv4PlaylistStatus = "Running" Then
-
+                    ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
 				Else
                	LEDv4Playlist "pause" "processEv" "_notReady"
 				EndIf
--- a/xml/process/temp_ledv4_page_thankyou.ev
+++ b/xml/process/temp_ledv4_page_thankyou.ev
@ -9,5 +9,4 @@ If FrontDoorVersionInt > 19999 Then

    SAVELOG "LEDv4.PageThankYou"

-    Var
 EndIf
--- a/xmlprofile/main.json
+++ b/xmlprofile/main.json
@ -28,5 +28,10 @@
    "enable": true,
    "except": [],
    "modifiers": []
+  },
+  "y18IDCardExSodaTeaMilk": {
+    "enable": true,
+    "except": [],
+    "modifiers": []
  }
 }
--- a/xmlprofile/y18IDCardExSodaTeaMilk.json
+++ b/xmlprofile/y18IDCardExSodaTeaMilk.json
--- a/xmlprofile/y18IDCardExTeaMilk.json
+++ b/xmlprofile/y18IDCardExTeaMilk.json
@ -1547,7 +1547,7 @@
    },
    {
      "productCode": "12-05-03-0034",
-      "enable": false
+      "enable": true
    },
    {
      "productCode": "12-05-03-0035",