From 5d208a214181394251e0ebea069a52b81b21a762 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 05 八月 2022 10:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
index 7850ebf..40f4d79 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
@@ -19,6 +19,7 @@
//HTML - 缃戦〉濯掍綋
//STREAM_MEDIA - 娴佸獟浣�
//BOX - 绐楀彛
+ //WEATHER - 绠�鏄撳ぉ姘旂粍浠�
private PlayerWidgetType type;
// 鍥剧墖鍜岃棰戜负蹇呭～椤癸紝鍐呭涓哄浘鐗囨垨瑙嗛鐨刴d5鍊�
private String md5;
@@ -47,12 +48,52 @@
// html缁勪欢绂荤嚎鎾斁濯掍綋锛堝畾鍒跺姛鑳斤級
private PlayerOffline offline;
- public PlayerWidget generateMediaWidget (String widgetName,
- Integer zIndex,
- PlayerWidgetType playerWidgetType,
- LEDProgramFile file,
- PlayerLayout playerLayout,
- PlayerAnimation animation) {
+
+ private String address;
+
+ private Double latitude;
+
+ private Double longitude;
+
+ private Integer width;
+
+ private Integer height;
+
+ private Integer refreshPeriod;
+
+ private Integer fontSize;
+
+ private Boolean bold;
+
+ private Boolean italic;
+
+ private Boolean underline;
+
+ private String color;
+
+ private Integer tempUnit;
+
+ private Integer unitSymbol;
+
+ private Boolean weatherEnable;
+
+ private Boolean tempEnable;
+
+ private Boolean windEnable;
+
+ private Boolean humidEnable;
+
+ private Boolean currentTempEnable;
+
+ private Boolean isShowInOneLine;
+
+
+ public PlayerWidget generateMediaWidget(String widgetName,
+ Integer zIndex,
+ PlayerWidgetType playerWidgetType,
+ LEDProgramFile file,
+ PlayerLayout playerLayout,
+ PlayerAnimation animation) {
this.setName(widgetName);
this.setZIndex(zIndex);
this.setType(playerWidgetType);
@@ -65,13 +106,13 @@
return this;
}
- public PlayerWidget generateScrollUpTextWidget (String widgetName,
- Integer zIndex,
- Long duration,
- List<String> content,
- String contentColor,
- Integer fontSize,
- PlayerLayout playerLayout) {
+ public PlayerWidget generateScrollUpTextWidget(String widgetName,
+ Integer zIndex,
+ Long duration,
+ List<String> content,
+ String contentColor,
+ Integer fontSize,
+ PlayerLayout playerLayout) {
this.setName(widgetName);
this.setZIndex(zIndex);
this.setType(PlayerWidgetType.ARCH_TEXT);
@@ -79,7 +120,7 @@
this.setBackgroundColor("#00000000");
this.setScrollAttribute(
new PlayerWidgetScrollAttribute(
- PlayerWidgetScrollAttributeAnimation.MARQUEE_UP,1
+ PlayerWidgetScrollAttributeAnimation.MARQUEE_UP, 1
)
);
this.setDuration(duration);
@@ -87,7 +128,7 @@
List<PlayerWidgetLine> playerWidgetLineList = new ArrayList<>();
- for(String str: content) {
+ for (String str : content) {
PlayerWidgetLine playerWidgetLine = new PlayerWidgetLine();
List<PlayerWidgetLineTextAttributes> playerWidgetLineTextAttributesList =
new ArrayList<>();
@@ -124,7 +165,7 @@
this.setBackgroundColor("#00000000");
this.setScrollAttribute(
new PlayerWidgetScrollAttribute(
- PlayerWidgetScrollAttributeAnimation.MARQUEE_LEFT,2
+ PlayerWidgetScrollAttributeAnimation.MARQUEE_LEFT, 2
)
);
this.setDuration(duration);
@@ -150,4 +191,7 @@
return this;
}
+
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3