diff --git a/build2/qt/HGScannerLib/HGScannerLib.def b/build2/qt/HGScannerLib/HGScannerLib.def index 8a96e95c..6908e423 100644 --- a/build2/qt/HGScannerLib/HGScannerLib.def +++ b/build2/qt/HGScannerLib/HGScannerLib.def @@ -51,4 +51,9 @@ Java_com_easing_java_HGScannerLib_StopDeviceScan Java_com_easing_java_HGScannerLib_GetDeviceParamGroupList Java_com_easing_java_HGScannerLib_GetDeviceParam Java_com_easing_java_HGScannerLib_SetDeviceParam -Java_com_easing_java_HGScannerLib_ResetDeviceParam \ No newline at end of file +Java_com_easing_java_HGScannerLib_ResetDeviceParam +Java_com_easing_java_HGScannerLib_DeviceIsPaperOn +Java_com_easing_java_HGScannerLib_DeviceRestart +Java_com_easing_java_HGScannerLib_DeviceShutDown +Java_com_easing_java_HGScannerLib_GetDeviceStatus +Java_com_easing_java_HGScannerLib_GetDeviceOperateCode \ No newline at end of file diff --git a/sdk/scannerlib/HGScannerLibJni.cpp b/sdk/scannerlib/HGScannerLibJni.cpp index f96f6155..b687f040 100644 --- a/sdk/scannerlib/HGScannerLibJni.cpp +++ b/sdk/scannerlib/HGScannerLibJni.cpp @@ -768,6 +768,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_SetDevic extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_ResetDeviceParam( JNIEnv* env, jclass clazz, jlong dev) { + (void)env; (void)clazz; printf("\nJava_com_easing_java_HGScannerLib_ResetDeviceParam\n"); @@ -777,3 +778,73 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_ResetDev printf("\n"); return (jboolean)ret; } + +extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_DeviceIsPaperOn( + JNIEnv* env, jclass clazz, jlong dev) +{ + (void)env; + (void)clazz; + printf("\nJava_com_easing_java_HGScannerLib_DeviceIsPaperOn\n"); + + HGBool ret = HGLib_DeviceIsPaperOn((HGLibDevice)dev); + printf("ret=%d\n", ret); + + printf("\n"); + return (jboolean)ret; +} + +extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_DeviceRestart( + JNIEnv* env, jclass clazz, jlong dev) +{ + (void)env; + (void)clazz; + printf("\nJava_com_easing_java_HGScannerLib_DeviceRestart\n"); + + HGBool ret = HGLib_DeviceRestart((HGLibDevice)dev); + printf("ret=%d\n", ret); + + printf("\n"); + return (jboolean)ret; +} + +extern "C" JNIEXPORT jboolean JNICALL Java_com_easing_java_HGScannerLib_DeviceShutDown( + JNIEnv* env, jclass clazz, jlong dev) +{ + (void)env; + (void)clazz; + printf("\nJava_com_easing_java_HGScannerLib_DeviceShutDown\n"); + + HGBool ret = HGLib_DeviceShutDown((HGLibDevice)dev); + printf("ret=%d\n", ret); + + printf("\n"); + return (jboolean)ret; +} + +extern "C" JNIEXPORT jint JNICALL Java_com_easing_java_HGScannerLib_GetDeviceStatus( + JNIEnv* env, jclass clazz, jlong dev) +{ + (void)env; + (void)clazz; + printf("\nJava_com_easing_java_HGScannerLib_GetDeviceStatus\n"); + + HGInt status = HGLib_GetDeviceStatus((HGLibDevice)dev); + printf("status=%d\n", status); + + printf("\n"); + return (jint)status; +} + +extern "C" JNIEXPORT jint JNICALL Java_com_easing_java_HGScannerLib_GetDeviceOperateCode( + JNIEnv* env, jclass clazz, jlong dev) +{ + (void)env; + (void)clazz; + printf("\nJava_com_easing_java_HGScannerLib_GetDeviceOperateCode\n"); + + HGInt code = HGLib_GetDeviceOperateCode((HGLibDevice)dev); + printf("code=%d\n", code); + + printf("\n"); + return (jint)code; +} diff --git a/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java b/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java index 2853b4ea..796eb50e 100644 --- a/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java +++ b/test/scannerlib/huagao/java/com/easing/java/HGScannerLib.java @@ -88,7 +88,12 @@ public class HGScannerLib { public native HGLibDeviceParam GetDeviceParam(long dev, int option); public native boolean SetDeviceParam(long dev, HGLibDeviceSetParam deviceSetParam); public native boolean ResetDeviceParam(long dev); -; + public native boolean DeviceIsPaperOn(long dev); + public native boolean DeviceRestart(long dev); + public native boolean DeviceShutDown(long dev); + public native int GetDeviceStatus(long dev); + public native int GetDeviceOperateCode(long dev); + public void onDeviceHotPlugEvent(int event, String deviceName) { System.out.println("onDeviceHotPlugEvent"); System.out.println("event=" + event); @@ -225,6 +230,12 @@ public class HGScannerLib { inst.ResetDeviceParam(dev); + int status = inst.GetDeviceStatus(dev); + System.out.println("status=" + status); + + int code = inst.GetDeviceOperateCode(dev); + System.out.println("code=" + code); + //inst.StartDeviceScan(dev); //inst.StopDeviceScan(dev);