mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: Open makerlab with login status 

JIRA: none
Change-Id: Ib8f58812085582b52cfca29471912f2b30cd1b08
This commit is contained in:
zorro.zhang 2024-03-19 21:58:46 +08:00 committed by Lane.Wei
parent 31ff32de77
commit 23ad6ad0ca
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -766,6 +766,21 @@ std::string UrlDecode(const std::string &str)
// ); // );
//} //}
bool WebViewPanel::GetJumpUrl(bool login, wxString ticket, wxString targeturl, wxString &finalurl)
{
std::string h = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code());
if (login) {
if (ticket == "") return false;
finalurl = wxString::Format("%sapi/sign-in/ticket?to=%s&ticket=%s", h, UrlEncode( std::string(targeturl.mb_str())), ticket);
} else {
finalurl = wxString::Format("%sapi/sign-out?to=%s", h, UrlEncode(std::string(targeturl.mb_str())));
}
return true;
}
void WebViewPanel::UpdateMakerworldLoginStatus() void WebViewPanel::UpdateMakerworldLoginStatus()
{ {
NetworkAgent *agent = GUI::wxGetApp().getAgent(); NetworkAgent *agent = GUI::wxGetApp().getAgent();
@ -785,14 +800,8 @@ void WebViewPanel::SetMakerworldPageLoginStatus(bool login ,wxString ticket)
wxString mw_currenturl = m_browserMW->GetCurrentURL(); wxString mw_currenturl = m_browserMW->GetCurrentURL();
wxString mw_jumpurl = ""; wxString mw_jumpurl = "";
if ( login ) bool b = GetJumpUrl(login, ticket, mw_currenturl, mw_jumpurl);
{ if (b)
mw_jumpurl = wxString::Format("%sapi/sign-in/ticket?to=%s&ticket=%s", h, UrlEncode(std::string(mw_currenturl.mb_str())), ticket);
}
else {
mw_jumpurl = wxString::Format("%sapi/sign-out?to=%s", h, UrlEncode(std::string(mw_currenturl.mb_str())));
}
m_browserMW->LoadURL(mw_jumpurl); m_browserMW->LoadURL(mw_jumpurl);
} }
@ -1271,7 +1280,16 @@ void WebViewPanel::SwitchWebContent(std::string modelname,int refresh)
auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code());
std::string LabUrl = (boost::format("%1%makerlab?from=bambustudio") % host ).str(); std::string LabUrl = (boost::format("%1%makerlab?from=bambustudio") % host ).str();
wxLaunchDefaultBrowser(LabUrl); wxString FinalUrl = LabUrl;
NetworkAgent *agent = GUI::wxGetApp().getAgent();
if (agent && agent->is_user_login())
{
std::string newticket;
int ret = agent->request_bind_ticket(&newticket);
if (ret == 0) GetJumpUrl(true, newticket, FinalUrl, FinalUrl);
}
wxLaunchDefaultBrowser(FinalUrl);
//conf save //conf save
wxGetApp().app_config->set_str("homepage", "makerlab_clicked", "1"); wxGetApp().app_config->set_str("homepage", "makerlab_clicked", "1");
@ -1344,7 +1362,15 @@ void WebViewPanel::OpenOneMakerlab(std::string url) {
auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code()); auto host = wxGetApp().get_model_http_url(wxGetApp().app_config->get_country_code());
std::string LabUrl = (boost::format("%1%%2%") % host % url).str(); std::string LabUrl = (boost::format("%1%%2%") % host % url).str();
wxLaunchDefaultBrowser(LabUrl); wxString FinalUrl = LabUrl;
NetworkAgent *agent = GUI::wxGetApp().getAgent();
if (agent && agent->is_user_login()) {
std::string newticket;
int ret = agent->request_bind_ticket(&newticket);
if (ret == 0) GetJumpUrl(true, newticket, FinalUrl, FinalUrl);
}
wxLaunchDefaultBrowser(FinalUrl);
} }

2
src/slic3r/GUI/WebViewDialog.hpp
View File

@ -118,6 +118,8 @@ public:
void UpdateMakerworldLoginStatus(); void UpdateMakerworldLoginStatus();
void SetMakerworldPageLoginStatus(bool login, wxString ticket = ""); void SetMakerworldPageLoginStatus(bool login, wxString ticket = "");
bool GetJumpUrl(bool login, wxString ticket, wxString targeturl, wxString &finalurl);
void update_mode(); void update_mode();
private: private: