|
@@ -376,7 +376,8 @@ public class DataSenderService extends Service {
|
|
|
outputStream.writeObject(json);
|
|
|
outputStream.close();
|
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
|
- } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getReason() == JSON.REASON.Status) {
|
|
|
+ }
|
|
|
+ else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getReason() == JSON.REASON.Status) {
|
|
|
try {
|
|
|
JSONObject result = updateRequest(basicData.getMenu(), basicData.getKind(), basicData.getPosition());
|
|
|
Random rand = new Random();
|
|
@@ -418,7 +419,7 @@ public class DataSenderService extends Service {
|
|
|
"\"boiler_hotwater_temp\" : 33, " +
|
|
|
"\"boiler_frost_protect\" : true, " +
|
|
|
"\"boiler_error_code\" : 0, " +
|
|
|
- "\"data_seq\" : \"2_3_1_0\", " +
|
|
|
+ "\"data_seq\" : \"8_7_6_5_4_3_2_1\", " +
|
|
|
"\"data_array\" : [" +
|
|
|
"{ \"roomNumber\" : 1, \"mode\" : " + 1 + ", \"setTemp\" : " + iValue + ",\"nowTemp\" : 20, \"reservationArray\" : [0,1,2,3,20], \"sleepTemp\" : 1, \"sleepTime\" : 1 }," +
|
|
|
"{ \"roomNumber\" : 2, \"mode\" : " + 2 + ", \"setTemp\" : " + iValue + ",\"nowTemp\" : 21, \"reservationArray\" : [0,1,2,3,21], \"sleepTemp\" : 2, \"sleepTime\" : 2 }," +
|
|
@@ -510,7 +511,8 @@ public class DataSenderService extends Service {
|
|
|
outputStream.close();
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.PASSWORD) {
|
|
|
+ }
|
|
|
+ else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.PASSWORD) {
|
|
|
//비밀번호 변경 요청
|
|
|
int result = passwordChangeRequest(basicData.getNumber());
|
|
|
String json = "";
|
|
@@ -1428,13 +1430,13 @@ public class DataSenderService extends Service {
|
|
|
String[] strValue = devSet.GetSettingData("UI순서");
|
|
|
devSet.closeDB();
|
|
|
|
|
|
- // 현대건설 더 펜트하우스 서버에서 설정된 UI 순서를 이용하도록 한다.
|
|
|
+ //서버에서 설정된 UI 순서를 이용하도록 한다.
|
|
|
if (strValue != null) {
|
|
|
strLight = strValue[1].substring((strValue[1].indexOf("조명(") + 3), (strValue[1].indexOf(")난방(")));
|
|
|
|
|
|
int strLightCount = Integer.valueOf(strLight.substring(0, strLight.indexOf(":")));
|
|
|
|
|
|
- if (strLightCount == (1 + bedDataCount)) {
|
|
|
+ if (strLightCount == (1 + bedDataCount + switchDataCount)) {
|
|
|
//개수가 일치하는 경우에 적용
|
|
|
strLight = strLight.substring(strLight.indexOf(":") + 1);
|
|
|
} else {
|
|
@@ -1883,7 +1885,8 @@ public class DataSenderService extends Service {
|
|
|
try {
|
|
|
if (menu == JSON.MENU.LIGHT) {
|
|
|
return updateLight(kind, position);
|
|
|
- } else if (menu == JSON.MENU.CONCENT) {
|
|
|
+ }
|
|
|
+ else if (menu == JSON.MENU.CONCENT) {
|
|
|
return updateConcent(kind, position);
|
|
|
} else if (menu == JSON.MENU.HEATING) {
|
|
|
return updateHeating(kind, position);
|