From ccd91dc0d66c6ebf704f7c4fd82f28a88c746148 Mon Sep 17 00:00:00 2001
From: 13038267101 <mo1027728827@qq.com>
Date: Wed, 15 Nov 2023 11:50:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E9=94=81=E5=AE=9A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index f7effaf..2d5c470 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -543,9 +543,21 @@ int hg_scanner::set_server_blacklist_lock()
 	//优先从机器设备上进行校验
 	int ret = HGVersion_Islock_(HGVersion_mgr_, snbuffer, &islock);
 	int islock_file = 0;
+
+	ret = get_dev_islock_file(islock_file);
+	if (islock_file && islock )
+	{
+		is_checksum_strat_scan = false;;
+		return SCANNER_ERR_DEVICE_ISLOCK;
+	}
+	if (!islock_file && !islock)
+	{
+		is_checksum_strat_scan = true;
+		return SCANNER_ERR_OK;
+	}
+
 	if (ret != 0) //服务器没有连接到网络
 	{
-		ret = get_dev_islock_file(islock_file);
 		is_checksum_strat_scan = islock_file <= 0 ? true : false; //使用校验码来进行扫描，以后只会使用这种方法进行扫描
 		VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "net is 404 , devs list is:%d\n", islock_file);
 	}