From aeca1003b8abc4b7e5dfe56228827bbcaae937be Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 18 六月 2020 22:56:43 +0800
Subject: [PATCH] fix pic and video url with new formater
---
app/src/main/java/com/basic/security/manager/AlarmManager.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/basic/security/manager/AlarmManager.java b/app/src/main/java/com/basic/security/manager/AlarmManager.java
index cf97f73..06b44f6 100644
--- a/app/src/main/java/com/basic/security/manager/AlarmManager.java
+++ b/app/src/main/java/com/basic/security/manager/AlarmManager.java
@@ -86,10 +86,10 @@
apiModel.put("alarmPicture", apiModel.remove("picDate"));
}
apiModel.put("alarmPicture",
- apiModel.get("picSmUrl")
+ "http://" + apiModel.get("picSmUrl")
);
apiModel.put("alarmLargePicture",
- apiModel.get("picMaxUrl")
+ "http://" + apiModel.get("picMaxUrl")
);
apiModel.put(Alarm.picDate, picDate);
String picAddress = apiModel.get("picAddress");
@@ -135,17 +135,20 @@
e.printStackTrace();
}
- if (alarmVideo != null && alarmVideo.startsWith("http:")) {
+// if (alarmVideo != null && alarmVideo.startsWith("http:")) {
+ if (alarmVideo != null) {
alarm.put("alarmVideoValid", "true");
} else {
alarm.put("alarmVideoValid", "false");
}
- if (alarmPicture != null && alarmPicture.startsWith("http:")) {
+// if (alarmPicture != null && alarmPicture.startsWith("http:")) {
+ if (alarmPicture != null) {
alarm.put("alarmPictureValid", "true");
} else {
alarm.put("alarmPictureValid", "false");
}
- if (alarmLargePicture != null && alarmLargePicture.startsWith("http:")) {
+// if (alarmLargePicture != null && alarmLargePicture.startsWith("http:")) {
+ if (alarmLargePicture != null) {
alarm.put("alarmLargePictureValid", "true");
} else {
alarm.put("alarmLargePictureValid", "false");
--
Gitblit v1.8.0