Parcourir la source

优化调整代码结构

niujiuru il y a 1 mois
Parent
commit
6d2d7a7546
4 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 1 1
      utils/local_rpc.go
  2. 4 3
      mcu_ctrl_board/proc_json.go
  3. 0 1
      mqtt_reporter/mqtt_client.go
  4. 0 0
      utils/utils.go

+ 1 - 1
utils/local_rpc.go

@@ -1,4 +1,4 @@
-package utils
+package local_rpc
 
 
 import (
 import (
 	"context"
 	"context"

+ 4 - 3
mcu_ctrl_board/proc_json.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"fmt"
 	"strings"
 	"strings"
 
 
+	"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
 )
 )
 
 
@@ -54,12 +55,12 @@ func getSyncData() SyncData {
 	ctx := context.Background()
 	ctx := context.Background()
 
 
 	gpsSta := "0"
 	gpsSta := "0"
-	lat, lng, err := utils.GetGpsPosition(ctx)
+	lat, lng, err := local_rpc.GetGpsPosition(ctx)
 	if err == nil && lat != "" && lng != "" {
 	if err == nil && lat != "" && lng != "" {
 		gpsSta = "1"
 		gpsSta = "1"
 	}
 	}
 
 
-	netOK, netType, imei, iccid, csq, err := utils.GetNetworkInfo(ctx)
+	netOK, netType, imei, iccid, csq, err := local_rpc.GetNetworkInfo(ctx)
 
 
 	sim := "0"
 	sim := "0"
 	if iccid == "" {
 	if iccid == "" {
@@ -77,7 +78,7 @@ func getSyncData() SyncData {
 	}
 	}
 
 
 	photoSta := "0"
 	photoSta := "0"
-	if hk, dh, err := utils.GetCameraCount(ctx); err == nil && hk+dh > 0 {
+	if hk, dh, err := local_rpc.GetCameraCount(ctx); err == nil && hk+dh > 0 {
 		photoSta = "1"
 		photoSta = "1"
 	}
 	}
 
 

+ 0 - 1
mqtt_reporter/mqtt_client.go

@@ -1 +0,0 @@
-package mqttreporter

utils/common.go → utils/utils.go