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

2023-12-19 09:45:06 +07:00 · 2023-12-19 09:45:06 +07:00 · a93be87eff
commit a93be87eff
parent 68adc98494 05ed0123d8
24 changed files with 1168 additions and 707 deletions
--- a/inter/mys/animation01/play_list.tsv
+++ b/inter/mys/animation01/play_list.tsv
--- a/xml/menutab/menu_catalog_new.xml
+++ b/xml/menutab/menu_catalog_new.xml
@ -23,6 +23,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_appfast.xml
+++ b/xml/menutab/page_catalog_group_appfast.xml
@ -187,6 +187,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_cocktail.xml
+++ b/xml/menutab/page_catalog_group_cocktail.xml
@ -179,6 +179,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_coffee.xml
+++ b/xml/menutab/page_catalog_group_coffee.xml
@ -179,6 +179,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_forkid.xml
+++ b/xml/menutab/page_catalog_group_forkid.xml
@ -188,6 +188,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_health.xml
+++ b/xml/menutab/page_catalog_group_health.xml
@ -179,6 +179,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_milk.xml
+++ b/xml/menutab/page_catalog_group_milk.xml
@ -177,6 +177,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_oreo.xml
+++ b/xml/menutab/page_catalog_group_oreo.xml
@ -175,6 +175,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_other.xml
+++ b/xml/menutab/page_catalog_group_other.xml
@ -178,6 +178,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_pepsi_pro.xml
+++ b/xml/menutab/page_catalog_group_pepsi_pro.xml
@ -175,6 +175,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_pro_15THB.xml
+++ b/xml/menutab/page_catalog_group_pro_15THB.xml
@ -197,6 +197,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_pro_melon.xml
+++ b/xml/menutab/page_catalog_group_pro_melon.xml
@ -173,6 +173,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_pro_mymint.xml
+++ b/xml/menutab/page_catalog_group_pro_mymint.xml
@ -176,6 +176,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_pro_pepween.xml
+++ b/xml/menutab/page_catalog_group_pro_pepween.xml
@ -204,6 +204,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_recommend.xml
+++ b/xml/menutab/page_catalog_group_recommend.xml
@ -196,6 +196,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_soft_serve.xml
+++ b/xml/menutab/page_catalog_group_soft_serve.xml
@ -175,6 +175,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_songkran.xml
+++ b/xml/menutab/page_catalog_group_songkran.xml
@ -175,6 +175,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_tea.xml
+++ b/xml/menutab/page_catalog_group_tea.xml
@ -179,6 +179,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_group_whey.xml
+++ b/xml/menutab/page_catalog_group_whey.xml
@ -184,6 +184,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/menutab/page_catalog_momday.xml
+++ b/xml/menutab/page_catalog_momday.xml
@ -175,6 +175,28 @@
    EndIf


+    If RoutineSlientRefresh > 0 Then
+        If RoutineSlientRefresh = 2 Then
+            InstanceGetString SaveStringInst
+            
+            DEBUGVAR show_eng
+            DEBUGVAR SaveStringInst
+
+            If SaveStringInst = "RefreshNow" Then
+                GetXMLFileNameCurrentRunning CurrentOpenFile
+                Open CurrentOpenFile
+
+                If show_eng = "true" Then 
+                    InstanceSetString "ShowEng"
+                Else
+                    InstanceSetString "ShowThai"
+                EndIf
+           
+            EndIf
+        EndIf
+    EndIf
+
+


    TimerReset
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1249,6 +1249,9 @@

 				Var OpenFromPageBoard = 1

+				Var RoutineSlientRefresh = 6
+
+
 				If InternationalEnable = 1 Then

 					; show language icon
@ -1287,7 +1290,7 @@
 		DEBUGVAR CountUpReloadAll
 		
 		; Original value is 40
-		If CountUpReloadAll > 80 Then
+		If CountUpReloadAll > 100 Then
 			Var NeedReboot = "false"

 			Var StartUpExt = "-"
@ -1627,6 +1630,8 @@
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"


+	Var RoutineSlientRefresh = 8
+
 	Var OpenFromPageBoard = 1

 	If InternationalEnable = 1 Then
--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@ -43,6 +43,16 @@
 	IF Not#CountDownForMulti = "" Then
 		Var Not#CountDownForMulti = 99
 	EndIf
+
+	If EnableMultiInstance = "true" Then
+		Var OpenRedirectSize = -1
+		GetRedirectCount OpenRedirectSize
+		If OpenRedirectSize = 0 Then
+			SAVELOG "OpenRedirectSize zero size"
+			Var Not#CountDownForMulti = 5
+		EndIf
+
+	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@ -110,6 +120,8 @@
 				Var Not#CountDownForMulti = Not#CountDownForMulti - 1
 			EndIf
 		EndIf
+
+
 	EndIf


@ -132,6 +144,10 @@
    	EndIf
    EndIf

+    If RoutineSlientRefresh > 0 Then
+		Var RoutineSlientRefresh = RoutineSlientRefresh - 1
+	EndIf
+
 	TimerReset

 </EventTimeout>
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "7.98"
-	Var XMLPageVersionInt = 798
+	Var XMLPageVersion = "7.99"
+	Var XMLPageVersionInt = 799
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>