优化修改海康U口相机模块包名

Makefile

@@ -29,15 +29,15 @@ SETGO_ENV = \
 DATE := $(shell date +%Y%m%d_%H%M%S)
 
 # 编译的目标
-all : mvs_u_takephoto.out air720u_4g.out rtu_linux_modules.out
+all : hk_u_takephoto.out air720u_4g.out rtu_linux_modules.out
 
 # 通用基础库
 libswapi.a :
 	$(MAKE) -C swapi target=$(target) $@
 
 # 海康机器人
-libmvs_u_takephoto.a :
-	$(MAKE) -C mvs_u_takephoto target=$(target) $@
+libhk_u_takephoto.a :
+	$(MAKE) -C hk_u_takephoto target=$(target) $@
 
 # "Air720U"
 libair720u.a :
@@ -56,16 +56,16 @@ libymodem.a :
 	$(MAKE) -C ymodem target=$(target)  $@
 
 # 海康相机拍照测试
-LIB1 := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_u_takephoto -lmvs_u_takephoto
+LIB1 := -Wl,-Bstatic -L./swapi -lswapi -L./hk_u_takephoto -lhk_u_takephoto
 ifeq ($(target),armv7hf)
-  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/armv7hf/. -lMvCameraControl
+  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/hk_u_takephoto/lib/armv7hf/. -lMvCameraControl
 else
-  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/x86_64/64 -lMvCameraControl
+  LIB1 += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/hk_u_takephoto/lib/x86_64/64 -lMvCameraControl
 endif
-mvs_u_takephoto.out : libswapi.a libmvs_u_takephoto.a ./tests/mvs_u_takephoto/main.go
+hk_u_takephoto.out : libswapi.a libhk_u_takephoto.a ./tests/hk_u_takephoto/main.go
 	mkdir -p ./build/takephoto_test
 	$(GO) mod tidy
-	$(SETGO_ENV) CGO_LDFLAGS="$(LIB1)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./tests/mvs_u_takephoto/main.go
+	$(SETGO_ENV) CGO_LDFLAGS="$(LIB1)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./tests/hk_u_takephoto/main.go
 	@cp $@ ./build/takephoto_test/$(basename $@)_$(DATE)$(suffix $@)
 	rm -rf $@
 
@@ -88,13 +88,13 @@ ec200u_4g.out : libswapi.a libec200u.a ./tests/ec200u/main.go
 	rm -rf $@
 
 # 主测试程序
-LIBS := -Wl,-Bstatic -L./swapi -lswapi -L./mvs_u_takephoto -lmvs_u_takephoto -L./air720u -lair720u -L./air530z -lair530z -L./ec200u -lec200u
+LIBS := -Wl,-Bstatic -L./swapi -lswapi -L./hk_u_takephoto -lhk_u_takephoto -L./air720u -lair720u -L./air530z -lair530z -L./ec200u -lec200u
 ifeq ($(target),armv7hf)
-  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/armv7hf/. -lMvCameraControl
+  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/hk_u_takephoto/lib/armv7hf/. -lMvCameraControl
 else
-  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/mvs_u_takephoto/lib/x86_64/64 -lMvCameraControl
+  LIBS += -Wl,-Bdynamic -lc -lm -ldl -lpthread -L$(PWD)/hk_u_takephoto/lib/x86_64/64 -lMvCameraControl
 endif
-rtu_linux_modules.out : libswapi.a libmvs_u_takephoto.a libair720u.a libair530z.a libec200u.a ./main.go
+rtu_linux_modules.out : libswapi.a libhk_u_takephoto.a libair720u.a libair530z.a libec200u.a ./main.go
 	mkdir -p ./build
 	$(GO) mod tidy
 	$(SETGO_ENV) CGO_LDFLAGS="$(LIBS)" $(GO_BUILD) $(GO_FLAGS) -o $@ ./main.go
@@ -103,7 +103,7 @@ rtu_linux_modules.out : libswapi.a libmvs_u_takephoto.a libair720u.a libair530z.
 # 编译的清理
 clean :
 	make -C ./swapi clean
-	make -C ./mvs_u_takephoto clean
+	make -C ./hk_u_takephoto clean
 	make -C ./air720u clean
 	make -C ./air530z clean
 	make -C ./ec200u  clean

hk_u_takephoto/Makefile

@@ -32,12 +32,12 @@ else
 endif
 
 # 编译和清理
-build : libmvs_u_takephoto.a takephoto_test.out hkcam_reset.out
+build : libhk_u_takephoto.a takephoto_test.out hkcam_reset.out
 
 %.o : %.c
 	$(CC) $(DEFINS) $(CFLAGS) -c $< $(INCS) -o $@
 
-libmvs_u_takephoto.a : $(OBJS)
+libhk_u_takephoto.a : $(OBJS)
 	$(AR) -cr $@ $(OBJS)
 
 hkcam_reset.out : $(OBJS) hkcam_reset.c

hk_u_takephoto/bridge.go

@@ -1,7 +1,7 @@
 // Author: NiuJiuRu
 // Email: niujiuru@qq.com
 
-package mvs_u_takephoto
+package hk_u_takephoto
 
 /*
 #include "takephoto.h"

hk_u_takephoto/takephoto.go

@@ -1,4 +1,4 @@
-package mvs_u_takephoto
+package hk_u_takephoto
 
 import (
 	"time"

main.go

@@ -7,7 +7,7 @@ import (
 
 	gps "hnyfkj.com.cn/rtu/linux/air530z"
 	baseapp "hnyfkj.com.cn/rtu/linux/baseapp"
-	camera1 "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto" // 海康U口相机
+	camera1 "hnyfkj.com.cn/rtu/linux/hk_u_takephoto" // 海康U口相机
 	netmgrd "hnyfkj.com.cn/rtu/linux/netmgrd"
 	"hnyfkj.com.cn/rtu/linux/sshd"
 )

package/armv7hf.sh

@@ -25,12 +25,12 @@ chmod a+x "${pkg_dir}/script/"*
 
 echo "3, Creating lib directory and copying library files..."
 mkdir -p "${pkg_dir}/lib"
-use_cam="mvs_u_takephoto"  # 使用海康U口相机
+use_cam="hk_u_takephoto"  # 使用海康U口相机
 cam_dir="${pre_dir}/${use_cam}"
 cp -rf "${cam_dir}/lib/armv7hf/"* "${pkg_dir}/lib/"
 
 echo "4, Building hkcam_reset..."
-if [ "$use_cam" = "mvs_u_takephoto" ]; then
+if [ "$use_cam" = "hk_u_takephoto" ]; then
   make -C "${cam_dir}" clean
   make -C "${cam_dir}" target=armv7hf hkcam_reset.out
   cp -rf "${cam_dir}/hkcam_reset.out" "${pkg_dir}/"

tests/mvs_u_takephoto/main.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
-	camera "hnyfkj.com.cn/rtu/linux/mvs_u_takephoto"
+	camera "hnyfkj.com.cn/rtu/linux/hk_u_takephoto"
 )
 
 func main() {