fixed get_ac_parameters issue

This commit is contained in:
strawmanbobi
2020-04-13 23:37:03 +08:00
parent 50c45e03f6
commit 4fc87a818a
9 changed files with 45 additions and 14 deletions

20
server/.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

View File

@@ -1,8 +1,8 @@
package net.irext.decode.sdk; package net.irext.decode.sdk;
import net.irext.server.sdk.bean.ACStatus; import net.irext.decode.sdk.bean.ACStatus;
import net.irext.server.sdk.bean.TemperatureRange; import net.irext.decode.sdk.bean.TemperatureRange;
import net.irext.server.sdk.utils.Constants; import net.irext.decode.sdk.utils.Constants;
import net.irext.server.service.utils.LoggerUtil; import net.irext.server.service.utils.LoggerUtil;
/** /**
@@ -96,13 +96,24 @@ public class IRDecode {
} }
public TemperatureRange getTemperatureRange(int acMode) { 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() { public int[] getACSupportedMode() {
// cool, heat, auto, fan, de-humidification // cool, heat, auto, fan, de-humidification
int[] retSupportedMode = {0, 0, 0, 0, 0}; int[] retSupportedMode = {0, 0, 0, 0, 0};
LoggerUtil.getInstance().trace(TAG, "getACSupportedMode");
int supportedMode = irACGetSupportedMode(); int supportedMode = irACGetSupportedMode();
LoggerUtil.getInstance().trace(TAG, "getACSupportedMode DONE " + supportedMode);
for (int i = Constants.ACMode.MODE_COOL.getValue(); i <= for (int i = Constants.ACMode.MODE_COOL.getValue(); i <=
Constants.ACMode.MODE_DEHUMIDITY.getValue(); i++) { Constants.ACMode.MODE_DEHUMIDITY.getValue(); i++) {
retSupportedMode[i] = (supportedMode >>> 1) & 1; retSupportedMode[i] = (supportedMode >>> 1) & 1;

View File

@@ -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 * Filename: ACStatus.java

View File

@@ -1,4 +1,4 @@
package net.irext.server.sdk.bean; package net.irext.decode.sdk.bean;
/** /**
* Filename: TemperatureRange.java * Filename: TemperatureRange.java

View File

@@ -1,4 +1,4 @@
package net.irext.server.sdk.utils; package net.irext.decode.sdk.utils;
/** /**
* Filename: Constants.java * Filename: Constants.java

View File

@@ -1,7 +1,7 @@
package net.irext.server.service.businesslogic; package net.irext.server.service.businesslogic;
import com.squareup.okhttp.*; 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.CollectKeyMapper;
import net.irext.server.service.mapper.DecodeRemoteMapper; import net.irext.server.service.mapper.DecodeRemoteMapper;
import net.irext.server.service.mapper.RemoteIndexMapper; 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.LoggerUtil;
import net.irext.server.service.utils.MD5Util; import net.irext.server.service.utils.MD5Util;
import net.irext.decode.sdk.IRDecode; 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.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -41,7 +41,7 @@ import java.util.List;
public class OperationLogic { public class OperationLogic {
private static final String TAG = OperationLogic.class.getSimpleName(); 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_PREFIX = "irda_";
private static final String IR_BIN_FILE_SUFFIX = ".bin"; private static final String IR_BIN_FILE_SUFFIX = ".bin";

View File

@@ -1,6 +1,6 @@
package net.irext.server.service.request; package net.irext.server.service.request;
import net.irext.server.sdk.bean.ACStatus; import net.irext.decode.sdk.bean.ACStatus;
/** /**
* Filename: DecodeRequest.java * Filename: DecodeRequest.java

View File

@@ -11,8 +11,8 @@ import net.irext.server.service.response.*;
import net.irext.server.service.utils.LoggerUtil; import net.irext.server.service.utils.LoggerUtil;
import net.irext.server.service.businesslogic.IndexingLogic; import net.irext.server.service.businesslogic.IndexingLogic;
import net.irext.server.service.restapi.base.AbstractBaseService; import net.irext.server.service.restapi.base.AbstractBaseService;
import net.irext.server.sdk.bean.ACStatus; import net.irext.decode.sdk.bean.ACStatus;
import net.irext.server.sdk.utils.Constants; import net.irext.decode.sdk.utils.Constants;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.InputStreamResource;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;