diff --git a/pom.xml b/pom.xml
index b4488f8..e8fd6d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.aohe
twain-service
- 0.1.6.2
+ 0.1.6.6
8
diff --git a/src/main/java/org/aohe/control/Operational.java b/src/main/java/org/aohe/control/Operational.java
index 161b530..9312143 100644
--- a/src/main/java/org/aohe/control/Operational.java
+++ b/src/main/java/org/aohe/control/Operational.java
@@ -16,6 +16,9 @@ import java.util.*;
@Slf4j
public class Operational {
+ //是否使用系统UI
+ private static Boolean isSystemUI = false;
+
public static String selectOperational(String path) {
JSONObject json = JSONObject.parse(path);
@@ -149,7 +152,6 @@ public class Operational {
TwainSource twainSource = openTwSource();
TwainCapability[] capabilities = twainSource.getCapabilities();
-
Map> map = new HashMap<>();
for (TwainCapability cap : capabilities){
List list = new ArrayList<>();
@@ -166,11 +168,6 @@ public class Operational {
}finally {
closeTwSource();
}
-
-
-
-
-
}
/**
@@ -179,6 +176,7 @@ public class Operational {
* DPI --> double
* 色彩模式 color 0,1,2 -> 黑白,灰度,彩色
* 进纸模式 paper true,false -> 自动,手动
+ * 双面扫描 duple true,false -> 双面,单面
* @param map 参数和值
* @return R
*/
@@ -195,6 +193,13 @@ public class Operational {
if(map.get("paper") !=null){
twainSource.setCapability(Twain.CAP_FEEDERENABLED, map.getBooleanValue("paper"));
}
+ if(map.get("duple") != null){
+ twainSource.setCapability(Twain.CAP_DUPLEXENABLED, map.getBooleanValue("duple"));
+ }
+ if(map.get("systemUI") != null){
+ isSystemUI = map.getBooleanValue("systemUI");
+ }
+
} catch (TwainException e) {
throw new RuntimeException(e);
}
@@ -209,7 +214,7 @@ public class Operational {
* @throws TwainException default error
*/
public static R startScan(String name) throws TwainException {
- return startScan(name, false);
+ return startScan(name, isSystemUI);
}
/**
diff --git a/src/main/java/org/aohe/show/IconUtil.java b/src/main/java/org/aohe/show/IconUtil.java
index 5b412fe..3a7bdc0 100644
--- a/src/main/java/org/aohe/show/IconUtil.java
+++ b/src/main/java/org/aohe/show/IconUtil.java
@@ -1,7 +1,6 @@
package org.aohe.show;
import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
import cn.hutool.core.io.resource.ResourceUtil;
import lombok.extern.slf4j.Slf4j;
@@ -10,18 +9,20 @@ import java.awt.*;
@Slf4j
public class IconUtil {
public static Image getIcon() {
- ClassPathResource resource = new ClassPathResource("ah.png");
- if(FileUtil.exist(resource.getFile())){
- return Toolkit.getDefaultToolkit().getImage(resource.getPath());
- }
- String iconPath = "..\\ah.png";
+ String iconPath = getProgramPathIcon();
log.info("当前查找路径为外部:{}", FileUtil.getAbsolutePath(iconPath));
- if(!FileUtil.exist("ah.png")){
+ if(!FileUtil.exist(iconPath)){
iconPath = ResourceUtil.getResource("ah.png").getFile();
log.info("当前查找路径为内部:{}", FileUtil.getAbsolutePath(iconPath));
}
-
+ log.info("当前程序图标最终路径路径为:{}", getProgramPathIcon());
return Toolkit.getDefaultToolkit().getImage(iconPath);
}
+
+ public static String getProgramPathIcon(){
+ String resource = ResourceUtil.getResource("ah.png").getFile();
+ String absolutePath = FileUtil.getAbsolutePath(resource);
+ return absolutePath.replace("twain-service.exe!/", "");
+ }
}