Browse Source

修改协议为ws

hexiao 1 year ago
parent
commit
566da5e17e

+ 2 - 2
.idea/compiler.xml

@@ -7,10 +7,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="hazard-admin" />
         <module name="hazard-sdk" />
-        <module name="base-admin" />
         <module name="business-service" />
+        <module name="hazard-admin" />
+        <module name="base-admin" />
       </profile>
     </annotationProcessing>
   </component>

+ 12 - 12
.idea/jarRepositories.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="public" />
       <option name="name" value="aliyun nexus" />
@@ -18,8 +8,8 @@
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
@@ -36,6 +26,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="custom_group" />
       <option name="name" value="Nexus Repository" />
@@ -46,5 +41,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

+ 15 - 11
hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -138,24 +138,28 @@ public class CameraUtil {
      * @param channel    相机通道
      * @return
      */
-    public static String getPlayFlv(String cameraCode, String channel, boolean flay) {
-//        if (!flay) {
-//            return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
-//        }
-//        return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
-
+    public static String getPlayFlv(String cameraCode, String channel, boolean flay, String format) {
 
+        if (!ObjectUtils.isEmpty(format) && "HTTP-FLV".equals(format)) {
+            if (!flay) {
+                return bakUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+            }
+            return webUrl + "/hdl/" + channel + "/" + cameraCode + ".flv";
+        }
         return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+    }
 
+    public static String getPlayFlv(String cameraCode, String channel, String format) {
+        return getPlayFlv(cameraCode, channel, true, format);
+    }
 
-//        if (!flay) {
-//            return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
-//        }
-//        return webUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
+    public static String getPlayFlv(String cameraCode, String channel, boolean flay) {
+        return getPlayFlv(cameraCode, channel, flay, "WS-FLV");
     }
 
     public static String getPlayFlv(String cameraCode, String channel) {
-        return getPlayFlv(cameraCode, channel, true);
+        // WS-FLV     HTTP-FLV
+        return getPlayFlv(cameraCode, channel, true, "HTTP-FLV");
     }
 
     /**