mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-31 20:51:12 -06:00
Update the codes to 01.01.00.10 for the formal release
1. first formal version of macos 2. add the bambu networking plugin install logic 3. auto compute the wipe volume when filament change 4. add the logic of wiping into support 5. refine the GUI layout and icons, improve the gui apperance in lots of small places 6. serveral improve to support 7. support AMS auto-mapping 8. disable lots of unstable features: such as params table, media file download, HMS 9. fix serveral kinds of bugs 10. update the document of building 11. ...
This commit is contained in:
parent
e1528e4299
commit
e9e4d75877
267 changed files with 10326 additions and 32228 deletions
|
|
@ -14,7 +14,7 @@ var LangText={
|
|||
"t12":"Clear all",
|
||||
"t13":"mm nozzle",
|
||||
"t14":"Filament Selection",
|
||||
"t15":"printer",
|
||||
"t15":"Printer",
|
||||
"t16":"Filament type",
|
||||
"t17":"Vendor",
|
||||
"t18":"error",
|
||||
|
|
@ -46,7 +46,7 @@ var LangText={
|
|||
"t50":"Log out",
|
||||
"t52":"Skip",
|
||||
"t53":"Join",
|
||||
"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 ",
|
||||
"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 ",
|
||||
"t55":"Privacy Policy",
|
||||
"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.",
|
||||
"t57":"",
|
||||
|
|
@ -55,7 +55,30 @@ var LangText={
|
|||
"t60":"Europe",
|
||||
"t61":"North America",
|
||||
"t62":"Others",
|
||||
"t63":"After changing the region, your account will be logged out. Please log in again later."
|
||||
"t63":"After changing the region, your account will be logged out. Please log in again later.",
|
||||
"t64":"Bambu Network plug-in",
|
||||
"t65":"Sending print job via WLAN",
|
||||
"t66":"Full remote control",
|
||||
"t67":"Liveview streaming",
|
||||
"t68":"User data synchronization",
|
||||
"t69":"Install Bambu Network plug-in",
|
||||
"t70":"",
|
||||
"t71":"Downloading",
|
||||
"t72":"Downloading failed",
|
||||
"t73":"Installation successful.",
|
||||
"t74":"Restart",
|
||||
"t75":"Bambu Network plug-in provides the following features:",
|
||||
"t76":"Bambu Network plug-in not detected. Click ",
|
||||
"t77":"here",
|
||||
"t78":" to install it.",
|
||||
"t79":"Failed to install plug-in. ",
|
||||
"t80":"Try the following steps:",
|
||||
"t81":"1, Click ",
|
||||
"t82":" to open the plug-in directory",
|
||||
"t83":"2, Close all open Bambu Studio",
|
||||
"t84":"3, Delete all files under the plug-in directory",
|
||||
"t85":"4, Reopen Bambu studio and install the plug-in again",
|
||||
"t86":"Close"
|
||||
},
|
||||
"zh_CN":{
|
||||
"t1":"欢迎使用Bambu Studio",
|
||||
|
|
@ -113,7 +136,30 @@ var LangText={
|
|||
"t60":"欧洲",
|
||||
"t61":"北美",
|
||||
"t62":"其他",
|
||||
"t63":"切换区域后,你的账号会被登出。稍后请重新登录。"
|
||||
"t63":"切换区域后,你的账号会被登出。稍后请重新登录。",
|
||||
"t64":"Bambu网络插件",
|
||||
"t65":"通过WLAN发送打印任务",
|
||||
"t66":"强大的远程控制功能",
|
||||
"t67":"实时视频流",
|
||||
"t68":"用户数据同步",
|
||||
"t69":"安装Bambu网络插件",
|
||||
"t70":"",
|
||||
"t71":"正在下载",
|
||||
"t72":"下载失败",
|
||||
"t73":"安装成功。",
|
||||
"t74":"重启",
|
||||
"t75":"Bambu网络插件提供以下功能:",
|
||||
"t76":"没有发现Bambu网络插件,请",
|
||||
"t77":"下载",
|
||||
"t78":"并安装。",
|
||||
"t79":"安装插件失败。",
|
||||
"t80":"请尝试如下步骤:",
|
||||
"t81":"1, 点击",
|
||||
"t82":"打开插件所在目录",
|
||||
"t83":"2, 关闭所有Bambu Studio",
|
||||
"t84":"3, 删除插件所在目录下的所有文件",
|
||||
"t85":"4, 重新启动Bambu Studio并尝试安装插件",
|
||||
"t86":"关闭"
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -109,3 +109,8 @@ input
|
|||
display: flex;
|
||||
justify-content:space-around;
|
||||
}
|
||||
|
||||
#GotoNetPluginBtn
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -234,6 +234,13 @@ function SortUI()
|
|||
//------
|
||||
if(SelectNumber==0)
|
||||
ChooseDefaultFilament();
|
||||
|
||||
//--If Need Install Network Plugin
|
||||
if(m_ProfileItem["network_plugin_install"]!='1' || (m_ProfileItem["network_plugin_install"]=='1' && m_ProfileItem["network_plugin_compability"]=='0') )
|
||||
{
|
||||
$("#AcceptBtn").hide();
|
||||
$("#GotoNetPluginBtn").show();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -504,7 +511,7 @@ function ReturnPreviewPage()
|
|||
}
|
||||
|
||||
|
||||
function GotoNewFeature()
|
||||
function GotoNetPluginPage()
|
||||
{
|
||||
let bRet=ResponseFilamentResult();
|
||||
|
||||
|
|
@ -532,3 +539,4 @@ function FinishGuide()
|
|||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@
|
|||
</div>
|
||||
<div id="AcceptArea">
|
||||
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="ReturnPreviewPage()">Back</div>
|
||||
<!-- <div class="NormalBtn trans" tid="t9" id="AcceptBtn" onclick="GotoNewFeature()">Next</div>-->
|
||||
<div class="NormalBtn trans" tid="t25" id="AcceptBtn" onclick="FinishGuide()">finish</div>
|
||||
<div class="NormalBtn trans" tid="t9" id="GotoNetPluginBtn" onclick="GotoNetPluginPage()">Next</div>
|
||||
</div>
|
||||
<div id="NoticeMask">
|
||||
</div>
|
||||
|
|
|
|||
40
resources/web/guide/31/31.css
Normal file
40
resources/web/guide/31/31.css
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
|
||||
#PolicyTxt
|
||||
{
|
||||
background-color: #EBEBEB;
|
||||
padding: 12px;
|
||||
word-wrap:break-word;
|
||||
overflow-y: scroll;
|
||||
min-height: 200px;
|
||||
text-indent: 2em;
|
||||
}
|
||||
|
||||
#PolicyTxt::-webkit-scrollbar {/*滚动条整体样式*/
|
||||
width: 5px; /*高宽分别对应横竖滚动条的尺寸*/
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
#PolicyTxt::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
|
||||
border-radius: 10px;
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
background-color: #AAAAAA;
|
||||
}
|
||||
|
||||
#PolicyTxt::-webkit-scrollbar-track {/*滚动条里面轨道*/
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
border-radius: 10px;
|
||||
background: #EDEDED;
|
||||
}
|
||||
|
||||
#C_List li
|
||||
{
|
||||
margin-left: 4em;
|
||||
}
|
||||
|
||||
p
|
||||
{
|
||||
text-indent:2em;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
80
resources/web/guide/31/31.js
Normal file
80
resources/web/guide/31/31.js
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
|
||||
function OnInit()
|
||||
{
|
||||
TranslatePage();
|
||||
|
||||
SendPrivacySelect();
|
||||
}
|
||||
|
||||
|
||||
function SendPrivacySelect()
|
||||
{
|
||||
let nVal="refuse";
|
||||
if( $('#ChoosePrivacy').is(':checked') )
|
||||
nVal="agree";
|
||||
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="user_private_choice";
|
||||
tSend['data']={};
|
||||
tSend['data']['action']=nVal;
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
|
||||
function GotoNextPage()
|
||||
{
|
||||
RequestProfile();
|
||||
}
|
||||
|
||||
function RequestProfile()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="request_userguide_profile";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
function HandleStudio( pVal )
|
||||
{
|
||||
let strCmd=pVal['command'];
|
||||
//alert(strCmd);
|
||||
|
||||
if(strCmd=='response_userguide_profile')
|
||||
{
|
||||
HandleModelInfo(pVal['response']);
|
||||
}
|
||||
}
|
||||
|
||||
function HandleModelInfo( pVal )
|
||||
{
|
||||
let Modellist=pVal["model"];
|
||||
let nModel=Modellist.length;
|
||||
|
||||
if(nModel==1)
|
||||
{
|
||||
// let pModel=Modellist[0];
|
||||
//
|
||||
// var tSend={};
|
||||
// tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
// tSend['command']="save_userguide_models";
|
||||
// tSend['data']={};
|
||||
//
|
||||
// let ModelName=pModel['model'];
|
||||
//
|
||||
// tSend['data'][ModelName]={};
|
||||
// tSend['data'][ModelName]['model']=pModel['model'];
|
||||
// tSend['data'][ModelName]['nozzle_diameter']=pModel['nozzle_diameter'];
|
||||
// tSend['data'][ModelName]['vendor']=pModel['vendor'];
|
||||
//
|
||||
// SendWXMessage( JSON.stringify(tSend) );
|
||||
|
||||
window.location.href="../22/index.html";
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
window.location.href="../21/index.html";
|
||||
}
|
||||
38
resources/web/guide/31/index.html
Normal file
38
resources/web/guide/31/index.html
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Cache-Control" content="max-age=7200" />
|
||||
<title>引导_P1</title>
|
||||
<link rel="stylesheet" type="text/css" href="../css/common.css" />
|
||||
<link rel="stylesheet" type="text/css" href="31.css" />
|
||||
<script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
|
||||
<script type="text/javascript" src="../js/json2.js"></script>
|
||||
<script type="text/javascript" src="../../data/text.js"></script>
|
||||
<script type="text/javascript" src="../js/globalapi.js"></script>
|
||||
<script type="text/javascript" src="../js/common.js"></script>
|
||||
<script type="text/javascript" src="./31.js"></script>
|
||||
</head>
|
||||
<body onLoad="OnInit()">
|
||||
<div id="Title">
|
||||
<div class="trans" tid="t6">We kindly request your help to improve<br/> everyone's printing</div>
|
||||
</div>
|
||||
<div id="Content">
|
||||
<div id="PolicyTxt">
|
||||
<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">
|
||||
. 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>
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
<div>
|
||||
<input id="ChoosePrivacy" type="checkbox" checked onClick="SendPrivacySelect()" onChange="SendPrivacySelect()" />
|
||||
<span class="trans" tid="t7">Allow sending anonymous data</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="AcceptArea">
|
||||
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.open('../11/index.html','_self')">Back</div>
|
||||
<div class="NormalBtn trans" tid="t9" id="AcceptBtn" onclick="GotoNextPage()">Next</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,41 +1,27 @@
|
|||
#NoteText
|
||||
|
||||
#Content
|
||||
{
|
||||
border:0px solid #787878;
|
||||
font-size: 14px;
|
||||
line-height: 22px;
|
||||
height: 90%;
|
||||
color: #535353;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
margin: 10mm 30mm;
|
||||
padding:10% 15%;
|
||||
}
|
||||
|
||||
#NoteText h
|
||||
#FeatureText
|
||||
{
|
||||
font-size:22px;
|
||||
line-height: 32px;
|
||||
}
|
||||
|
||||
#NoteText::-webkit-scrollbar {/*滚动条整体样式*/
|
||||
width: 5px; /*高宽分别对应横竖滚动条的尺寸*/
|
||||
height: 1px;
|
||||
}
|
||||
|
||||
#NoteText::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
|
||||
border-radius: 10px;
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
background-color: #AAAAAA;
|
||||
}
|
||||
|
||||
#NoteText::-webkit-scrollbar-track {/*滚动条里面轨道*/
|
||||
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
|
||||
border-radius: 10px;
|
||||
background: #EDEDED;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
|
||||
#CheckArea
|
||||
{
|
||||
margin-top:10mm;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
#InstallCheck
|
||||
{
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
|
||||
#RestartText
|
||||
{
|
||||
padding-left:30px;
|
||||
}
|
||||
|
|
@ -1,4 +1,28 @@
|
|||
|
||||
function OnInit()
|
||||
{
|
||||
TranslatePage();
|
||||
|
||||
SendInstallPluginCheck();
|
||||
}
|
||||
|
||||
|
||||
|
||||
function SendInstallPluginCheck()
|
||||
{
|
||||
let nVal="no";
|
||||
if( $('#InstallCheck').is(':checked') )
|
||||
nVal="yes";
|
||||
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="network_plugin_install";
|
||||
tSend['data']={};
|
||||
tSend['data']['action']=nVal;
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
function FinishGuide()
|
||||
|
|
|
|||
|
|
@ -13,49 +13,25 @@
|
|||
<script type="text/javascript" src="../js/common.js"></script>
|
||||
<script type="text/javascript" src="5.js"></script>
|
||||
</head>
|
||||
<body onLoad="TranslatePage()">
|
||||
<body onLoad="OnInit()">
|
||||
<div id="Title">
|
||||
<div class="trans" tid="t23">Release note</div>
|
||||
<div class="trans" tid="t64">Bambu Network Plugin</div>
|
||||
</div>
|
||||
<div id="Content">
|
||||
<div id="NoteText">
|
||||
<h>7.5.0</h>
|
||||
<p>更新日志:</p>
|
||||
<p>1.新增关联内容设置</p>
|
||||
<p>2.优化编辑器里的图片上传组件中的在线图片列表和后台默认上传组件中的图片库列表增加图片预览图标和链接;</p>
|
||||
<p>3.新增对国产达梦数据库的兼容</p>
|
||||
<p>4.新增免费模板metv75一套</p>
|
||||
<p>5.优化管理员内容权限控制</p>
|
||||
<p>6.优化编辑器里的图片上传组件中的在线图片列表和后台默认上传组件中的图片库列表增加图片预览图标和链接;</p>
|
||||
<p>7.优化数据备份与导入功能</p>
|
||||
<p>8.修复XSS漏洞</p>
|
||||
|
||||
<div id="FeatureText">
|
||||
<div ><a tid="t75" class="trans">Bambu Network plug-in Provides the following features:</a></div>
|
||||
<div><span>●</span> <a tid="t65" class="trans" ></a></div>
|
||||
<div><span>●</span> <a tid="t66" class="trans" ></a></div>
|
||||
<div><span>●</span> <a tid="t67" class="trans" ></a></div>
|
||||
<div><span>●</span> <a tid="t68" class="trans" ></a></div>
|
||||
</div>
|
||||
|
||||
<br/><br/>
|
||||
<h>7.4.0</h>
|
||||
<p>更新日志:</p>
|
||||
<p>1.新增关联内容设置</p>
|
||||
<p>2.优化编辑器里的图片上传组件中的在线图片列表和后台默认上传组件中的图片库列表增加图片预览图标和链接;</p>
|
||||
<p>3.新增对国产达梦数据库的兼容</p>
|
||||
<p>4.新增免费模板metv75一套</p>
|
||||
<p>5.优化管理员内容权限控制</p>
|
||||
<p>6.优化前台内容限控制</p>
|
||||
<p>7.优化数据备份与导入功能</p>
|
||||
<p>8.修复XSS漏洞</p>
|
||||
|
||||
<br/><br/>
|
||||
<h>7.3.0</h>
|
||||
<p>更新日志:</p>
|
||||
<p>1.新增关联内容设置</p>
|
||||
<p>2.优化编辑器里的图片上传组件中的在线图片列表和后台默认上传组件中的图片库列表增加图片预览图标和链接;</p>
|
||||
<p>3.新增对国产达梦数据库的兼容</p>
|
||||
<p>4.新增免费模板metv75一套</p>
|
||||
<p>5.优化管理员内容权限控制</p>
|
||||
<p>6.优化编辑器里的图片上传组件中的在线图片列表和后台默认上传组件中的图片库列表增加图片预览图标和链接;</p>
|
||||
<p>7.优化数据备份与导入功能</p>
|
||||
<p>8.修复XSS漏洞</p>
|
||||
|
||||
|
||||
</div>
|
||||
<div id="CheckArea"><input id="InstallCheck" onClick="SendInstallPluginCheck()" checked type="checkbox"><a tid="t69" class="trans">Install Bambu Network Plug-in. </a></div>
|
||||
<div id="RestartText" tid="t70" class="trans" ></div>
|
||||
|
||||
</div>
|
||||
<div id="AcceptArea">
|
||||
<div class="GrayBtn trans" tid="t8" id="PreBtn" onclick="window.history.back()">Back</div>
|
||||
|
|
|
|||
136
resources/web/guide/6/6.css
Normal file
136
resources/web/guide/6/6.css
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
*
|
||||
{
|
||||
padding: 0;
|
||||
border: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
html,body
|
||||
{
|
||||
font-size: 14px;
|
||||
height:100%;
|
||||
}
|
||||
|
||||
.LinkBtn
|
||||
{
|
||||
color: #1200FF;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.LinkBtn:hover
|
||||
{
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
.Btn_Green
|
||||
{
|
||||
padding: 1.5mm 6mm;
|
||||
font-size: 14px;
|
||||
text-align: center;
|
||||
background-color: #00AE42;
|
||||
border-radius: 6px;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
border: 1px solid #009A3A;
|
||||
}
|
||||
|
||||
.Btn_Green:hover
|
||||
{
|
||||
background-color: #009A3A;
|
||||
}
|
||||
|
||||
|
||||
#DownBlock
|
||||
{
|
||||
height: 60%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
#DownArea
|
||||
{
|
||||
width:80%;
|
||||
height: 50%;
|
||||
line-height: 50px;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
#DownText
|
||||
{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
#RetryBtn
|
||||
{
|
||||
background-image:url("restart.png");
|
||||
background-size: 100% 100%;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-left: 20px;
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
#DownPercent
|
||||
{
|
||||
height:20px;
|
||||
}
|
||||
|
||||
#PercentBkg
|
||||
{
|
||||
height:20px;
|
||||
background-color:#CFCFCF;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#PercentTip
|
||||
{
|
||||
float: left;
|
||||
height:20px;
|
||||
width: 0%;
|
||||
background-color:#00AE42;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
#DownSuccessTip
|
||||
{
|
||||
width:80%;
|
||||
display: none;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#InstallFailedTip
|
||||
{
|
||||
display:none;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
|
||||
/*------Btn Area------*/
|
||||
|
||||
#BtnBlock
|
||||
{
|
||||
height:40%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
#CancelBtn
|
||||
{
|
||||
display: inline;
|
||||
}
|
||||
|
||||
#RestartBtn
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
|
||||
#CloseBtn
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
167
resources/web/guide/6/6.js
Normal file
167
resources/web/guide/6/6.js
Normal file
|
|
@ -0,0 +1,167 @@
|
|||
|
||||
|
||||
function OnInit()
|
||||
{
|
||||
//let strInput=JSON.stringify(cData);
|
||||
//HandleStudio(strInput);
|
||||
|
||||
// let tVal={};
|
||||
// tVal['status']=3;
|
||||
// tVal['percent']=30;
|
||||
//
|
||||
// HandStatusPercent(tVal);
|
||||
|
||||
TranslatePage();
|
||||
SendDownloadCmd();
|
||||
}
|
||||
|
||||
function SendDownloadCmd()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="Begin_Download_network_plugin";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
|
||||
function HandleStudio( pVal )
|
||||
{
|
||||
let strCmd=pVal['command'];
|
||||
//alert(strCmd);
|
||||
|
||||
if(strCmd=='ShowStatusPercent')
|
||||
{
|
||||
HandStatusPercent(pVal['data']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function HandStatusPercent( pVal )
|
||||
{
|
||||
let nStatus=pVal['status']*1;
|
||||
let nPercent=pVal['percent'];
|
||||
|
||||
if(nStatus==0)
|
||||
{
|
||||
//正常下载
|
||||
$('#DownStepText').attr("tid","t71");
|
||||
$('#RetryBtn').hide();
|
||||
|
||||
$('#PercentTip').css("width",nPercent+'%');
|
||||
}
|
||||
else if(nStatus==1)
|
||||
{
|
||||
//下载失败 或 解压缩补丁包失败
|
||||
$('#DownStepText').attr("tid","t72");
|
||||
$('#PercentTip').css("width",0+'%');
|
||||
$('#RetryBtn').show();
|
||||
}
|
||||
else if(nStatus==2)
|
||||
{
|
||||
//下载完成
|
||||
$('#PercentTip').css("width",100+'%');
|
||||
|
||||
setTimeout("SendInstallPluginCmd()",100);
|
||||
}
|
||||
else if(nStatus==3)
|
||||
{
|
||||
//解压缩补丁包失败
|
||||
$('#DownArea').hide();
|
||||
$("#InstallFailedTip").show();
|
||||
|
||||
$('#CancelBtn').hide();
|
||||
$('#RestartBtn').hide();
|
||||
$('#CloseBtn').show();
|
||||
}
|
||||
else if(nStatus==4)
|
||||
{
|
||||
//安装补丁包完成
|
||||
$('#DownArea').hide();
|
||||
$('#DownSuccessTip').show();
|
||||
|
||||
$('#CancelBtn').hide();
|
||||
$('#CloseBtn').hide();
|
||||
$('#RestartBtn').show();
|
||||
|
||||
//pTimer=setInterval("RunInverse()",1000);
|
||||
}
|
||||
|
||||
TranslatePage();
|
||||
}
|
||||
|
||||
var nCount=3;
|
||||
var pTimer=null;
|
||||
function RunInverse()
|
||||
{
|
||||
$('#CountNumber').text(nCount+'');
|
||||
nCount--;
|
||||
|
||||
if(nCount==-1)
|
||||
{
|
||||
RestartBambuStudio();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function RetryDownload()
|
||||
{
|
||||
$('#DownStepText').attr("tid","t71");
|
||||
$('#PercentTip').css("width",0+'%');
|
||||
SendDownloadCmd();
|
||||
}
|
||||
|
||||
|
||||
function CancelDownload()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="netplugin_download_cancel";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
|
||||
}
|
||||
|
||||
function SendInstallPluginCmd()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="begin_install_plugin";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
|
||||
|
||||
function RestartBambuStudio()
|
||||
{
|
||||
if( pTimer!=null )
|
||||
{
|
||||
clearInterval(pTimer);
|
||||
pTimer=null;
|
||||
}
|
||||
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="restart_studio";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
function CloseDownDialog()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="close_download_dialog";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
function OpenPluginFolder()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="open_plugin_folder";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
48
resources/web/guide/6/index.html
Normal file
48
resources/web/guide/6/index.html
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="Cache-Control" content="max-age=7200" />
|
||||
<title>引导_P1</title>
|
||||
<link rel="stylesheet" type="text/css" href="6.css" />
|
||||
<script type="text/javascript" src="../js/jquery-2.1.1.min.js"></script>
|
||||
<script type="text/javascript" src="../js/json2.js"></script>
|
||||
<script type="text/javascript" src="../../data/text.js"></script>
|
||||
<script type="text/javascript" src="../js/globalapi.js"></script>
|
||||
<script type="text/javascript" src="../js/common.js"></script>
|
||||
<script type="text/javascript" src="6.js"></script>
|
||||
</head>
|
||||
<body onLoad="OnInit()">
|
||||
|
||||
<div id="DownBlock">
|
||||
<div id="DownArea">
|
||||
<div id="DownText">
|
||||
<div id="DownStepText" class="trans" tid="t71">Downloading</div>
|
||||
<div id="RetryBtn" onClick="RetryDownload()"></div>
|
||||
</div>
|
||||
<div>
|
||||
<div id="PercentTip"></div>
|
||||
<div id="PercentBkg"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="DownSuccessTip" class="trans" tid="t73">Installation successful.</div>
|
||||
|
||||
<div id="InstallFailedTip">
|
||||
<div><a class="trans" tid="t79">Failed to install plug-in. </a><a class="trans" tid="t80">Try the following steps:</a></div>
|
||||
<div><a class="trans" tid="t81">1, Click </a><a class="trans LinkBtn" tid="t77" onClick="OpenPluginFolder()">here</a><a class="trans" tid="t82"> to open the plug-in directory</a> </div>
|
||||
<div class="trans" tid="t83">2, Close all open Bambu Studio</div>
|
||||
<div class="trans" tid="t84">3, Delete all files under the plug-in directory</div>
|
||||
<div class="trans" tid="t85">4, Reopen Bambu studio and install the plug-in again</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div id="BtnBlock">
|
||||
<div id="CancelBtn" class="trans Btn_Green" tid="t38" onClick="CancelDownload()">Cancel</div>
|
||||
<div id="RestartBtn" class="Btn_Green" onClick="RestartBambuStudio()"><a class="trans" tid="t25">Finish</a></div>
|
||||
<div id="CloseBtn" class="Btn_Green" onClick="CloseDownDialog()"><a class="trans" tid="t86">Close</a></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
BIN
resources/web/guide/6/restart.png
Normal file
BIN
resources/web/guide/6/restart.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -14,6 +14,24 @@ html, body {
|
|||
line-height: 20px;
|
||||
}
|
||||
|
||||
.RedFont
|
||||
{
|
||||
font-size:12px;
|
||||
color: #F07E4A;
|
||||
}
|
||||
|
||||
.LinkBtn
|
||||
{
|
||||
font-size:12px;
|
||||
color: #1200FF;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.LinkBtn:hover
|
||||
{
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
/*------------------*/
|
||||
body
|
||||
{
|
||||
|
|
@ -36,6 +54,7 @@ body
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-wrap: nowrap;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -52,6 +71,25 @@ body
|
|||
cursor:pointer;
|
||||
}
|
||||
|
||||
#NoPluginTip
|
||||
{
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
bottom: 0px;
|
||||
right: 0px;
|
||||
z-index: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-end;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
|
||||
#DownloadBtn
|
||||
{
|
||||
color:#0A00FF;
|
||||
}
|
||||
|
||||
|
||||
#Icon1
|
||||
|
|
|
|||
|
|
@ -26,7 +26,12 @@
|
|||
</div>
|
||||
<div id="UserName"></div>
|
||||
<div id="LogoutBtn" class="Btn trans" tid="t50" onClick="OnLogOut()">log out</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="NoPluginTip">
|
||||
<div id="NoPluginText"><a class="RedFont trans" tid="t76">Network plugin not detected. Click </a><a Class="LinkBtn trans" onClick="BeginDownloadNetworkPlugin()" tid="t77">here</a><a class="RedFont trans" tid="t78"> to install it.</a></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="BtnArea">
|
||||
|
|
|
|||
|
|
@ -42,6 +42,20 @@ function HandleStudio( pVal )
|
|||
|
||||
GotoMenu(strName);
|
||||
}
|
||||
else if( strCmd=="network_plugin_installtip" )
|
||||
{
|
||||
let nShow=pVal["show"]*1;
|
||||
|
||||
if(nShow==1)
|
||||
{
|
||||
$("#NoPluginTip").show();
|
||||
$("#NoPluginTip").css("display","flex");
|
||||
}
|
||||
else
|
||||
{
|
||||
$("#NoPluginTip").hide();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function GotoMenu( strMenu )
|
||||
|
|
@ -192,4 +206,13 @@ function OnLogOut()
|
|||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
window.postMessage = HandleStudio
|
||||
function BeginDownloadNetworkPlugin()
|
||||
{
|
||||
var tSend={};
|
||||
tSend['sequence_id']=Math.round(new Date() / 1000);
|
||||
tSend['command']="begin_network_plugin_download";
|
||||
|
||||
SendWXMessage( JSON.stringify(tSend) );
|
||||
}
|
||||
|
||||
window.postMessage = HandleStudio;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue