From 26ec9ae385f6520ef6eb48c96bb529bd9cd97cda Mon Sep 17 00:00:00 2001
From: "zorro.zhang" <zorro.zhang@bambulab.com>
Date: Wed, 14 Jun 2023 11:29:09 +0800
Subject: [PATCH] ENH: Show Printer Thumbnail From Profile Folder

Change-Id: I1ebea7016bcf8725d80d450ea82ff85941cb0dc8
(cherry picked from commit 9cd50c690a70f103a9140fdb85cca7d2858874b0)
---
 resources/web/guide/21/21.css |  4 ++--
 resources/web/guide/21/21.js  | 14 ++++++++++++--
 resources/web/guide/24/24.css |  4 ++--
 resources/web/guide/24/24.js  | 13 +++++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/resources/web/guide/21/21.css b/resources/web/guide/21/21.css
index 47b09fcbe..3e335d5f5 100644
--- a/resources/web/guide/21/21.css
+++ b/resources/web/guide/21/21.css
@@ -36,7 +36,7 @@
 
 .PrinterArea
 {
-	padding: 10px;
+	padding: 0px;
 	display: flex;
 	flex-wrap: wrap;
 }
@@ -45,7 +45,7 @@
 {
 	width: 160px;
 	text-align: center;
-	padding: 10px;
+	padding: 8px;
 }
 
 .PrinterBlock img
diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js
index fc7877892..729d2b152 100644
--- a/resources/web/guide/21/21.js
+++ b/resources/web/guide/21/21.js
@@ -41,6 +41,12 @@ function HandleStudio( pVal )
 }
 
 
+function ShowPrinterThumb(pItem, strImg)
+{
+	$(pItem).attr('src',strImg);
+	$(pItem).attr('onerror',null);
+}
+
 function HandleModelList( pVal )
 {
 	if( !pVal.hasOwnProperty("model") )
@@ -75,7 +81,10 @@ function HandleModelList( pVal )
 '</div>'+
 '</div>';
 			
-			$('#Content').append(HtmlNewVendor);
+			if(sVV=='Bambu Lab')
+				$('#Content').html( HtmlNewVendor + $('#Content').html() );
+			else
+				$('#Content').append( HtmlNewVendor );
 		}
 		
 		let ModelName=OneModel['model'];
@@ -93,8 +102,9 @@ function HandleModelList( pVal )
 		}
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
+		let	CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
 		ModelHtml[strVendor]+='<div class="PrinterBlock">'+
-'	<div class="PImg"><img src="'+CoverImage+'"  /></div>'+
+'	<div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
 '    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
 	}
 	
diff --git a/resources/web/guide/24/24.css b/resources/web/guide/24/24.css
index aadd9c27a..68f40b606 100644
--- a/resources/web/guide/24/24.css
+++ b/resources/web/guide/24/24.css
@@ -59,7 +59,7 @@
 
 .PrinterArea
 {
-	padding: 10px;
+	padding: 0px;
 	display: flex;
 	flex-wrap: wrap;
 }
@@ -68,7 +68,7 @@
 {
 	width: 160px;
 	text-align: center;
-	padding: 10px;
+	padding: 8px;
 }
 
 .PrinterBlock img
diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js
index b6b38e159..00ae24a2b 100644
--- a/resources/web/guide/24/24.js
+++ b/resources/web/guide/24/24.js
@@ -40,6 +40,11 @@ function HandleStudio( pVal )
 	}
 }
 
+function ShowPrinterThumb(pItem, strImg)
+{
+	$(pItem).attr('src',strImg);
+	$(pItem).attr('onerror',null);
+}
 
 function HandleModelList( pVal )
 {
@@ -75,7 +80,10 @@ function HandleModelList( pVal )
 '</div>'+
 '</div>';
 			
-			$('#Content').append(HtmlNewVendor);
+			if(sVV=='Bambu Lab')
+				$('#Content').html( HtmlNewVendor + $('#Content').html() );
+			else
+				$('#Content').append( HtmlNewVendor );
 		}
 		
 		let ModelName=OneModel['model'];
@@ -93,8 +101,9 @@ function HandleModelList( pVal )
 		}
 		
 		let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png";
+		let	CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png";
 		ModelHtml[strVendor]+='<div class="PrinterBlock">'+
-'	<div class="PImg"><img src="'+CoverImage+'"  /></div>'+
+'	<div class="PImg"><img src="'+CoverImage+'" onerror="ShowPrinterThumb(this,\''+CoverImage2+'\')" /></div>'+
 '    <div class="PName">'+OneModel['model']+'</div>'+ HtmlNozzel +'</div>';
 	}