diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv
index deec47ee..7aa47daa 100644
--- a/inter/tha/menu/lang.tsv
+++ b/inter/tha/menu/lang.tsv
@@ -1202,7 +1202,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
-1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
+1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
@@ -1215,7 +1215,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
-1300019 1. Select grind sizes 1. เลือกขนาดบด
+1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
diff --git a/inter/tha/xml/multi/ForProGroup.inc b/inter/tha/xml/multi/ForProGroup.inc
index 6d625750..3d401a5c 100644
--- a/inter/tha/xml/multi/ForProGroup.inc
+++ b/inter/tha/xml/multi/ForProGroup.inc
@@ -4,7 +4,7 @@
GetVisible inst_show_exclude_group
If inst_show_exclude_group_counter = "" Then
- Var inst_show_exclude_group_counter = 10
+ Var inst_show_exclude_group_counter = 15
EndIf
@@ -15,7 +15,7 @@
If inst_show_exclude_group_counter = 0 Then
RefreshAll
- Var inst_show_exclude_group_counter = 4
+ Var inst_show_exclude_group_counter = 15
EndIf
EndIf
EndIf
diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml
index efc5089f..89174b12 100644
--- a/inter/tha/xml/multi/tab_menu.lxml
+++ b/inter/tha/xml/multi/tab_menu.lxml
@@ -33,6 +33,8 @@
DEBUGVAR DirImageAlter
+ DEBUGVAR Menu1Selected
+
If SpiralOnline = "true" Then
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
diff --git a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
index 7dc95844..b1127b9a 100644
--- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
@@ -7,28 +7,47 @@
; "0xeae6e1"
SoundVolume
- ; On open
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ; soda and other
+
+ Var Menu1Selected = "PressForever"
+
Var Timeout = 0
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+ SetInstanceIgnoreTouch
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
- SetInstanceIgnoreTouch
+
+
+ OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+ RootLayoutVisible 13 "show"
+
+ DEBUGVAR SlientRefreshIndex
+
+
+
+
+
+
+
+
1000
- ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc_disable"
TimerReset
-;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
diff --git a/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
index 290a1fa8..536fab97 100644
--- a/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
+++ b/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev
@@ -1,6 +1,5 @@
-
Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"
Var MatchaEveryDayProState = "Invisible"
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
index f9469a89..44fdadef 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
@@ -7,22 +7,58 @@
; "0xeae6e1"
SoundVolume
- ; On open
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
+
+
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ; soda and other
+ Var Menu62Selected = "PressForever"
+
+ RootLayoutVisible 12 "show"
Var Timeout = 0
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+ SetInstanceIgnoreTouch
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
- SetInstanceIgnoreTouch
-
+
+ Var OtherOtherRefreshTimeOut = 14
+
+ DEBUGVAR SlientRefreshIndex
+
+
+ RefreshAll
+
+
1000
- ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+ GetVisible inst_show_exclude_group
+
+ If inst_show_exclude_group_counter = "" Then
+ Var inst_show_exclude_group_counter = 15
+ EndIf
+
+
+ If inst_show_exclude_group = 1 Then
+ If inst_show_exclude_group_counter > 0 Then
+
+ Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
+
+ If inst_show_exclude_group_counter = 0 Then
+ RefreshAll
+ Var inst_show_exclude_group_counter = 15
+ EndIf
+ EndIf
+ EndIf
+
TimerReset
diff --git a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
index 6c9249bd..bd77ec9b 100644
--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
@@ -9,22 +9,58 @@
; "0xeae6e1"
SoundVolume
- ; On open
- ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+
+
+
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+ ; soda and other
+ Var Menu62Selected = "PressForever"
+
+ RootLayoutVisible 12 "show"
Var Timeout = 0
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+ SetInstanceIgnoreTouch
;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
- SetInstanceIgnoreTouch
-
+
+ Var OtherOtherRefreshTimeOut = 14
+
+ DEBUGVAR SlientRefreshIndex
+
+
+ RefreshAll
+
+
1000
- ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+ ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+ GetVisible inst_show_exclude_group
+
+ If inst_show_exclude_group_counter = "" Then
+ Var inst_show_exclude_group_counter = 15
+ EndIf
+
+
+ If inst_show_exclude_group = 1 Then
+ If inst_show_exclude_group_counter > 0 Then
+
+ Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
+
+ If inst_show_exclude_group_counter = 0 Then
+ RefreshAll
+ Var inst_show_exclude_group_counter = 15
+ EndIf
+ EndIf
+ EndIf
+
TimerReset
diff --git a/ui/lang.tsv b/ui/lang.tsv
index deec47ee..7aa47daa 100644
--- a/ui/lang.tsv
+++ b/ui/lang.tsv
@@ -1202,7 +1202,7 @@
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
-1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
+1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
@@ -1215,7 +1215,7 @@
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
-1300019 1. Select grind sizes 1. เลือกขนาดบด
+1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด
diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev
index 1b1d66a8..8491303d 100644
--- a/xml/event/script_common_for_open_promotion_xml.ev
+++ b/xml/event/script_common_for_open_promotion_xml.ev
@@ -74,6 +74,7 @@ Else
EndIf
If CatalogLayoutV3 = 1 Then
+ SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3"
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev"
EndIf
diff --git a/xml/page_board.xml b/xml/page_board.xml
index e529a76d..b72f5a70 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -1985,7 +1985,7 @@ PRICE "Reset" "-"
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon"
- TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev"
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
Else
; show language icon
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"