diff --git a/Android/decodesdk/src/main/java/net/irext/decodesdk/IRDecode.java b/Android/decodesdk/src/main/java/net/irext/decodesdk/IRDecode.java index 501e794..792f705 100644 --- a/Android/decodesdk/src/main/java/net/irext/decodesdk/IRDecode.java +++ b/Android/decodesdk/src/main/java/net/irext/decodesdk/IRDecode.java @@ -47,6 +47,12 @@ public class IRDecode { return mInstance; } + private IRDecode() { + String libPath = "/develop/irext/core/src/ir_decoder/cmake-build-debug/libirda_decoder.so"; + System.out.println("loading decode library " + libPath); + System.load(libPath); + } + public int openFile(int category, int subCate, String fileName) { return irOpen(category, subCate, fileName); } @@ -56,6 +62,9 @@ public class IRDecode { } public int[] decodeBinary(int keyCode, ACStatus acStatus, int changeWindDir) { + if (null == acStatus) { + acStatus = new ACStatus(); + } return irDecode(keyCode, acStatus, changeWindDir); } diff --git a/Android/decodesdk/src/main/java/net/irext/decodesdk/bean/ACStatus.java b/Android/decodesdk/src/main/java/net/irext/decodesdk/bean/ACStatus.java index 6869c0a..076fe5d 100644 --- a/Android/decodesdk/src/main/java/net/irext/decodesdk/bean/ACStatus.java +++ b/Android/decodesdk/src/main/java/net/irext/decodesdk/bean/ACStatus.java @@ -1,5 +1,7 @@ package net.irext.decodesdk.bean; +import net.irext.decodesdk.utils.Constants; + /** * Filename: ACStatus.java * Revised: Date: 2017-03-28 @@ -24,6 +26,14 @@ public class ACStatus { private int acTimer; public ACStatus() { + this.acPower = Constants.ACPower.POWER_OFF.getValue(); + this.acMode = Constants.ACMode.MODE_AUTO.getValue(); + this.acTemp = Constants.ACTemperature.TEMP_24.getValue(); + this.acWindSpeed = Constants.ACWindSpeed.SPEED_AUTO.getValue(); + this.acWindDir = Constants.ACSwing.SWING_ON.getValue(); + this.acTimer = 0; + this.acDisplay = 0; + this.acSleep = 0; } public ACStatus(int acPower, int acMode, int acTemp, int acWindSpeed, int acWindDir, @@ -101,4 +111,5 @@ public class ACStatus { public void setAcTimer(int acTimer) { this.acTimer = acTimer; } + }