优化修改代码

camera/camera.go

@@ -96,25 +96,25 @@ func cidrEqualSemantic(a, b string) (bool, error) {
 	return na.IP.Equal(nb.IP) && onesA == onesB && bitsA == bitsB, nil
 }
 
-func ModuleInit(supportsGigeCamera bool, eth1CIDR, gigeCameraCIDR string) bool {
+func ModuleInit(supportsGige bool, eth1AddrCIDR, gigeAddrCIDR string) bool {
 	var err error
 	var gigeCameraIP net.IP
 
-	if !supportsGigeCamera {
+	if !supportsGige {
 		goto initOK
 	}
 
-	if equal, err := cidrEqualSemantic(eth1CIDR, gigeCameraCIDR); !equal {
+	if equal, err := cidrEqualSemantic(eth1AddrCIDR, gigeAddrCIDR); !equal {
 		baseapp.Logger.Errorf("[%s] 网口相机初始化失败: 设备与主机-网段不匹配: %v!!", MODULE_NAME, err)
 		return false
 	}
 
-	if err := SetupEth1ForGigeCamera(eth1CIDR); err != nil {
+	if err := SetupEth1ForGigeCamera(eth1AddrCIDR); err != nil {
 		baseapp.Logger.Errorf("[%s] 网口相机初始化失败: 设置\"eth1\"地址失败: %v!!", MODULE_NAME, err)
 		return false
 	}
 
-	gigeCameraIP, _, err = net.ParseCIDR(gigeCameraCIDR)
+	gigeCameraIP, _, err = net.ParseCIDR(gigeAddrCIDR)
 	if err != nil {
 		baseapp.Logger.Errorf("[%s] 网口相机初始化失败: 解析网口-相机地址失败: %v!!", MODULE_NAME, err)
 		return false