调整uos命名

hgdriver/hgdev/hg_scanner.cpp

@@ -2250,7 +2250,23 @@ int hg_scanner::setting_color_correction(void* data)
 }
 int hg_scanner::setting_auto_paper_scan_exit_time(void* data)
 {
-	is_auto_paper_scan_exit_time = *((int*)data);
+	string str((char*)data);
+	if (str.compare("15s") == 0)
+		is_auto_paper_scan_exit_time = 15;
+	else if (str.compare("30s") == 0)
+		is_auto_paper_scan_exit_time = 30;
+	else if (str.compare("60s") == 0)
+		is_auto_paper_scan_exit_time = 60;
+	else if (str.compare("2min") == 0)
+		is_auto_paper_scan_exit_time = 120;
+	else if (str.compare("4min") == 0)
+		is_auto_paper_scan_exit_time = 240;
+	else if (str.compare("8min") == 0)
+		is_auto_paper_scan_exit_time = 480;
+	else
+		is_auto_paper_scan_exit_time = 60;
+	//is_auto_paper_scan_exit_time = *((int*)data);
+	//VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "set paper_scan_exit_time from (%d)min to (%s)min = %d\n", is_auto_paper_scan_exit_time, (char*)data);
 	return 0;
 }
 int hg_scanner::on_color_mode_changed(int& color_mode)

hgdriver/hgdev/hg_scanner.h

@@ -540,7 +540,7 @@ public:
     #elif defined(OEM_ZHONGJING)
     static const std::string helpfile_ = "/opt/apps/com.microtekchina.microtekscan-ex/entries/help/MicrotekScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #elif defined(OEM_ZIGUANG)
-    static const std::string helpfile_ = "/opt/apps/com.unisgroup.uniscan/entries/help/UniScan_scanSettings_Help_manual.pdf";//帮助文档路径
+    static const std::string helpfile_ = "/opt/apps/com.unischina.uniscan/entries/help/UniScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #else
     static const std::string helpfile_ ="/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径
     #endif

hgdriver/hgdev/image_process.cpp

@@ -379,7 +379,7 @@ namespace hg_imgproc
 #elif  defined(OEM_CANGTIAN)
 			string libname = "libctsdriver.so";
 #elif  defined(OEM_ZHONGJING)
-			string libname = "libzjdriver.so";.
+			string libname = "libzjdriver.so";
 #elif  defined(OEM_ZIGUANG)
 			string libname = "libzgdriver.so";
 #else