diff --git a/server/.idea/jarRepositories.xml b/server/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/server/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/server/src/main/java/net/irext/decode/sdk/IRDecode.java b/server/src/main/java/net/irext/decode/sdk/IRDecode.java index 2e8f1a0..a837651 100644 --- a/server/src/main/java/net/irext/decode/sdk/IRDecode.java +++ b/server/src/main/java/net/irext/decode/sdk/IRDecode.java @@ -1,8 +1,8 @@ package net.irext.decode.sdk; -import net.irext.server.sdk.bean.ACStatus; -import net.irext.server.sdk.bean.TemperatureRange; -import net.irext.server.sdk.utils.Constants; +import net.irext.decode.sdk.bean.ACStatus; +import net.irext.decode.sdk.bean.TemperatureRange; +import net.irext.decode.sdk.utils.Constants; import net.irext.server.service.utils.LoggerUtil; /** @@ -96,13 +96,24 @@ public class IRDecode { } public TemperatureRange getTemperatureRange(int acMode) { - return irACGetTemperatureRange(acMode); + LoggerUtil.getInstance().trace(TAG, "getTemperatureRange"); + + TemperatureRange temperatureRange = irACGetTemperatureRange(acMode); + + LoggerUtil.getInstance().trace(TAG, "getTemperatureRange DONE " + + temperatureRange.getTempMin() + ", " + temperatureRange.getTempMax()); + + return temperatureRange; } public int[] getACSupportedMode() { // cool, heat, auto, fan, de-humidification int[] retSupportedMode = {0, 0, 0, 0, 0}; + + LoggerUtil.getInstance().trace(TAG, "getACSupportedMode"); int supportedMode = irACGetSupportedMode(); + LoggerUtil.getInstance().trace(TAG, "getACSupportedMode DONE " + supportedMode); + for (int i = Constants.ACMode.MODE_COOL.getValue(); i <= Constants.ACMode.MODE_DEHUMIDITY.getValue(); i++) { retSupportedMode[i] = (supportedMode >>> 1) & 1; diff --git a/server/src/main/java/net/irext/server/sdk/bean/ACStatus.java b/server/src/main/java/net/irext/decode/sdk/bean/ACStatus.java similarity index 96% rename from server/src/main/java/net/irext/server/sdk/bean/ACStatus.java rename to server/src/main/java/net/irext/decode/sdk/bean/ACStatus.java index 895baad..9756e59 100644 --- a/server/src/main/java/net/irext/server/sdk/bean/ACStatus.java +++ b/server/src/main/java/net/irext/decode/sdk/bean/ACStatus.java @@ -1,6 +1,6 @@ -package net.irext.server.sdk.bean; +package net.irext.decode.sdk.bean; -import net.irext.server.sdk.utils.Constants; +import net.irext.decode.sdk.utils.Constants; /** * Filename: ACStatus.java diff --git a/server/src/main/java/net/irext/server/sdk/bean/TemperatureRange.java b/server/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java similarity index 96% rename from server/src/main/java/net/irext/server/sdk/bean/TemperatureRange.java rename to server/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java index 791a673..d7a848a 100644 --- a/server/src/main/java/net/irext/server/sdk/bean/TemperatureRange.java +++ b/server/src/main/java/net/irext/decode/sdk/bean/TemperatureRange.java @@ -1,4 +1,4 @@ -package net.irext.server.sdk.bean; +package net.irext.decode.sdk.bean; /** * Filename: TemperatureRange.java diff --git a/server/src/main/java/net/irext/server/sdk/libs/libirda_decoder.so b/server/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so similarity index 100% rename from server/src/main/java/net/irext/server/sdk/libs/libirda_decoder.so rename to server/src/main/java/net/irext/decode/sdk/libs/libirda_decoder.so diff --git a/server/src/main/java/net/irext/server/sdk/utils/Constants.java b/server/src/main/java/net/irext/decode/sdk/utils/Constants.java similarity index 99% rename from server/src/main/java/net/irext/server/sdk/utils/Constants.java rename to server/src/main/java/net/irext/decode/sdk/utils/Constants.java index 3403dc5..94b608c 100644 --- a/server/src/main/java/net/irext/server/sdk/utils/Constants.java +++ b/server/src/main/java/net/irext/decode/sdk/utils/Constants.java @@ -1,4 +1,4 @@ -package net.irext.server.sdk.utils; +package net.irext.decode.sdk.utils; /** * Filename: Constants.java diff --git a/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java b/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java index 4ee73b1..408870b 100644 --- a/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java +++ b/server/src/main/java/net/irext/server/service/businesslogic/OperationLogic.java @@ -1,7 +1,7 @@ package net.irext.server.service.businesslogic; import com.squareup.okhttp.*; -import net.irext.server.sdk.bean.TemperatureRange; +import net.irext.decode.sdk.bean.TemperatureRange; import net.irext.server.service.mapper.CollectKeyMapper; import net.irext.server.service.mapper.DecodeRemoteMapper; import net.irext.server.service.mapper.RemoteIndexMapper; @@ -13,7 +13,7 @@ import net.irext.server.service.utils.FileUtil; import net.irext.server.service.utils.LoggerUtil; import net.irext.server.service.utils.MD5Util; import net.irext.decode.sdk.IRDecode; -import net.irext.server.sdk.bean.ACStatus; +import net.irext.decode.sdk.bean.ACStatus; import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -41,7 +41,7 @@ import java.util.List; public class OperationLogic { private static final String TAG = OperationLogic.class.getSimpleName(); - private static final boolean DEBUG = false; + private static final boolean DEBUG = true; private static final String IR_BIN_FILE_PREFIX = "irda_"; private static final String IR_BIN_FILE_SUFFIX = ".bin"; diff --git a/server/src/main/java/net/irext/server/service/request/DecodeRequest.java b/server/src/main/java/net/irext/server/service/request/DecodeRequest.java index 08bbef5..24b3d9b 100644 --- a/server/src/main/java/net/irext/server/service/request/DecodeRequest.java +++ b/server/src/main/java/net/irext/server/service/request/DecodeRequest.java @@ -1,6 +1,6 @@ package net.irext.server.service.request; -import net.irext.server.sdk.bean.ACStatus; +import net.irext.decode.sdk.bean.ACStatus; /** * Filename: DecodeRequest.java diff --git a/server/src/main/java/net/irext/server/service/restapi/IROperationService.java b/server/src/main/java/net/irext/server/service/restapi/IROperationService.java index eb15b85..8d310b4 100644 --- a/server/src/main/java/net/irext/server/service/restapi/IROperationService.java +++ b/server/src/main/java/net/irext/server/service/restapi/IROperationService.java @@ -11,8 +11,8 @@ import net.irext.server.service.response.*; import net.irext.server.service.utils.LoggerUtil; import net.irext.server.service.businesslogic.IndexingLogic; import net.irext.server.service.restapi.base.AbstractBaseService; -import net.irext.server.sdk.bean.ACStatus; -import net.irext.server.sdk.utils.Constants; +import net.irext.decode.sdk.bean.ACStatus; +import net.irext.decode.sdk.utils.Constants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.InputStreamResource; import org.springframework.http.ResponseEntity;