From 8460b7941cd8403b8d2229842aa97ad14ee6cd6c Mon Sep 17 00:00:00 2001 From: Pakin Date: Fri, 17 Nov 2023 08:41:15 +0700 Subject: [PATCH] add apply by server mode --- xml/page_board.xml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/xml/page_board.xml b/xml/page_board.xml index 0bf1eda8..9ca8a219 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -922,17 +922,30 @@ EndIf ; Debug - Var XMLProfile = XMLProfile + "-EnableXMLProfile" + ; Var XMLProfile = XMLProfile + "-EnableXMLProfile" ; Init read if XMLProfile contains this mode ; - STRCONTAIN "EnableXMLProfile" XMLProfile EnableJsonProfileMode + ; STRCONTAIN "EnableXMLProfile" XMLProfile EnableJsonProfileMode If EnableJsonProfileMode = "true" Then + Var IsServerProfileApplyMode = "" + + ; get local enabled profiles ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson" DEBUGVAR XMLProfileFromJson + ; finalize applied profiles + ; apply profiles by diff server profile to local + ; insert "Ignore" if don't want to compare to server + CompareJsonProfileToServerProfile + ; XMLProfile must contain at least 1 profile to make this `IsServerProfileApplyMode` to not be "Ignore" + DEBUGVAR IsServerProfileApplyMode + ; If server does not has profile, this will apply all of the local enabled profiles. + ApplyServerProfile "XMLProfileFromJson" IsServerProfileApplyMode + + ; final profile STRCONTAIN "y18IDCardLive" XMLProfileFromJson Y18IDCARDLIVE_ENABLE STRCONTAIN "y18IDCard" XMLProfileFromJson Y18IDCARD_ENABLE @@ -1411,8 +1424,21 @@ Var web_app_prepar = "true" - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + ; Handle penetrator + + If EnableJsonProfileMode = "true" Then + If Only18 = "true" Then + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "ROOT/taobin_project/xml/page_identity18_verification.xml" + Else + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + Else + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml" + EndIf + TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"