From cbdaa0559af3b8ae9c8cf8287d30916d5f81ee3c Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 05 十一月 2020 13:56:16 +0800
Subject: [PATCH] 调整showlable

---
 app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java b/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java
index 799fd5d..04bc97c 100644
--- a/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java
+++ b/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java
@@ -212,7 +212,7 @@
             viewHolder.alarmAddress.setText(alarm.get("alarmAddress"));
             viewHolder.alarmTime.setText(alarm.get("alarmTime"));
             viewHolder.property.setText(alarm.get("property"));
-            viewHolder.alarmType.setText("鎶ヨ绫诲瀷: "+alarm.get("alarmType"));
+            viewHolder.alarmType.setText(alarm.get("alarmType") + " " + alarm.get("alarmLevel"));
 
             viewHolder.matchPersonList.setVisibility(View.INVISIBLE);
 
@@ -398,6 +398,7 @@
                 try {
                     long requestVideoUrlBegin = System.currentTimeMillis();
                     String alarmVideo = VideoPath.getVideoUrl(viewHolder.alarm);
+                    System.out.println("alarmVideo="+alarmVideo);
 //                    System.out.println("HomeGridViewAdapter.run alarmVideo="+alarmVideo);
 //                    System.out.println("HomeGridViewAdapter.run 2 " + (!TextUtils.isEmpty(alarmVideo) && alarmVideo.startsWith("http")));
                     if (!TextUtils.isEmpty(alarmVideo) && alarmVideo.startsWith("http")) {

--
Gitblit v1.8.0