fix pic and video url with new formater

zhangzengfei

2020-06-18 aeca1003b8abc4b7e5dfe56228827bbcaae937be

fix pic and video url with new formater

 app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java

@@ -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")) {

 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");

 app/src/main/java/com/basic/security/utils/SocketClient.java

@@ -84,7 +84,7 @@
    public native String receive();

    public static void parseJson(String msg) {

        System.out.println("remote msg:" + msg);
        JsonParser parser = new JsonParser();
        boolean isJSON = true;
        JsonElement element = null;

 app/src/main/java/com/basic/security/utils/VideoPath.java

@@ -1,5 +1,6 @@
package com.basic.security.utils;

import com.basic.security.manager.SettingManager;
import com.basic.security.model.Alarm;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
@@ -19,12 +20,13 @@
import java.util.Map;

public class VideoPath {
    static Gson gson = new Gson();

    public static String getVideoUrl(Map<String, String> alarm) {
        String videoUrl = "";
        String Server = SettingManager.getIpStr();
        String Port = "6000";
        String base_url = "http://" + Server + ":" + Port + "/basic/api/androidAlarm/es/";

        try {
            String base_url = "192.168.20.10:6000/basic/api/androidAlarm/es/";
            String alarmId = alarm.get(Alarm.id);

            URL url = new URL(base_url+alarmId);
@@ -39,14 +41,14 @@
                InputStream in = new BufferedInputStream(conn.getInputStream());
                String response = org.apache.commons.io.IOUtils.toString(in, "UTF-8");

                System.out.println("videoUrl response :" + response);
//                System.out.println("videoUrl response :" + response);
                boolean isJSON = true;
                JsonParser parser = new JsonParser();
                JsonElement element = null;
                try {
                    element = parser.parse(response);
                } catch (JsonParseException e) {
                    System.out.println("exception: " + response + " " + e);
                    System.out.println("videoUrl exception: " + response + " " + e);
                    isJSON = false;
                }

@@ -54,17 +56,15 @@
                    Object obj =  element.getAsJsonObject().getAsJsonObject("data").get("videoUrl");
                    String result = obj.toString();
                    if (result.length() > 0) {
                        videoUrl = "http://" + result;
                        videoUrl = result;
                    }
                }
                in.close();
                conn.disconnect();
            }
        } catch (Exception e) {
            System.out.println("VideoPath.getVideoUrl " + e.getMessage());
            System.out.println("videoUrl VideoPath.getVideoUrl " + e.getMessage());
        }

        System.out.println("videoUrl :" + videoUrl);
        return videoUrl;
    }