From 9666caad786d890ace2df4594e71cee47bb489b9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 23 十一月 2018 09:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
index 1f259ce..ac45db8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -92,7 +92,7 @@
int length = 0;
// 鐢荤涓�鎺�
length = getTextLengthByWidth(g2d, font, title, 500, 10);
- g2d.drawString(title.substring(0, length), 50 + 60, 112 + row * 40);
+ g2d.drawString(title.substring(0, length), 50 + 65, 112 + row * 40);
title = title.substring(length);
row++;
@@ -120,10 +120,10 @@
}
g2d.setColor(new Color(229, 0, 93));
- g2d.drawString("楼", 60, 875);
+ g2d.drawString("鍒稿悗浠� 楼", 57, 875);
g2d.setColor(new Color(229, 0, 93));
g2d.setFont(boldFont);
- g2d.drawString(finalPrice.toString(), 85, 875);
+ g2d.drawString(finalPrice.toString(), 85 + 110, 875);
// 鐢诲埜鍙充晶
BufferedImage quanRight = ImageIO
@@ -195,7 +195,7 @@
font = font.deriveFont(30.0f);
g2d.setFont(font);
g2d.setColor(new Color(229, 0, 93));
- g2d.drawString("杩斿埄鍒告彁閱掓偍", 250 + 17, 1080 + 17);
+ // g2d.drawString("杩斿埄鍒告彁閱掓偍", 250 + 17, 1080 + 17);
g2d.setColor(new Color(102, 102, 102));
g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮侀鍙栦紭鎯犲埜", 250 + 17, 1130 + 17);
@@ -286,7 +286,8 @@
int topX = 50;
int topY = 50;
// 鐢诲ぇ鍥� 璧峰鐐瑰潗鏍囦负锛�50,50锛�
- InputStream goodsPicture = TaoBaoHttpUtil.getAsInputStream(goods.getPictUrl().replace("_.webp", "").replace("_220x220", ""));
+ InputStream goodsPicture = TaoBaoHttpUtil
+ .getAsInputStream(goods.getPictUrl().replace("_.webp", "").replace("_220x220", ""));
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = zoomInImage(picImage, 650, 650);
g2d.drawImage(picImage, topX, topX, null);
@@ -374,17 +375,16 @@
topY = 50 + (315 + 20) * 2;
// 鐢诲ぇ鍥�
- InputStream goodsPicture = TaoBaoHttpUtil.getAsInputStream(goods.getPictUrl().replace("_.webp", ""));
+ InputStream goodsPicture = TaoBaoHttpUtil
+ .getAsInputStream(goods.getPictUrl().replace("_.webp", ""));
BufferedImage picImage = ImageIO.read(goodsPicture);
picImage = zoomInImage(picImage, 315, 315);
g2d.drawImage(picImage, topX, topY, null);
-
+
g2d.setColor(new Color(224, 224, 224));
// 鐢昏竟妗�
g2d.setStroke(new BasicStroke(1.0f));
- g2d.drawRect(topX - 1, topY - 1, 316,316);
-
-
+ g2d.drawRect(topX - 1, topY - 1, 316, 316);
// 鐢诲埜
@@ -445,10 +445,10 @@
font = font.deriveFont(50.0f);
g2d.setFont(font);
g2d.setColor(new Color(229, 0, 93));
- g2d.drawString("杩斿埄鍒告彁閱掓偍", 312, 1118 + 40);
+// g2d.drawString("杩斿埄鍒告彁閱掓偍", 312, 1118 + 40);
g2d.setColor(new Color(102, 102, 102));
- g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮侀鍙栦紭鎯犲埜", 312, 1118 + 105);
+ g2d.drawString("闀挎寜璇嗗埆浜岀淮鐮侀鍙栦紭鎯犲埜", 312, 1118 + 77);
g2d.dispose();
--
Gitblit v1.8.0