|
@@ -390,7 +390,7 @@ public class DataSenderService extends Service {
|
|
|
"\"support_dehumidify\" : true, " +
|
|
|
"\"support_fan\" : true, " +
|
|
|
"\"support_heating\" : true, " +
|
|
|
- "\"data_seq\" : \"3_2_1_0\", " +
|
|
|
+ "\"data_seq\" : \"4_3_2_1\", " +
|
|
|
"\"data_array\" : [" +
|
|
|
"{ \"roomNumber\" : 1, \"power\" : 1, \"mode\" : " + iValue + ", \"airvol\" : 1,\"setTemp\" : 11,\"nowTemp\" : 21 }," +
|
|
|
"{ \"roomNumber\" : 2, \"power\" : 1, \"mode\" : " + iValue + ", \"airvol\" : 1,\"setTemp\" : 12,\"nowTemp\" : 22 }," +
|
|
@@ -444,7 +444,7 @@ public class DataSenderService extends Service {
|
|
|
"\"master_info_switch_count\" : 3, " +
|
|
|
"\"liv_info_install\" : true, " +
|
|
|
"\"liv_info_lightcount\" : 2, " +
|
|
|
- "\"data_seq\" : \"6_5_4_2_3_1_0\", " +
|
|
|
+ "\"data_seq\" : \"7_6_5_4_2_3_1\", " +
|
|
|
"\"liv_data_array\" : [" +
|
|
|
"{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 }," +
|
|
|
"{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 } ]," +
|
|
@@ -470,7 +470,7 @@ public class DataSenderService extends Service {
|
|
|
"\"master_info_switch_count\" : 2, " +
|
|
|
"\"liv_info_install\" : true, " +
|
|
|
"\"liv_info_lightcount\" : 2, " +
|
|
|
- "\"data_seq\" : \"4_2_3_1_0\", " +
|
|
|
+ "\"data_seq\" : \"5_4_2_3_1\", " +
|
|
|
"\"liv_data_array\" : [" +
|
|
|
"{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 }," +
|
|
|
"{ \"info_install\" : true, \"info_type\" : 2, \"data_onoff\" : " + onoff + ", \"data_dimming\" : 1 } ]," +
|
|
@@ -495,13 +495,13 @@ public class DataSenderService extends Service {
|
|
|
"{ \"hID\" : 3, \"hStatus\" : 2, \"hType\" : " + iValue + ", \"hErrorStatus\" : 0} ]" +
|
|
|
"}";
|
|
|
|
|
|
- outputStream.writeObject(result.toString());
|
|
|
+ //outputStream.writeObject(result.toString());
|
|
|
String resultTemp;
|
|
|
if (menu == 1003) resultTemp = sampleHeatingResult;
|
|
|
else if (menu == 1001) resultTemp = sampleLightResult;
|
|
|
else if (menu == 1006) resultTemp = sampleCookTopResult;
|
|
|
else resultTemp = sampleAirconResult;
|
|
|
- //outputStream.writeObject(resultTemp);
|
|
|
+ outputStream.writeObject(resultTemp);
|
|
|
outputStream.close();
|
|
|
Log.d("ServerThread", "result 보냄 : " + resultTemp);
|
|
|
} catch (Exception e) {
|