From cecfe3aafb8424e74b6b4fab0f212c88f025af18 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 13 十二月 2019 18:16:11 +0800
Subject: [PATCH] getDevInfo ret CutVideoLen
---
extend/util/util.go | 88 +++++++++++++-------------------------------
1 files changed, 26 insertions(+), 62 deletions(-)
diff --git a/extend/util/util.go b/extend/util/util.go
index 16aecd5..f3dc879 100644
--- a/extend/util/util.go
+++ b/extend/util/util.go
@@ -1,21 +1,18 @@
package util
import (
- "basic.com/pubsub/protomsg.git"
"bytes"
"encoding/json"
- "errors"
- "github.com/gin-gonic/gin"
- "github.com/golang/glog"
- "github.com/pierrec/lz4"
- "gocv.io/x/gocv"
"image"
"io/ioutil"
- "net"
"net/http"
- "os/exec"
"strconv"
"webserver/extend/code"
+
+ "basic.com/pubsub/protomsg.git"
+ "github.com/gin-gonic/gin"
+ "github.com/pierrec/lz4"
+ "gocv.io/x/gocv"
"crypto/rand"
"fmt"
@@ -38,7 +35,6 @@
// ResponseFormat 杩斿洖鏁版嵁鏍煎紡鍖�
func ResponseFormat(c *gin.Context, respStatus *code.Code, data interface{}) {
if respStatus == nil {
- glog.Error("response status param not found!")
respStatus = code.RequestParamError
}
c.JSON(respStatus.Status, gin.H{
@@ -60,14 +56,14 @@
//struct杞琺ap
func Struct2Map(obj interface{}) map[string]interface{} {
- resultMap :=make(map[string]interface{},0)
+ resultMap := make(map[string]interface{}, 0)
bytesData, err := json.Marshal(obj)
- if err !=nil {
+ if err != nil {
return resultMap
}
json.Unmarshal(bytesData, &resultMap)
return resultMap
-
+
//
//t := reflect.TypeOf(obj)
//v := reflect.ValueOf(obj)
@@ -79,21 +75,21 @@
//return data
}
-func ReadImgData(url string) ([]byte,error) {
- resp,err := http.Get(url)
- if err !=nil {
- return nil,err
+func ReadImgData(url string) ([]byte, error) {
+ resp, err := http.Get(url)
+ if err != nil {
+ return nil, err
}
defer resp.Body.Close()
- pix,err := ioutil.ReadAll(resp.Body)
- if err !=nil {
- return nil,err
+ pix, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return nil, err
}
- return pix,nil
+ return pix, nil
}
// 鎸夊昂瀵稿幓鍒囧浘
-func SubImg(i protomsg.Image, x0, y0, x1, y1 int, ) []byte {
+func SubImg(i protomsg.Image, x0, y0, x1, y1 int) []byte {
img, _ := gocv.NewMatFromBytes(int(i.Height), int(i.Width), gocv.MatTypeCV8UC3, i.Data)
rect := image.Rect(EnlargeSize(x0, y0, x1, y1, i))
region := img.Region(rect)
@@ -135,46 +131,6 @@
return
}
-
-// 鑾峰彇鏈満缃戝崱IP
-func GetLocalIP(networkName string) (ipv4 string,mask string, err error) {
- interfaces, err := net.Interfaces()
- if err != nil {
- return "","", err
- }
-
- for _, i := range interfaces {
- byName, err := net.InterfaceByName(i.Name)
- if err != nil {
- return "","", err
- }
- addresses, err := byName.Addrs()
- for _, v := range addresses {
- if ipnet, ok:=v.(*net.IPNet);ok && !ipnet.IP.IsLoopback(){
- if ipnet.IP.To4() !=nil{
- if byName.Name == networkName{
- maskStr := ipnet.Mask.String()
- mask64, _ := strconv.ParseUint(maskStr, 16, 32)
- return ipnet.IP.String(),IpIntToString(int(mask64)),nil
- }
- }
- }
- }
- }
- return "","", errors.New("ipv4 not found")
-}
-
-func GetDefaultRoute(networkName string)(route string,err error){
- cmdStr := fmt.Sprintf("route | grep -P \"^default.*%s$\" | awk '{print $2}'",networkName)
- cmd := exec.Command("/bin/sh","-c",cmdStr)
- b, err := cmd.Output()
- if err!=nil{
- return "",err
- }
- return string(b),nil
-
-}
-
func StringIpToInt(ipstring string) int {
ipSegs := strings.Split(ipstring, ".")
var ipInt int = 0
@@ -188,7 +144,7 @@
return ipInt
}
-func IpIntToString(ipInt int) string{
+func IpIntToString(ipInt int) string {
ipSegs := make([]string, 4)
var len int = len(ipSegs)
buffer := bytes.NewBufferString("")
@@ -215,6 +171,14 @@
return float32(f)
}
+func ParseScore64(compareScore float64) float64 {
+ if compareScore < 1 {
+ compareScore = compareScore * 100
+ }
+ f, _ := strconv.ParseFloat(fmt.Sprintf("%2.2f", compareScore), 64)
+ return f
+}
+
// UnCompress uncompress
func UnCompress(in []byte) ([]byte, error) {
out := make([]byte, 10*len(in))
--
Gitblit v1.8.0