Skip to content

Commit

Permalink
NEW: Open PrivacyPolicy WebPage depend on Country
Browse files Browse the repository at this point in the history
JIRA: none
Change-Id: Ifb620e6d6cb30f1553b5afe94a0fdf96341febac
(cherry picked from commit b6339c05c52900cab13070ab45ca33ce5495bc05)
  • Loading branch information
zorro.zhang authored and lanewei120 committed Jun 11, 2024
1 parent a84374e commit 6daf6fd
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 3 deletions.
2 changes: 1 addition & 1 deletion resources/web/guide/11/11.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function GotoPolicyPage()

SendWXMessage( JSON.stringify(tSend) );

window.location.href="../3/index.html";
window.location.href="../3/index.html?region="+RegionFinal;
}


24 changes: 23 additions & 1 deletion resources/web/guide/3/3.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@

m_Region='US';

function OnInit()
{
TranslatePage();

SendPrivacySelect();

let strRegion=GetQueryString('region');
if( strRegion!=null )
m_Region=strRegion.toLowerCase();
}


Expand Down Expand Up @@ -97,4 +103,20 @@ function HandleModelInfo( pVal )
}

window.location.href="../21/index.html";
}
}

function OpenPrivacyPolicy()
{
let PolicyUrl='';
if( m_Region=='china' )
PolicyUrl="https://bambulab.cn/policies/software-privacy";
else
PolicyUrl="https://bambulab.com/policies/privacy";

var tSend={};
tSend['sequence_id']=Math.round(new Date() / 1000);
tSend['command']="common_openurl";
tSend['url']=PolicyUrl;

SendWXMessage( JSON.stringify(tSend) );
}
2 changes: 1 addition & 1 deletion resources/web/guide/3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>
<div id="Content">
<div id="PolicyTxt" class="TextS2 TextArea1 ZScrol">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" href="https://bambulab.com/policies/privacy" target="_blank">Privacy Policy</a><a class="trans" tid="t56">
<a class="trans" tid="t54">In the 3D Printing community, we learn from each other’s successes and failures to adjust our own slicing parameters and settings. Bambu Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training Bambu Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in </a><a class="HyperLink trans" tid="t55" onClick="OpenPrivacyPolicy()">Privacy Policy</a><a class="trans" tid="t56">
. We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.
</a>
<p class="trans" tid="t113" style="text-indent:2em;">You may change your choice in preference anytime.</p>
Expand Down
6 changes: 6 additions & 0 deletions src/slic3r/GUI/WebGuideDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,12 @@ void GuideFrame::OnScriptMessage(wxWebViewEvent &evt)
}
else
InstallNetplugin = false;
}
else if (strCmd == "common_openurl")
{
std::string strUrl = j["url"];

wxLaunchDefaultBrowser(strUrl);
}
} catch (std::exception &e) {
// wxMessageBox(e.what(), "json Exception", MB_OK);
Expand Down

0 comments on commit 6daf6fd

Please sign in to comment.