From 78c7b03e279cad29a6123e83da738edc1f00280c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:55:41 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java | 59 ++++++++++++++++++++---------------------------------------
1 files changed, 20 insertions(+), 39 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
index a43f36d..bd05d86 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -112,14 +112,14 @@
*
* @param ledCode
*/
- public void clear(String ledCode) {
+ public String clear(String ledCode) {
String postBody = new Gson().toJson(new Clear());
//璇锋眰鍦板潃
String url = realtimeServerBean.getCommand() + ledCode;
//璇锋眰
-// poleLightemitService.updateRequestBody(ledCode, "");
String result = post(url, postBody);
LogUtils.error("娓呭睆缁撴灉:" + result);
+ return result;
}
/**
@@ -129,10 +129,9 @@
* @param username
*/
public void postHtml(String ledCode, String username) {
-
+ //html缃戦〉鍐呭
PostHtml postHtml = new PostHtml(realtimeServerBean.getUrl() + username + "_" + ledCode + ".html");
String postBody = new Gson().toJson(postHtml);
-
//璇锋眰鍦板潃
String url = realtimeServerBean.getCommand() + ledCode;
//淇濆瓨led鏁版嵁
@@ -197,7 +196,6 @@
* @param ledCode
*/
public void clearVideoPlay(String ledCode) {
-// poleLightemitService.updateRequestBody(ledCode, "");
this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new ClearVideoPlay()));
}
@@ -207,7 +205,6 @@
* @param ledCode
*/
public void clearPlayerTask(String ledCode) {
-// poleLightemitService.updateRequestBody(ledCode, "");
this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new ClearPlayerTask()));
}
@@ -236,7 +233,6 @@
return "";
}
String re;
-
try {
re = JSONObject.parseObject(result).get("result").toString();
} catch (Exception e) {
@@ -258,8 +254,8 @@
* @return
*/
public String getIsScreenOpen(String ledCode) {
+ //鍙戦�佸睆骞曟槸鍚﹀紑鍚殑鎸囦护
String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
- //鑾峰彇base64鍥剧墖鏁版嵁
if (StringUtils.isNotBlank(result)) {
String re;
try {
@@ -273,35 +269,20 @@
}
}
- /*
- 鍚姩xwalk
+
+ public boolean getLedOnLine(String ledCode) {
+ //閫氳繃灞忓箷鏄惁寮�鍚寚浠よ幏鍙栧睆骞曟槸鍚﹀湪绾�
+ String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
+ result = result.trim();
+ return result.startsWith("{") && result.endsWith("}");
+ }
+
+
+ /**
+ * 鎺у埗灞忓箷寮�鍏�
*/
- /*public void startActivity(String ledCode){
- String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new StartActivity()));
- }*/
-
- /*
- 浣跨敤xwalk鍔犺浇缃戦〉
- */
- /*public void callXwalkFn(String ledCode,String username){
-
- CallXwalkFn callXwalkFn = new CallXwalkFn();
-
- callXwalkFn.setArgUrl(realtimeServerBean.getUrl() + username + "_" + ledCode + ".html");
- String postBody = new Gson().toJson(callXwalkFn);
-
- //璇锋眰鍦板潃
- String url = realtimeServerBean.getCommand() + ledCode;
- //璇锋眰
- String result = post(url,postBody);
- }*/
-
- /*
- 鎺у埗灞忓箷寮�鍏�
- */
public String setScreenOpen(String ledCode, Boolean bool) {
String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new setScreenOpen(bool)));
- //鑾峰彇base64鍥剧墖鏁版嵁
if (StringUtils.isNotBlank(result)) {
String re = "";
try {
@@ -324,8 +305,8 @@
// this.post(realtimeServerBean.getCommand() + lightemitControlCode, poleLightemitEntity.getRequestBody());
// }
- /*
- 璁剧疆led闊抽噺
+ /**
+ * 璁剧疆led闊抽噺
*/
public void setVoiume(String ledCode, Integer volume) {
@@ -339,9 +320,9 @@
}
- /*
- 璁剧疆led浜害
- */
+ /**
+ * 璁剧疆led浜害
+ */
public void setBrightness(String ledCode, Integer brightness) {
SetBrightness setBrightness = new SetBrightness();
--
Gitblit v1.9.3