From 6af417cf560e9242f83287a0b05cdb44b7b1f448 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 30 六月 2020 09:41:21 +0800
Subject: [PATCH] 拉新邀请图调整

---
 fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 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 7b42df6..b5d0df9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -3076,27 +3076,29 @@
 			// 鏂囧瓧闂磋窛
 			int fontH = 24;
 			int spacingH = 14;
-			// 鏂颁汉濂栧姳绾㈣壊鏂囧瓧
 			int y_temp = topPicH + 110 + fontH;
-
-			g2d.setFont(boldFont24);
-			g2d.setColor(new Color(229, 0, 92));
-			g2d.drawString(rule.getNewRule(), spacing, y_temp);
-
-			// 鏂颁汉濂栧姳瑙勫垯
-			g2d.setFont(font24);
-			g2d.setColor(new Color(51, 51, 51));
 			int fontNum = 10;
 			int maxWidth = 590;
+			
+			// 鏂颁汉濂栧姳绾㈣壊鏂囧瓧
 			String newTitle = rule.getNewTitle();
-			while (newTitle.length() > 0) {
-				y_temp += spacingH + fontH;
-				int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
-				g2d.drawString(newTitle.substring(0, lengthNew), spacing, y_temp);
-				newTitle = newTitle.substring(lengthNew);
-			}
+			if (!StringUtil.isNullOrEmpty(newTitle)) {
+				g2d.setFont(boldFont24);
+				g2d.setColor(new Color(229, 0, 92));
+				g2d.drawString(rule.getNewRule(), spacing, y_temp);
 
-			y_temp = y_temp + fontH + 50;
+				g2d.setFont(font24);
+				g2d.setColor(new Color(51, 51, 51));
+				while (newTitle.length() > 0) {
+					y_temp += spacingH + fontH;
+					int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
+					g2d.drawString(newTitle.substring(0, lengthNew), spacing, y_temp);
+					newTitle = newTitle.substring(lengthNew);
+			   }
+				y_temp = y_temp + fontH +  50;
+			}
+			
+			
 			g2d.setFont(boldFont24);
 			g2d.setColor(new Color(229, 0, 92));
 			g2d.drawString(rule.getInviterRule(), spacing, y_temp);
@@ -3191,21 +3193,21 @@
 		// 鏂囧瓧闂磋窛
 		int fontH = 24;
 		int spacingH = 14;
-		
 		int height = 110 + fontH;
-		// 鏂颁汉濂栧姳瑙勫垯
+		
 		int fontNum = 10;
 		int maxWidth = 590;
+		// 鏂颁汉濂栧姳瑙勫垯
 		String newTitle = rule.getNewTitle();
-		while (newTitle.length() > 0) {
-			height += spacingH + fontH;
-			int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
-			newTitle = newTitle.substring(lengthNew);
-	   }
-		
-		
+		if (!StringUtil.isNullOrEmpty(newTitle)) {
+			while (newTitle.length() > 0) {
+				height += spacingH + fontH;
+				int lengthNew = ImageUtil.getTextLengthByWidth(g2d, font24, newTitle, maxWidth, fontNum);
+				newTitle = newTitle.substring(lengthNew);
+		   }
+			height = height + fontH+ 50;
+		}
 		// 閭�璇蜂汉濂栧姳绾㈠瓧
-		height = height + fontH+ 50;
 		String inviterTitle = rule.getInviterTitle();
 		while (inviterTitle.length() > 0) {
 			height += spacingH + fontH;

--
Gitblit v1.8.0