添加平台预定义：build.sh hw|lsc；不带参数默认为华高APP

build.sh

@@ -2,6 +2,30 @@ sysarch=$(arch)
 sys=$(cat /etc/issue)
 sys=${sys%% *}
 
+echo "${1}"
+if [ "${1}" == "hw" ]; then
+    sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_HUAGAO/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HANWANG/g" hgdriver/hgdev/CMakeLists.txt
+elif [ "${1}" == "lsc" ]; then
+    sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_HUAGAO/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_LISICHENG/g" hgdriver/hgdev/CMakeLists.txt
+else
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_LISICHENG/-DOEM_HUAGAO/g" hgdriver/hgdev/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgsane/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgdriver/wrapper/CMakeLists.txt
+    sed -i "s/-DOEM_HANWANG/-DOEM_HUAGAO/g" hgdriver/hgdev/CMakeLists.txt
+fi
+
 echo "------------------------------change cmake path:$1--------------------"
 if [ "$sys" == "UnionTech" ];then
     sed -i "s/kylin/uos/g"           hgdriver/wrapper/CMakeLists.txt
@@ -22,3 +46,4 @@ fi
    echo "--------------------------------------make succeed------------------------------------"
 
 make
+

hgdriver/hgdev/CMakeLists.txt

@@ -1,5 +1,6 @@
 project(gdev)
 add_compile_options(-std=c++11)
+add_definitions(-DOEM_HUAGAO)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS)

hgdriver/hgdev/hg_scanner.cpp

@@ -356,8 +356,6 @@ void hg_scanner::set_setting_map(int sn, const char* title)
 		setting_map_[HG_BASE_SETTING_INDEX_SKEW_CHECK] = sn;
 	else if (val == OPTION_TITLE_WXRRD)
 		setting_map_[HG_BASE_SETTING_INDEX_SKEW_CHECK_LEVEL] = sn;
-	else if (val ==OPTION_TITLE_DLSC)
-		setting_map_[HG_BASE_SETTING_INDEX_MULTI_OUT] = sn;
 }
 void hg_scanner::thread_handle_usb(void)
 {
@@ -1000,7 +998,7 @@ int  hg_scanner::setting_multi_out(void *data)
 	int color;
 	image_prc_param_.bits.multi_out = match_best_multi_out(str,NULL);
 	HG_VLOG_MINI_3(HG_LOG_LEVEL_DEBUG_INFO, "set multi_out type from %s to %s = %s\n", multi_out_string(image_prc_param_.bits.multi_out).c_str(), (char*)data, hg_scanner::strerr((hg_err)ret).c_str());
-	
+
 	if (image_prc_param_.bits.multi_out == MULTI_GRAY_AND_BW)
 		color = COLOR_MODE_256_GRAY;
 
@@ -1812,6 +1810,19 @@ int hg_scanner::save_final_image(hg_imgproc::LPIMGHEAD head, void* buf)
 
 	return HG_ERR_OK;
 }
+int hg_scanner::is_running(void)
+{
+	if (!scan_life_)
+		return THREAD_RUNNING_IDLE;
+
+	int run = THREAD_RUNNING_IDLE;
+	if (!wait_usb_.is_waiting())
+		run |= THREAD_RUNNING_USB;
+	if (!wait_img_.is_waiting())
+		run |= THREAD_RUNNING_IMAGE;
+
+	return run;
+}
 
 int hg_scanner::reset_io(usb_io* io)
 {

hgdriver/hgdev/hg_scanner.h

@@ -256,6 +256,13 @@ protected:
     int save_usb_data(std::shared_ptr<std::vector<char>> data);
     int save_final_image(hg_imgproc::LPIMGHEAD head, void* buf);
 
+    enum thread_running
+    {
+        THREAD_RUNNING_IDLE = 0,
+        THREAD_RUNNING_USB = 1 << 0,
+        THREAD_RUNNING_IMAGE = 1 << 1,
+    };
+    int is_running(void);   // return thread_running
 
     ////////////////////////////////////////////////////////////////
     // 新增自定义伽玛曲线及扫描区域属性 - 2022-05-05

hgdriver/wrapper/CMakeLists.txt

@@ -3,6 +3,7 @@ string(TIMESTAMP CURRENT_YEAR "%y")
 string(TIMESTAMP MONTHDAY "1%m%d")
 add_definitions(-DVERSION_YEAR=${CURRENT_YEAR})
 add_definitions(-DVERSION_BUILD=${MONTHDAY})
+add_definitions(-DOEM_HUAGAO)
 add_definitions("-Wl,--exclude-libs,ALL")
 #add_definitions("-B direct")
 add_compile_options(-std=c++11)

hgsane/CMakeLists.txt

@@ -3,6 +3,7 @@ project(sane-hgsane)
 string(TIMESTAMP YEARDAY "%y%j")
 add_definitions(-DVERSION_BUILD=${YEARDAY})
 #add_definitions(-DRUN_TEST)
+add_definitions(-DOEM_HUAGAO)
 add_definitions(-DPRINT_DEBUG_INFO)
 add_definitions(-DBACKEND_NAME=hgsane)
 add_definitions(-DEXPORT_SANE_API)