From e0696bd9b6f2a1111569d4e8e35a94c562ce2d08 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 27 Oct 2023 15:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8E=B7=E5=8F=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=97=B6=E9=97=B4=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8linux=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=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_239.cpp | 22 ++++++++++++----------
 hgdriver/hgdev/hg_scanner_300.cpp | 13 ++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp
index d55012c..9e2c1bf 100644
--- a/hgdriver/hgdev/hg_scanner_239.cpp
+++ b/hgdriver/hgdev/hg_scanner_239.cpp
@@ -544,10 +544,10 @@ void hg_scanner_239::init_version(void)
 	string devType;
 	string year_date = fv.substr(4, 6);
 
-	firmware_sup_double_check = year_date.compare("231021") >= 0 ? true : false;
-	firmware_sup_dirty_check = year_date.compare("231021") >= 0 ? true : false;
-	firmware_sup_backup_restore = year_date.compare("231021") >= 0 ? true : false;
-	firmware_sup_boardTime = year_date.compare("231021") >= 0 ? true : false;
+	firmware_sup_double_check = year_date.compare("3C1021") >= 0 ? true : false;
+	firmware_sup_dirty_check = year_date.compare("3C1021") >= 0 ? true : false;
+	firmware_sup_backup_restore = year_date.compare("3C1021") >= 0 ? true : false;
+	firmware_sup_boardTime = year_date.compare("3C1021") >= 0 ? true : false;
 
 	if (dev == "G1" || dev == "G2")
 	{
@@ -571,7 +571,7 @@ void hg_scanner_239::init_version(void)
 		firmware_sup_pick_strength_ = false;	//不支持
 		firmware_sup_wake_device_	= year_date.compare("3C0518") >= 0 ? true : false;
 		firmware_sup_color_corr_	= year.compare("3C") >= 0 ? true : false;
-		firmware_sup_double_img		= false;	//不支持
+		firmware_sup_double_img		= year_date.compare("3C1021") >= 0 ? true : false;
 		firmware_sup_devs_lock_		= year.compare("3C") >= 0  ? true : false;
 		firmware_sup_dpi_300		= false;
 		firmware_sup_dpi_600		= true;
@@ -1252,11 +1252,13 @@ int hg_scanner_239::update_boarddatetime()
 	std::string datenow;
 	datenow.resize(len);
 
-	auto t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-	std::cout << std::put_time(std::localtime(&t), "%F %T") << std::endl;
-	std::stringstream ss;
-	ss << std::put_time(std::localtime(&t), "%F %T");
-	std::string str = ss.str();
+	time_t now_time;
+	struct tm* info;
+	char buffer[32];
+	time(&now_time);
+	info = localtime(&now_time);
+	strftime(buffer, 32, "%Y-%m-%d %H:%M:%S", info);
+	std::string str = buffer;
 
 	ret = write_register(setting3399::SR_SET_ARM_DATETIME, len);
 	if (ret != SCANNER_ERR_OK)
diff --git a/hgdriver/hgdev/hg_scanner_300.cpp b/hgdriver/hgdev/hg_scanner_300.cpp
index 7227812..d420326 100644
--- a/hgdriver/hgdev/hg_scanner_300.cpp
+++ b/hgdriver/hgdev/hg_scanner_300.cpp
@@ -901,11 +901,14 @@ int hg_scanner_300::update_boarddatetime()
 	}
 
 	//获取当前系统时间
-	auto t = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-	std::cout << std::put_time(std::localtime(&t), "%F %T") << std::endl;
-	std::stringstream ss;
-	ss << std::put_time(std::localtime(&t), "%F %T");
-	std::string str = ss.str();
+	time_t now_time;
+	struct tm* info;
+	char buffer[32];
+	time(&now_time);
+	info = localtime(&now_time);
+	strftime(buffer, 32, "%Y-%m-%d %H:%M:%S", info);
+	std::string str = buffer;
+
 	usbcb.u32_CMD = setting3288dsp::SET_DATETIME;
 	usbcb.u32_Count = str.length();