From e3b3b542a7d5f1b627805f9d5e56e66ea62568fc Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期六, 29 六月 2019 17:59:15 +0800
Subject: [PATCH] can use with web and camera

---
 main.go |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/main.go b/main.go
index 776205f..be51039 100644
--- a/main.go
+++ b/main.go
@@ -1,28 +1,37 @@
 package main
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	_ "net/http/pprof"
 
 	"github.com/long/test/camera"
-
-	//	"github.com/long/test/httpclient"
 	"github.com/long/test/sdk"
 	"github.com/long/test/tasktag"
-	"time"
+	"github.com/long/test/util"
+
+	//	"github.com/long/test/camera"
+	//	"github.com/long/test/sdk"
+	//	"github.com/long/test/tasktag"
 )
 
+var initchan = make(chan bool)
+
 func main() {
+
 	// pprof 鐢ㄤ簬鍒嗘瀽鎬ц兘
 	go func() {
-		log.Println(http.ListenAndServe("192.168.1.123:6060", nil))
+		log.Println(http.ListenAndServe("0.0.0.0:6060", nil))
 	}()
 
-	sdk.Init()     //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
-	tasktag.Init() // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
-	camera.Init()  //鑾峰彇cid, taskid, sdkid ,鍏崇郴
-	for {
-		time.Sleep(time.Second)
-	}
+	go util.Init(initchan)
+
+	fmt.Println("init ok !!!!, start sdk, task, camera init process ....", <-initchan)
+	fmt.Println()
+	fmt.Println()
+	sdk.Init()        //  鑾峰彇鎵�鏈夌畻娉昳d ,寤虹珛 sdk 涓婚锛� 寤虹珛sdk server(send, recv 杩愯)
+	tasktag.Init()   // 鑾峰彇鎵�鏈変换鍔★紝寤虹珛浠诲姟鏍囩锛� 鍦ㄦ暟鎹繘鍏ユ椂锛� 鎵撴爣绛�
+	camera.Init()   //鑾峰彇cid, taskid, sdkid ,鍏崇郴
+	select {}
 }

--
Gitblit v1.8.0