From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
index dfbda52..3bc0f54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/ClientTextStyleVO.java
@@ -1,8 +1,19 @@
package com.yeshi.fanli.vo.msg;
+import java.io.Serializable;
+
import com.google.gson.annotations.Expose;
-public class ClientTextStyleVO {
+public class ClientTextStyleVO implements Serializable{
+
+ public final static String COLOR_TITLE = "#888888";
+ public final static String COLOR_CONTENT = "#000000";
+ public final static String COLOR_HIGHLIGHT_CONTENT = "#E5005C";
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
@Expose
private String content;
@Expose
@@ -11,6 +22,9 @@
private String bottomColor;
@Expose
private String img;
+ @Expose
+ private String fontSize = "1"; // 瀛椾綋鍊嶆暟
+
public ClientTextStyleVO(String content, String color) {
this.content = content;
@@ -20,6 +34,13 @@
public ClientTextStyleVO(String content, String color, String img) {
this.content = content;
this.color = color;
+ this.img = img;
+ }
+
+ public ClientTextStyleVO(String content, String color, String bottomColor, String img) {
+ this.content = content;
+ this.color = color;
+ this.bottomColor = bottomColor;
this.img = img;
}
@@ -61,4 +82,12 @@
public void setBottomColor(String bottomColor) {
this.bottomColor = bottomColor;
}
+
+ public String getFontSize() {
+ return fontSize;
+ }
+
+ public void setFontSize(String fontSize) {
+ this.fontSize = fontSize;
+ }
}
--
Gitblit v1.8.0