|
@@ -97,13 +97,21 @@ func cidrEqualSemantic(a, b string) (bool, error) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func ModuleInit(supportsGige bool, eth1AddrCIDR, gigeAddrCIDR string) bool {
|
|
func ModuleInit(supportsGige bool, eth1AddrCIDR, gigeAddrCIDR string) bool {
|
|
|
- var err error
|
|
|
|
|
- var gigeCameraIP net.IP
|
|
|
|
|
|
|
+ if !hk_takephoto.ModuleInit() {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if !dh_takephoto.ModuleInit() {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if !supportsGige {
|
|
if !supportsGige {
|
|
|
- goto initOK
|
|
|
|
|
|
|
+ return true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ var err error
|
|
|
|
|
+ var gigeCameraIP net.IP
|
|
|
|
|
+
|
|
|
if equal, err := cidrEqualSemantic(eth1AddrCIDR, gigeAddrCIDR); !equal {
|
|
if equal, err := cidrEqualSemantic(eth1AddrCIDR, gigeAddrCIDR); !equal {
|
|
|
baseapp.Logger.Errorf("[%s] 网口相机初始化失败: 设备与主机-网段不匹配: %v!!", MODULE_NAME, err)
|
|
baseapp.Logger.Errorf("[%s] 网口相机初始化失败: 设备与主机-网段不匹配: %v!!", MODULE_NAME, err)
|
|
|
return false
|
|
return false
|
|
@@ -122,7 +130,7 @@ func ModuleInit(supportsGige bool, eth1AddrCIDR, gigeAddrCIDR string) bool {
|
|
|
|
|
|
|
|
err = PingOnce(gigeCameraIP.String(), 1)
|
|
err = PingOnce(gigeCameraIP.String(), 1)
|
|
|
if err == nil {
|
|
if err == nil {
|
|
|
- goto initOK
|
|
|
|
|
|
|
+ return true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
PowerOnGigeCamera(false)
|
|
PowerOnGigeCamera(false)
|
|
@@ -148,15 +156,6 @@ func ModuleInit(supportsGige bool, eth1AddrCIDR, gigeAddrCIDR string) bool {
|
|
|
return false
|
|
return false
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-initOK:
|
|
|
|
|
- if !hk_takephoto.ModuleInit() {
|
|
|
|
|
- return false
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- if !dh_takephoto.ModuleInit() {
|
|
|
|
|
- return false
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|
|
|
|
|
|