|
@@ -51,6 +51,7 @@ import java.util.ArrayList;
|
|
import java.util.Random;
|
|
import java.util.Random;
|
|
|
|
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.AirconControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.AirconControl;
|
|
|
|
+import kr.co.icontrols.wallpadmulticontrolservice.control.CookTopControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.HeatingControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.HeatingControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.KnxAirconControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.KnxAirconControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.LightControl;
|
|
import kr.co.icontrols.wallpadmulticontrolservice.control.LightControl;
|
|
@@ -63,10 +64,13 @@ import kr.co.icontrols.wallpadsupport.WpadSound;
|
|
|
|
|
|
public class DataSenderService extends Service {
|
|
public class DataSenderService extends Service {
|
|
String TAG = this.getClass().getSimpleName();
|
|
String TAG = this.getClass().getSimpleName();
|
|
|
|
+
|
|
private void DebugLogOutput(String s) {
|
|
private void DebugLogOutput(String s) {
|
|
if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
|
|
if (Common.DEBUG_LOG_ON) Log.d(TAG, s);
|
|
}
|
|
}
|
|
|
|
+
|
|
protected Context mContext = null;
|
|
protected Context mContext = null;
|
|
|
|
+
|
|
public Context getContext() {
|
|
public Context getContext() {
|
|
return mContext;
|
|
return mContext;
|
|
}
|
|
}
|
|
@@ -93,6 +97,7 @@ public class DataSenderService extends Service {
|
|
//public final static String BR_ENERGY_METER = BR_ACTION_BASE + "ENERGY_METER_HDC" + "(" + BASE + ")";
|
|
//public final static String BR_ENERGY_METER = BR_ACTION_BASE + "ENERGY_METER_HDC" + "(" + BASE + ")";
|
|
public final static String BR_BATCH_LIGHT = BR_ACTION_BASE + "BATCH_LIGHT_HDC" + "(" + BASE + ")";
|
|
public final static String BR_BATCH_LIGHT = BR_ACTION_BASE + "BATCH_LIGHT_HDC" + "(" + BASE + ")";
|
|
public final static String BR_GAS = BR_ACTION_BASE + "GAS_HDC" + "(" + BASE + ")";
|
|
public final static String BR_GAS = BR_ACTION_BASE + "GAS_HDC" + "(" + BASE + ")";
|
|
|
|
+ public final static String BR_COOKTOP = BR_ACTION_BASE + "COOKTOP_HDC" + "(" + BASE + ")";
|
|
public final static String BR_VENTIL = BR_ACTION_BASE + "VENTIL_HDC" + "(" + BASE + ")";
|
|
public final static String BR_VENTIL = BR_ACTION_BASE + "VENTIL_HDC" + "(" + BASE + ")";
|
|
public final static String BR_HEATING = BR_ACTION_BASE + "HEATING_HDC" + "(" + BASE + ")";
|
|
public final static String BR_HEATING = BR_ACTION_BASE + "HEATING_HDC" + "(" + BASE + ")";
|
|
public final static String BR_AIRCON = BR_ACTION_BASE + "AIRCON_HDC" + "(" + BASE + ")";
|
|
public final static String BR_AIRCON = BR_ACTION_BASE + "AIRCON_HDC" + "(" + BASE + ")";
|
|
@@ -107,6 +112,7 @@ public class DataSenderService extends Service {
|
|
// 가스
|
|
// 가스
|
|
private GasAPI mGasAPI = null;
|
|
private GasAPI mGasAPI = null;
|
|
private CooktopAPI mCooktopAPI; // 쿡탑 API
|
|
private CooktopAPI mCooktopAPI; // 쿡탑 API
|
|
|
|
+ private CookTopControl mCookTopControl;
|
|
private CooktopAPI.Data mCookTopData = null;
|
|
private CooktopAPI.Data mCookTopData = null;
|
|
private int nGasCnt = 1;
|
|
private int nGasCnt = 1;
|
|
//최대 3대
|
|
//최대 3대
|
|
@@ -116,6 +122,7 @@ public class DataSenderService extends Service {
|
|
private VentiAPI mVentiAPI = null;
|
|
private VentiAPI mVentiAPI = null;
|
|
private VentiControl mVentiControl;
|
|
private VentiControl mVentiControl;
|
|
public Ventilation mVentilation = new Ventilation();
|
|
public Ventilation mVentilation = new Ventilation();
|
|
|
|
+
|
|
public static class Ventilation {
|
|
public static class Ventilation {
|
|
/**
|
|
/**
|
|
* ON/OFF 상태
|
|
* ON/OFF 상태
|
|
@@ -333,8 +340,7 @@ public class DataSenderService extends Service {
|
|
outputStream.writeObject(json);
|
|
outputStream.writeObject(json);
|
|
outputStream.close();
|
|
outputStream.close();
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
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 {
|
|
try {
|
|
JSONObject result = updateRequest(basicData.getMenu(), basicData.getKind(), basicData.getPosition());
|
|
JSONObject result = updateRequest(basicData.getMenu(), basicData.getKind(), basicData.getPosition());
|
|
Random rand = new Random();
|
|
Random rand = new Random();
|
|
@@ -468,8 +474,7 @@ public class DataSenderService extends Service {
|
|
outputStream.close();
|
|
outputStream.close();
|
|
e.printStackTrace();
|
|
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());
|
|
int result = passwordChangeRequest(basicData.getNumber());
|
|
String json = "";
|
|
String json = "";
|
|
@@ -497,8 +502,7 @@ public class DataSenderService extends Service {
|
|
outputStream.writeObject(json);
|
|
outputStream.writeObject(json);
|
|
outputStream.close();
|
|
outputStream.close();
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
- }
|
|
|
|
- else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.MOBILE) {
|
|
|
|
|
|
+ } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.MOBILE) {
|
|
//모바일 등록 관련
|
|
//모바일 등록 관련
|
|
int result = updateMobile(basicData.getReason(), basicData.getName(), basicData.getId());
|
|
int result = updateMobile(basicData.getReason(), basicData.getName(), basicData.getId());
|
|
String json = "";
|
|
String json = "";
|
|
@@ -526,14 +530,13 @@ public class DataSenderService extends Service {
|
|
outputStream.writeObject(json);
|
|
outputStream.writeObject(json);
|
|
outputStream.close();
|
|
outputStream.close();
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
- }
|
|
|
|
- else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.DEVICE_INFO) {
|
|
|
|
|
|
+ } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.DEVICE_INFO) {
|
|
//제어 디바이스 목록 가져오기
|
|
//제어 디바이스 목록 가져오기
|
|
String result = getDeviceInfo(basicData.getPosition());
|
|
String result = getDeviceInfo(basicData.getPosition());
|
|
outputStream.writeObject(result);
|
|
outputStream.writeObject(result);
|
|
outputStream.close();
|
|
outputStream.close();
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
- } else{
|
|
|
|
|
|
+ } else {
|
|
outputStream.close();
|
|
outputStream.close();
|
|
}
|
|
}
|
|
inputStream.close();
|
|
inputStream.close();
|
|
@@ -1110,7 +1113,8 @@ public class DataSenderService extends Service {
|
|
int state = reqData.getState();
|
|
int state = reqData.getState();
|
|
if (category.equalsIgnoreCase("all_execution_release")) {
|
|
if (category.equalsIgnoreCase("all_execution_release")) {
|
|
result = mLightControl.Device_All_Excecution_Release(state == 1 ? true : false);
|
|
result = mLightControl.Device_All_Excecution_Release(state == 1 ? true : false);
|
|
- } else if (category.equalsIgnoreCase("set_light_dimming")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (category.equalsIgnoreCase("set_light_dimming")) {
|
|
result = mLightControl.SetLightDimming((byte) state);
|
|
result = mLightControl.SetLightDimming((byte) state);
|
|
}
|
|
}
|
|
} else if (kind == 1) {
|
|
} else if (kind == 1) {
|
|
@@ -1120,13 +1124,17 @@ public class DataSenderService extends Service {
|
|
if (category.equalsIgnoreCase("switch_liv")) {
|
|
if (category.equalsIgnoreCase("switch_liv")) {
|
|
boolean onoff = state == 0 ? true : false;
|
|
boolean onoff = state == 0 ? true : false;
|
|
result = mLightControl.SetLivingLightOnOff(onoff);
|
|
result = mLightControl.SetLivingLightOnOff(onoff);
|
|
- } else if (category.equalsIgnoreCase("switch_bed")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (category.equalsIgnoreCase("switch_bed")) {
|
|
result = setOnOff_BadRoom_EnergyMeter(pos);
|
|
result = setOnOff_BadRoom_EnergyMeter(pos);
|
|
- } else if (category.equalsIgnoreCase("switch_light_switch")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (category.equalsIgnoreCase("switch_light_switch")) {
|
|
result = setOnOff_Light_Switch(pos);
|
|
result = setOnOff_Light_Switch(pos);
|
|
- } else if (category.equalsIgnoreCase("switch_light_switch_individual")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (category.equalsIgnoreCase("switch_light_switch_individual")) {
|
|
result = Device_LightOnOffIndividual((byte) pos, (byte) lightNum);
|
|
result = Device_LightOnOffIndividual((byte) pos, (byte) lightNum);
|
|
- } else if (category.equalsIgnoreCase("switch_light_switch_all")) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (category.equalsIgnoreCase("switch_light_switch_all")) {
|
|
result = Device_LightOnOffAll((byte) pos, state == 0 ? true : false);
|
|
result = Device_LightOnOffAll((byte) pos, state == 0 ? true : false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1315,6 +1323,26 @@ public class DataSenderService extends Service {
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ private int controlCookTop(int kind, int pos, RequestData reqData) {
|
|
|
|
+ int result = JSON.ERROR.ResultFail;
|
|
|
|
+ String category = reqData.getCategory();
|
|
|
|
+ if (kind == 0) {
|
|
|
|
+ //전체 제어
|
|
|
|
+ int state = reqData.getState();
|
|
|
|
+ if (category.equalsIgnoreCase("all_device_close")) {
|
|
|
|
+ result = mCookTopControl.AllDeviceClose();
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ } else if (kind == 1) {
|
|
|
|
+ //개별 제어
|
|
|
|
+ if (category.equalsIgnoreCase("close")) {
|
|
|
|
+ result = mCookTopControl.ctrlDeviceUnitStatus((byte)(mCookTopData.Device[0].circuit[pos].hID));
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
+
|
|
private int controlCurtain(int kind, RequestData reqData) {
|
|
private int controlCurtain(int kind, RequestData reqData) {
|
|
int result = JSON.ERROR.ResultFail;
|
|
int result = JSON.ERROR.ResultFail;
|
|
String category = reqData.getCategory();
|
|
String category = reqData.getCategory();
|
|
@@ -1338,20 +1366,27 @@ public class DataSenderService extends Service {
|
|
if (menu == JSON.MENU.LIGHT) {
|
|
if (menu == JSON.MENU.LIGHT) {
|
|
//조명 상태, 제어
|
|
//조명 상태, 제어
|
|
return controlLight(kind, pos, reqData);
|
|
return controlLight(kind, pos, reqData);
|
|
- } else if (menu == JSON.MENU.HEATING) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (menu == JSON.MENU.HEATING) {
|
|
//난방 상태, 제어
|
|
//난방 상태, 제어
|
|
return controlHeating(kind, pos, reqData);
|
|
return controlHeating(kind, pos, reqData);
|
|
- } else if (menu == JSON.MENU.AIRCON) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (menu == JSON.MENU.AIRCON) {
|
|
//에어컨 상태, 제어
|
|
//에어컨 상태, 제어
|
|
//return controlAircon(kind, pos, reqData);
|
|
//return controlAircon(kind, pos, reqData);
|
|
return controlKnxAircon(kind, pos, reqData);
|
|
return controlKnxAircon(kind, pos, reqData);
|
|
- } else if (menu == JSON.MENU.VENTI) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (menu == JSON.MENU.VENTI) {
|
|
//환기 상태, 제어
|
|
//환기 상태, 제어
|
|
return controlPurity(kind, reqData);
|
|
return controlPurity(kind, reqData);
|
|
- } else if (menu == JSON.MENU.GAS) {
|
|
|
|
|
|
+ }
|
|
|
|
+ else if (menu == JSON.MENU.GAS) {
|
|
//가스 상태, 제어
|
|
//가스 상태, 제어
|
|
return controlGas(kind, reqData);
|
|
return controlGas(kind, reqData);
|
|
}
|
|
}
|
|
|
|
+ else if (menu == JSON.MENU.COOKTOP) {
|
|
|
|
+ return controlCookTop(kind, pos, reqData);
|
|
|
|
+ }
|
|
} catch (JSONException e) {
|
|
} catch (JSONException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
return JSON.ERROR.JsonException;
|
|
return JSON.ERROR.JsonException;
|
|
@@ -1363,7 +1398,7 @@ public class DataSenderService extends Service {
|
|
}
|
|
}
|
|
|
|
|
|
private JSONObject updateLight(int kind, int position) {
|
|
private JSONObject updateLight(int kind, int position) {
|
|
- String [] astrRoomTitle = null;
|
|
|
|
|
|
+ String[] astrRoomTitle = null;
|
|
String strLight = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
String strLight = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
String strRoomTitle = "";
|
|
String strRoomTitle = "";
|
|
if (mKnxData == null) {
|
|
if (mKnxData == null) {
|
|
@@ -1387,9 +1422,9 @@ public class DataSenderService extends Service {
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_LIGHT);
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_LIGHT);
|
|
wallpadStatusData.closeDB();
|
|
wallpadStatusData.closeDB();
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
- if(i==astrRoomTitle.length-1){
|
|
|
|
- strRoomTitle = strRoomTitle+astrRoomTitle[i];
|
|
|
|
- }else {
|
|
|
|
|
|
+ if (i == astrRoomTitle.length - 1) {
|
|
|
|
+ strRoomTitle = strRoomTitle + astrRoomTitle[i];
|
|
|
|
+ } else {
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1492,7 +1527,7 @@ public class DataSenderService extends Service {
|
|
|
|
|
|
private JSONObject updateHeating(int kind, int pos) {
|
|
private JSONObject updateHeating(int kind, int pos) {
|
|
String strHeating = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
String strHeating = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
- String [] astrRoomTitle = null;
|
|
|
|
|
|
+ String[] astrRoomTitle = null;
|
|
String strRoomTitle = "";
|
|
String strRoomTitle = "";
|
|
int roomCount = mHeatingV2API.data.Device.info.RoomCount;
|
|
int roomCount = mHeatingV2API.data.Device.info.RoomCount;
|
|
try {
|
|
try {
|
|
@@ -1504,9 +1539,9 @@ public class DataSenderService extends Service {
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_HEATING);
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_HEATING);
|
|
wallpadStatusData.closeDB();
|
|
wallpadStatusData.closeDB();
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
- if(i==astrRoomTitle.length-1){
|
|
|
|
- strRoomTitle = strRoomTitle+astrRoomTitle[i];
|
|
|
|
- }else {
|
|
|
|
|
|
+ if (i == astrRoomTitle.length - 1) {
|
|
|
|
+ strRoomTitle = strRoomTitle + astrRoomTitle[i];
|
|
|
|
+ } else {
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1524,7 +1559,7 @@ public class DataSenderService extends Service {
|
|
strHeating = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
strHeating = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }catch (Exception e) {
|
|
|
|
|
|
+ } catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1668,7 +1703,7 @@ public class DataSenderService extends Service {
|
|
|
|
|
|
private JSONObject updateKnxAircon(int kind, int pos) {
|
|
private JSONObject updateKnxAircon(int kind, int pos) {
|
|
String strAircon = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
String strAircon = "1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20";
|
|
- String [] astrRoomTitle = null;
|
|
|
|
|
|
+ String[] astrRoomTitle = null;
|
|
String strRoomTitle = "";
|
|
String strRoomTitle = "";
|
|
int roomCount = mKnxSystemAirconAPI.data.Device.info.InsideAirconCount;
|
|
int roomCount = mKnxSystemAirconAPI.data.Device.info.InsideAirconCount;
|
|
try {
|
|
try {
|
|
@@ -1680,9 +1715,9 @@ public class DataSenderService extends Service {
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_SYSTEMAIRCON);
|
|
astrRoomTitle = wallpadStatusData.GetDevRoomNameList(define.ROOM_NAME_SYSTEMAIRCON);
|
|
wallpadStatusData.closeDB();
|
|
wallpadStatusData.closeDB();
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
for (int i = 0; i < astrRoomTitle.length; i++) {
|
|
- if(i==astrRoomTitle.length-1){
|
|
|
|
- strRoomTitle = strRoomTitle+astrRoomTitle[i];
|
|
|
|
- }else {
|
|
|
|
|
|
+ if (i == astrRoomTitle.length - 1) {
|
|
|
|
+ strRoomTitle = strRoomTitle + astrRoomTitle[i];
|
|
|
|
+ } else {
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
strRoomTitle = strRoomTitle + astrRoomTitle[i] + "_";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1853,7 +1888,7 @@ public class DataSenderService extends Service {
|
|
jsonObject.accumulate("device_count", nCookTopCnt);
|
|
jsonObject.accumulate("device_count", nCookTopCnt);
|
|
JSONArray dataArray = new JSONArray();
|
|
JSONArray dataArray = new JSONArray();
|
|
if (kind == 0) { //전체 응답
|
|
if (kind == 0) { //전체 응답
|
|
- for (int i = 0; i < nCookTopCnt; i++) {
|
|
|
|
|
|
+ for (int i = 0; i < mCookTopData.Device[0].circuit.length; i++) {
|
|
// build jsonObject
|
|
// build jsonObject
|
|
JSONObject dataObject = new JSONObject();
|
|
JSONObject dataObject = new JSONObject();
|
|
dataObject.accumulate("hID", mCookTopData.Device[0].circuit[i].hID);
|
|
dataObject.accumulate("hID", mCookTopData.Device[0].circuit[i].hID);
|
|
@@ -1877,24 +1912,18 @@ public class DataSenderService extends Service {
|
|
try {
|
|
try {
|
|
if (menu == JSON.MENU.LIGHT) {
|
|
if (menu == JSON.MENU.LIGHT) {
|
|
return updateLight(kind, position);
|
|
return updateLight(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.CONCENT) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.CONCENT) {
|
|
return updateConcent(kind, position);
|
|
return updateConcent(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.HEATING) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.HEATING) {
|
|
return updateHeating(kind, position);
|
|
return updateHeating(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.AIRCON) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.AIRCON) {
|
|
return updateKnxAircon(kind, position);
|
|
return updateKnxAircon(kind, position);
|
|
//return updateAircon(kind, position);
|
|
//return updateAircon(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.VENTI) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.VENTI) {
|
|
return updateVenti(kind, position);
|
|
return updateVenti(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.GAS) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.GAS) {
|
|
return updateGas(kind, position);
|
|
return updateGas(kind, position);
|
|
- }
|
|
|
|
- else if (menu == JSON.MENU.COOKTOP) {
|
|
|
|
|
|
+ } else if (menu == JSON.MENU.COOKTOP) {
|
|
return updateCookTop(kind, position);
|
|
return updateCookTop(kind, position);
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -1962,7 +1991,7 @@ public class DataSenderService extends Service {
|
|
int[] Curtaininfo = devSet.Get_CURTAIN_Info();
|
|
int[] Curtaininfo = devSet.Get_CURTAIN_Info();
|
|
String[] strDeviceSeqValue = devSet.GetSettingData("UI순서");
|
|
String[] strDeviceSeqValue = devSet.GetSettingData("UI순서");
|
|
devSet.closeDB();
|
|
devSet.closeDB();
|
|
- if(strDeviceSeqValue!=null) {
|
|
|
|
|
|
+ if (strDeviceSeqValue != null) {
|
|
strLight = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("조명(") + 3), (strDeviceSeqValue[1].indexOf(")난방(")));
|
|
strLight = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("조명(") + 3), (strDeviceSeqValue[1].indexOf(")난방(")));
|
|
strHeating = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("난방(") + 3), (strDeviceSeqValue[1].indexOf(")에어컨(")));
|
|
strHeating = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("난방(") + 3), (strDeviceSeqValue[1].indexOf(")에어컨(")));
|
|
strAircon = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("에어컨(") + 4), (strDeviceSeqValue[1].indexOf("))")));
|
|
strAircon = strDeviceSeqValue[1].substring((strDeviceSeqValue[1].indexOf("에어컨(") + 4), (strDeviceSeqValue[1].indexOf("))")));
|
|
@@ -1973,7 +2002,7 @@ public class DataSenderService extends Service {
|
|
|
|
|
|
String[] devlist;
|
|
String[] devlist;
|
|
|
|
|
|
- if(Gasinfo==1){
|
|
|
|
|
|
+ if (Gasinfo == 1) {
|
|
devlist = new String[]{"gas", "livinglight", "doorlock", "light", "ventil", "thermostat", "smartlight", "cooktop", "sysaircon"};
|
|
devlist = new String[]{"gas", "livinglight", "doorlock", "light", "ventil", "thermostat", "smartlight", "cooktop", "sysaircon"};
|
|
} else {
|
|
} else {
|
|
devlist = new String[]{"livinglight", "doorlock", "light", "ventil", "thermostat", "smartlight", "sysaircon"};
|
|
devlist = new String[]{"livinglight", "doorlock", "light", "ventil", "thermostat", "smartlight", "sysaircon"};
|
|
@@ -2002,13 +2031,11 @@ public class DataSenderService extends Service {
|
|
if (mCooktopAPI != null) {
|
|
if (mCooktopAPI != null) {
|
|
int nGas = 0;
|
|
int nGas = 0;
|
|
int nOutlet = 0;
|
|
int nOutlet = 0;
|
|
- for (int j = 0; j < mCooktopAPI.data.DeviceCnt; j++) {
|
|
|
|
- for (int k = 0; k < mCooktopAPI.data.DeviceCnt; k++) {
|
|
|
|
- if (mCooktopAPI.data.Device[j].circuit[i].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.GASVALVE)
|
|
|
|
- nGas++;
|
|
|
|
- else if (mCooktopAPI.data.Device[j].circuit[i].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.OUTLET)
|
|
|
|
- nOutlet++;
|
|
|
|
- }
|
|
|
|
|
|
+ for (int k = 0; k < mCooktopAPI.data.Device[0].circuit.length; k++) {
|
|
|
|
+ if (mCooktopAPI.data.Device[0].circuit[k].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.GASVALVE)
|
|
|
|
+ nGas++;
|
|
|
|
+ else if (mCooktopAPI.data.Device[0].circuit[k].hType == DataClasses.CooktopCtrl.DEVICE_TYPE.OUTLET)
|
|
|
|
+ nOutlet++;
|
|
}
|
|
}
|
|
strResult += " <devinfo name=\"gas\" value=\"" + nGas + "\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"gas\" value=\"" + nGas + "\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"cooktop\" value=\"" + nOutlet + "\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"cooktop\" value=\"" + nOutlet + "\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
@@ -2017,8 +2044,7 @@ public class DataSenderService extends Service {
|
|
strResult += " <devinfo name=\"gas\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"gas\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"cooktop\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"cooktop\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("doorlock")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("doorlock")) {
|
|
try {
|
|
try {
|
|
if ((DoorLockInfo[0] == 1) && (DoorLockInfo[1] == WallpadDeviceSet.DOORLOCK_TYPE_NORMAL)) {
|
|
if ((DoorLockInfo[0] == 1) && (DoorLockInfo[1] == WallpadDeviceSet.DOORLOCK_TYPE_NORMAL)) {
|
|
strResult += " <devinfo name=\"doorlock\" value=\"1\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"doorlock\" value=\"1\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
@@ -2033,8 +2059,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"doorlock\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"doorlock\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("light")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("light")) {
|
|
try {
|
|
try {
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
|
|
@@ -2049,8 +2074,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"light\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"light\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("livinglight")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("livinglight")) {
|
|
try {
|
|
try {
|
|
|
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
@@ -2067,8 +2091,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"livinglight\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"livinglight\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("ventil")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("ventil")) {
|
|
try {
|
|
try {
|
|
if (Ventilinfo[0] == 0)
|
|
if (Ventilinfo[0] == 0)
|
|
strResult += " <devinfo name=\"ventil\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"ventil\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
@@ -2082,8 +2105,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"ventil\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"ventil\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("thermostat")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("thermostat")) {
|
|
try {
|
|
try {
|
|
byte RoomCount = 0;
|
|
byte RoomCount = 0;
|
|
if (mHeatingV2API != null) {
|
|
if (mHeatingV2API != null) {
|
|
@@ -2102,8 +2124,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"thermostat\" value=\"0\" order=\"" + strHeating + "\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"thermostat\" value=\"0\" order=\"" + strHeating + "\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("curtain")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("curtain")) {
|
|
try {
|
|
try {
|
|
if (Curtaininfo[0] == 0)
|
|
if (Curtaininfo[0] == 0)
|
|
strResult += " <devinfo name=\"curtain\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"curtain\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
@@ -2117,8 +2138,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"curtain\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"curtain\" value=\"0\" order=\"1\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("electric")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("electric")) {
|
|
try {
|
|
try {
|
|
// 콘센트 처리
|
|
// 콘센트 처리
|
|
int BadConcentCount = 0;
|
|
int BadConcentCount = 0;
|
|
@@ -2134,7 +2154,7 @@ public class DataSenderService extends Service {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Log.d(TAG, "[yskim] iCMDProcDevList() electric : " + BadConcentCount);
|
|
Log.d(TAG, "[yskim] iCMDProcDevList() electric : " + BadConcentCount);
|
|
- strResult += " <devinfo name=\"electric\" value=\"" + BadConcentCount + "\" floor=\"" + index + "\"/>\r\n";
|
|
|
|
|
|
+ strResult += " <devinfo name=\"electric\" value=\"" + BadConcentCount + "\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -2144,8 +2164,7 @@ public class DataSenderService extends Service {
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
strResult += " <devinfo name=\"electric\" value=\"0\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"electric\" value=\"0\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("smartlight")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("smartlight")) {
|
|
// KNX 조명 처리
|
|
// KNX 조명 처리
|
|
try {
|
|
try {
|
|
if (mKnxAPI != null) {
|
|
if (mKnxAPI != null) {
|
|
@@ -2160,14 +2179,14 @@ public class DataSenderService extends Service {
|
|
if (mKnxAPI.data.LivingRoom_EnergyMeter.Info.LightCount > 0)
|
|
if (mKnxAPI.data.LivingRoom_EnergyMeter.Info.LightCount > 0)
|
|
LivingLightCount = 1;
|
|
LivingLightCount = 1;
|
|
}
|
|
}
|
|
- int AllEMcount = LivingLightCount + mKnxAPI.data.MasterController.Info.Bad_EnergyMeterCount + mKnxAPI.data.MasterController.Info.Light_SwitchCount;;
|
|
|
|
|
|
+ int AllEMcount = LivingLightCount + mKnxAPI.data.MasterController.Info.Bad_EnergyMeterCount + mKnxAPI.data.MasterController.Info.Light_SwitchCount;
|
|
|
|
+ ;
|
|
strResult += " <devinfo name=\"smartlight\" value=\"" + AllEMcount + "\" order=\"" + strLight + "\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"smartlight\" value=\"" + AllEMcount + "\" order=\"" + strLight + "\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
} catch (Exception ek) {
|
|
} catch (Exception ek) {
|
|
strResult += " <devinfo name=\"smartlight\" value=\"" + 0 + "\" order=\"" + strLight + "\" floor=\"" + index + "\"/>\r\n";
|
|
strResult += " <devinfo name=\"smartlight\" value=\"" + 0 + "\" order=\"" + strLight + "\" floor=\"" + index + "\"/>\r\n";
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (devlist[i].equals("sysaircon")) {
|
|
|
|
|
|
+ } else if (devlist[i].equals("sysaircon")) {
|
|
// 에어컨 처리
|
|
// 에어컨 처리
|
|
KnxSystemAirconAPI airconAPI = mWallPadAPI.Get_KnxAirconController();
|
|
KnxSystemAirconAPI airconAPI = mWallPadAPI.Get_KnxAirconController();
|
|
if (airconAPI != null) {
|
|
if (airconAPI != null) {
|
|
@@ -2318,7 +2337,8 @@ public class DataSenderService extends Service {
|
|
}
|
|
}
|
|
|
|
|
|
if (mCooktopAPI != null) {
|
|
if (mCooktopAPI != null) {
|
|
- mCooktopAPI.Refresh(SystemAirconAPI.REFRESH_IDX.ALL, false);
|
|
|
|
|
|
+ mCookTopControl = new CookTopControl(mCooktopAPI);
|
|
|
|
+ mCooktopAPI.Refresh(Common.INDEX_ALL, false);
|
|
// 4. Data Copy
|
|
// 4. Data Copy
|
|
mCookTopData = mCooktopAPI.data;
|
|
mCookTopData = mCooktopAPI.data;
|
|
}
|
|
}
|
|
@@ -2499,6 +2519,20 @@ public class DataSenderService extends Service {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public void checkChangedCookTop() {
|
|
|
|
+ try {
|
|
|
|
+ Log.i(TAG, "[checkChangedCookTop] ===== START =====");
|
|
|
|
+ if (mCooktopAPI != null) {
|
|
|
|
+ mCooktopAPI.Refresh(Common.INDEX_ALL, false);
|
|
|
|
+ } else {
|
|
|
|
+ mCooktopAPI = mWallPadAPI.Get_CookTopController();
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ Log.e(TAG, "[Exception] checkChangedCookTop()");
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 제어기 상태를 가져온다.
|
|
* 제어기 상태를 가져온다.
|
|
*
|
|
*
|
|
@@ -2619,24 +2653,26 @@ public class DataSenderService extends Service {
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else if (strActionName.equals(BrID.BR_HEATING)) {
|
|
|
|
- Log.d(TAG, "********************* BR DataSenderService BR_HEATING ********************");
|
|
|
|
|
|
+ } else if (strActionName.equals(BrID.BR_COOKTOP)) {
|
|
|
|
+ Log.d(TAG, "********************* BR DataSenderService BR_COOKTOP ********************");
|
|
|
|
+ checkChangedCookTop();
|
|
|
|
+ } else if (strActionName.equals(BrID.BR_HEATING)) {
|
|
|
|
+ Log.d(TAG, "********************* BR DataSenderService BR_HEATING ********************");
|
|
checkChangedHeating();
|
|
checkChangedHeating();
|
|
} else if (strActionName.equals(BrID.BR_AIRCON)) {
|
|
} else if (strActionName.equals(BrID.BR_AIRCON)) {
|
|
- Log.d(TAG, "********************* BR DataSenderService BR_AIRCON ********************");
|
|
|
|
|
|
+ Log.d(TAG, "********************* BR DataSenderService BR_AIRCON ********************");
|
|
checkChangedAircon();
|
|
checkChangedAircon();
|
|
} else if (strActionName.equals(BrID.BR_SDB_EVENT)) {
|
|
} else if (strActionName.equals(BrID.BR_SDB_EVENT)) {
|
|
- Log.d(TAG, "********************* DataSenderService BR_SDB_EVENT ********************");
|
|
|
|
|
|
+ Log.d(TAG, "********************* DataSenderService BR_SDB_EVENT ********************");
|
|
checkChangedSdb(false);
|
|
checkChangedSdb(false);
|
|
} else if (strActionName.equals(BrID.BR_KNX_EVENT)) {
|
|
} else if (strActionName.equals(BrID.BR_KNX_EVENT)) {
|
|
- Log.d(TAG, "********************* DataSenderService BR_KNX_EVENT ********************");
|
|
|
|
|
|
+ Log.d(TAG, "********************* DataSenderService BR_KNX_EVENT ********************");
|
|
deviceApiLoadLight();
|
|
deviceApiLoadLight();
|
|
} else if (strActionName.equals(BrID.BR_SDB_LIVING_EVENT)) {
|
|
} else if (strActionName.equals(BrID.BR_SDB_LIVING_EVENT)) {
|
|
// Log.d(TAG, "********************* DataSenderService.BR_SDB_LIVING_EVENT ******************** -> bDeviceInitComplete [" + bDeviceInitComplete + "]");
|
|
// Log.d(TAG, "********************* DataSenderService.BR_SDB_LIVING_EVENT ******************** -> bDeviceInitComplete [" + bDeviceInitComplete + "]");
|
|
//checkChangedSdbLivingLight();
|
|
//checkChangedSdbLivingLight();
|
|
} else if (strActionName.equals(BrID.BR_VENTIL)) {
|
|
} else if (strActionName.equals(BrID.BR_VENTIL)) {
|
|
- Log.d(TAG, "********************* BR DataSenderService.BR_VENTIL ********************");
|
|
|
|
|
|
+ Log.d(TAG, "********************* BR DataSenderService.BR_VENTIL ********************");
|
|
checkChangedVentilation();
|
|
checkChangedVentilation();
|
|
} else if (strActionName.equals(define.NOTIFY_ACNAME)) {
|
|
} else if (strActionName.equals(define.NOTIFY_ACNAME)) {
|
|
int kind = intent.getIntExtra(define.NOTIBR_KIND, 0);
|
|
int kind = intent.getIntExtra(define.NOTIBR_KIND, 0);
|
|
@@ -2766,6 +2802,7 @@ public class DataSenderService extends Service {
|
|
//mIntentFilter.addAction(BrID.BR_ENERGY_METER);
|
|
//mIntentFilter.addAction(BrID.BR_ENERGY_METER);
|
|
}
|
|
}
|
|
mIntentFilter.addAction(BrID.BR_GAS);
|
|
mIntentFilter.addAction(BrID.BR_GAS);
|
|
|
|
+ mIntentFilter.addAction(BrID.BR_COOKTOP);
|
|
mIntentFilter.addAction(BrID.BR_VENTIL);
|
|
mIntentFilter.addAction(BrID.BR_VENTIL);
|
|
mIntentFilter.addAction(BrID.BR_HEATING);
|
|
mIntentFilter.addAction(BrID.BR_HEATING);
|
|
getApplicationContext().registerReceiver(mSendDataEventBR, mIntentFilter);
|
|
getApplicationContext().registerReceiver(mSendDataEventBR, mIntentFilter);
|
|
@@ -2802,6 +2839,7 @@ public class DataSenderService extends Service {
|
|
}
|
|
}
|
|
|
|
|
|
if (mGasAPI != null) mGasAPI.regChangedBR(BrID.BR_GAS);
|
|
if (mGasAPI != null) mGasAPI.regChangedBR(BrID.BR_GAS);
|
|
|
|
+ if (mCooktopAPI != null) mCooktopAPI.regChangedBR(BrID.BR_COOKTOP);
|
|
if (mVentiAPI != null) mVentiAPI.regChangedBR(BrID.BR_VENTIL);
|
|
if (mVentiAPI != null) mVentiAPI.regChangedBR(BrID.BR_VENTIL);
|
|
if (mHeatingV2API != null) mHeatingV2API.regChangedBR(BrID.BR_HEATING);
|
|
if (mHeatingV2API != null) mHeatingV2API.regChangedBR(BrID.BR_HEATING);
|
|
|
|
|