From 2d1d10f7223607647980cf2645e43e81eec58baf Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Mon, 27 Nov 2023 15:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3300=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=99=A4=E6=91=A9=E5=B0=94=E7=BA=B9=E8=AF=AF=E8=A2=AB=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner_300.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp
index bd83910..eeca6b9 100644
--- a/hgdriver/hgdev/hg_scanner_300.cpp
+++ b/hgdriver/hgdev/hg_scanner_300.cpp
@@ -87,14 +87,6 @@ hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) :
 	,papersize(pid)
 	,is_devs_sleep_(false)
 {
-	if (init_settings(pid_))
-	{
-		if (pid_ == 0x300)
-			init_settings((jsontext1 + jsontext2 + jsontext3).c_str());
-		else
-			init_settings((jsontext4 + jsontext5 + jsontext6).c_str());
-	}
-
 	dsp_config.value = 0;
 	dsp_config.params_3288.enableLed = 1; //默认值
 	dsp_config.params_3288.isCorrect = 1;
@@ -128,6 +120,14 @@ hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) :
 	init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
 #endif
 	
+	if (init_settings(pid_))
+	{
+		if (pid_ == 0x300)
+			init_settings((jsontext1 + jsontext2 + jsontext3).c_str());
+		else
+			init_settings((jsontext4 + jsontext5 + jsontext6).c_str());
+	}
+
 	if (firmware_sup_boardTime)
 		update_boarddatetime();//暂未考虑版本兼容情况
 	//wait_read_int.notify();