|
@@ -192,7 +192,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
String dataSeq = heatingData.getData_seq();
|
|
String dataSeq = heatingData.getData_seq();
|
|
String[] strDataSeq = dataSeq.split("_");
|
|
String[] strDataSeq = dataSeq.split("_");
|
|
for(int i=0;i<strDataSeq.length;i++){
|
|
for(int i=0;i<strDataSeq.length;i++){
|
|
- ROOM_POS[i] = Integer.valueOf(strDataSeq[i]);
|
|
|
|
|
|
+ ROOM_POS[i] = Integer.valueOf(strDataSeq[i])-1;
|
|
}
|
|
}
|
|
|
|
|
|
DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;
|
|
DataClasses.HeatingV2.Info info = mData.heatingV2.Device.info;
|
|
@@ -234,10 +234,16 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
private void requestMultiCommand(int kind, int reason, int position, String category, int number, int state) {
|
|
private void requestMultiCommand(int kind, int reason, int position, String category, int number, int state) {
|
|
|
|
+ if (timer != null)
|
|
|
|
+ timer.cancel();
|
|
|
|
+ position = ROOM_POS[position];
|
|
((PopupActivity) mContext).requestMultiControl(handler, JSON.MENU.HEATING, kind, reason, position, category, number, state);
|
|
((PopupActivity) mContext).requestMultiControl(handler, JSON.MENU.HEATING, kind, reason, position, category, number, state);
|
|
}
|
|
}
|
|
|
|
|
|
private void requestMultiCommand(int kind, int reason, int position, String category, int number, double state) {
|
|
private void requestMultiCommand(int kind, int reason, int position, String category, int number, double state) {
|
|
|
|
+ if (timer != null)
|
|
|
|
+ timer.cancel();
|
|
|
|
+ position = ROOM_POS[position];
|
|
((PopupActivity) mContext).requestMultiControl(handler, JSON.MENU.HEATING, kind, reason, position, category, number, state);
|
|
((PopupActivity) mContext).requestMultiControl(handler, JSON.MENU.HEATING, kind, reason, position, category, number, state);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -665,6 +671,9 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
Data_CheckReservation();
|
|
Data_CheckReservation();
|
|
Data_CheckSleep();
|
|
Data_CheckSleep();
|
|
|
|
|
|
|
|
+ //if (timer != null)
|
|
|
|
+ // timer.cancel();
|
|
|
|
+
|
|
new Handler().postDelayed(new Runnable() {
|
|
new Handler().postDelayed(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
@@ -788,8 +797,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
if (MoveEvent == MotionEvent.ACTION_UP) {
|
|
if (MoveEvent == MotionEvent.ACTION_UP) {
|
|
if (TargetId == ID.heatingV2Popup.tabDefault.button.ONOFF) {
|
|
if (TargetId == ID.heatingV2Popup.tabDefault.button.ONOFF) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-ONOFF] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-ONOFF] BUTTON !!!");
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
byte ChangeMode = HeatingV2.MODE.HeatingOFF;
|
|
byte ChangeMode = HeatingV2.MODE.HeatingOFF;
|
|
if (!Data_DriveModeConverterOnOff((byte) this.mCurrentRoomIndex))
|
|
if (!Data_DriveModeConverterOnOff((byte) this.mCurrentRoomIndex))
|
|
@@ -799,12 +807,10 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.HEATING) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.HEATING) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-HEATING] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-HEATING] BUTTON !!!");
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.HeatingON) {
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.HeatingON) {
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
byte ChangeMode = HeatingV2.MODE.HeatingON;
|
|
byte ChangeMode = HeatingV2.MODE.HeatingON;
|
|
//난방 개별 제어.
|
|
//난방 개별 제어.
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
@@ -812,34 +818,29 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
}
|
|
}
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.RESERVATION) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.RESERVATION) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-RESERVATION] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-RESERVATION] BUTTON !!!");
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Reservation) {
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Reservation) {
|
|
byte ChangeMode = HeatingV2.MODE.Reservation;
|
|
byte ChangeMode = HeatingV2.MODE.Reservation;
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
//난방 개별 제어.
|
|
//난방 개별 제어.
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
}
|
|
}
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.SLEEP) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.SLEEP) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-SLEEP] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-SLEEP] BUTTON !!!");
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Sleep) {
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Sleep) {
|
|
byte ChangeMode = HeatingV2.MODE.Sleep;
|
|
byte ChangeMode = HeatingV2.MODE.Sleep;
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
//난방 개별 제어.
|
|
//난방 개별 제어.
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, this.mCurrentRoomIndex, "set_mode", 0, ChangeMode);
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
//Sample_ControlMode((byte) this.mCurrentRoomIndex, ChangeMode);
|
|
}
|
|
}
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.OUTING) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.OUTING) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-OUTING] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-OUTING] BUTTON !!!");
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Outing) {
|
|
if (Data_getDriveMode((byte) mCurrentRoomIndex) != HeatingV2.MODE.Outing) {
|
|
byte ChangeMode = HeatingV2.MODE.Outing;
|
|
byte ChangeMode = HeatingV2.MODE.Outing;
|
|
@@ -850,8 +851,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_UP(short)] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_UP(short)] BUTTON !!!");
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
Data_TempUpDn(true);
|
|
Data_TempUpDn(true);
|
|
|
|
|
|
@@ -862,8 +862,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_DN) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_DN) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_DN(short)] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_DN(short)] BUTTON !!!");
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
Data_TempUpDn(false);
|
|
Data_TempUpDn(false);
|
|
|
|
|
|
@@ -876,8 +875,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
|
|
if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_UP) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_UP(long)] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_UP(long)] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
Data_TempUpDn(true);
|
|
Data_TempUpDn(true);
|
|
|
|
|
|
@@ -889,8 +887,7 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_DN) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabDefault.button.TEMP_DN) {
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_DN(long)] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [DefaultTab-TEMP_DN(long)] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+
|
|
|
|
|
|
Data_TempUpDn(false);
|
|
Data_TempUpDn(false);
|
|
|
|
|
|
@@ -920,10 +917,12 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
|
|
|
|
int base = 0;
|
|
int base = 0;
|
|
if (mData.AmPm) base = 12;
|
|
if (mData.AmPm) base = 12;
|
|
- boolean OnOff = mData.heatingV2.Device.Room[mCurrentRoomIndex].Reservation.getSchedule(index + base);
|
|
|
|
|
|
+ byte pos = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
|
|
+ boolean OnOff = mData.heatingV2.Device.Room[pos].Reservation.getSchedule(index + base);
|
|
if (OnOff) OnOff = false;
|
|
if (OnOff) OnOff = false;
|
|
else OnOff = true;
|
|
else OnOff = true;
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Reservation.setSchedule(index + base, OnOff);
|
|
|
|
|
|
+ mData.heatingV2.Device.Room[pos].Reservation.setSchedule(index + base, OnOff);
|
|
Draw_TimeBtn(index, OnOff);
|
|
Draw_TimeBtn(index, OnOff);
|
|
|
|
|
|
mData.ChangeReservation = true;
|
|
mData.ChangeReservation = true;
|
|
@@ -937,20 +936,20 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
if (TargetId == ID.heatingV2Popup.tabSleep.button.TIME_LEFT) {
|
|
if (TargetId == ID.heatingV2Popup.tabSleep.button.TIME_LEFT) {
|
|
DebugLogOutput("onTouchEvent [Sleep-TIME_LEFT] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [Sleep-TIME_LEFT] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
+ byte pos = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
|
|
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.setTimeDecrease();
|
|
|
|
|
|
+ mData.heatingV2.Device.Room[pos].Sleep.setTimeDecrease();
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleepTime = true;
|
|
mData.ChangeSleepTime = true;
|
|
} else if (TargetId == ID.heatingV2Popup.tabSleep.button.TIME_RIGHT) {
|
|
} else if (TargetId == ID.heatingV2Popup.tabSleep.button.TIME_RIGHT) {
|
|
DebugLogOutput("onTouchEvent [Sleep-TIME_RIGHT] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [Sleep-TIME_RIGHT] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
- if (timer != null)
|
|
|
|
- timer.cancel();
|
|
|
|
|
|
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.setTimeIncrease();
|
|
|
|
|
|
+ byte pos = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
|
|
+ mData.heatingV2.Device.Room[pos].Sleep.setTimeIncrease();
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleepTime = true;
|
|
mData.ChangeSleepTime = true;
|
|
@@ -958,7 +957,10 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
DebugLogOutput("onTouchEvent [Sleep-TEMP_LEFT] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [Sleep-TEMP_LEFT] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.setTempDecrease();
|
|
|
|
|
|
+ byte pos = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ mData.heatingV2.Device.Room[pos].Sleep.setTempDecrease();
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleepTemp = true;
|
|
mData.ChangeSleepTemp = true;
|
|
@@ -966,7 +968,10 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
DebugLogOutput("onTouchEvent [Sleep-TEMP_RIGHT] BUTTON !!!");
|
|
DebugLogOutput("onTouchEvent [Sleep-TEMP_RIGHT] BUTTON !!!");
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
|
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.setTempIncrease();
|
|
|
|
|
|
+ byte pos = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ mData.heatingV2.Device.Room[pos].Sleep.setTempIncrease();
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
drawUpdate((byte) mCurrentRoomIndex);
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleep = true;
|
|
mData.ChangeSleepTemp = true;
|
|
mData.ChangeSleepTemp = true;
|
|
@@ -1051,7 +1056,9 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
Background.setImageResource(R.drawable.bg_popup_heat_reserv);
|
|
Background.setImageResource(R.drawable.bg_popup_heat_reserv);
|
|
}
|
|
}
|
|
|
|
|
|
- HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[mCurrentRoomIndex];
|
|
|
|
|
|
+ int pos = ROOM_POS[index];
|
|
|
|
+
|
|
|
|
+ HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[pos];
|
|
|
|
|
|
// 오전오후
|
|
// 오전오후
|
|
if (!mData.AmPm) R_AmPmBtn.setButtonFrontImage();
|
|
if (!mData.AmPm) R_AmPmBtn.setButtonFrontImage();
|
|
@@ -1070,7 +1077,9 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
Background.setImageResource(R.drawable.bg_popup_heat_sleep);
|
|
Background.setImageResource(R.drawable.bg_popup_heat_sleep);
|
|
}
|
|
}
|
|
|
|
|
|
- HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[mCurrentRoomIndex];
|
|
|
|
|
|
+ int pos = ROOM_POS[index];
|
|
|
|
+
|
|
|
|
+ HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[pos];
|
|
|
|
|
|
// 운전시간
|
|
// 운전시간
|
|
S_TimeText.setText(roomData.Sleep.getTimeStr());
|
|
S_TimeText.setText(roomData.Sleep.getTimeStr());
|
|
@@ -1414,8 +1423,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
private void Device_NowTempSet() {
|
|
private void Device_NowTempSet() {
|
|
if (mData.TempSetDelayedEnable) {
|
|
if (mData.TempSetDelayedEnable) {
|
|
mDeviceTempSetHandler.removeMessages(DEVICE_CMD_TEMP_CHANGE);
|
|
mDeviceTempSetHandler.removeMessages(DEVICE_CMD_TEMP_CHANGE);
|
|
-
|
|
|
|
- double SetTemp = mData.heatingV2.Device.Room[mCurrentRoomIndex].SetTemp;
|
|
|
|
|
|
+ int newIndex = ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+ double SetTemp = mData.heatingV2.Device.Room[newIndex].SetTemp;
|
|
Log.i(TAG, "[Device_NowTempSet] mCurrentRoomIndex : " + mCurrentRoomIndex + " , SetTemp : " + SetTemp);
|
|
Log.i(TAG, "[Device_NowTempSet] mCurrentRoomIndex : " + mCurrentRoomIndex + " , SetTemp : " + SetTemp);
|
|
Device_ControlTemp((byte) mCurrentRoomIndex, SetTemp);
|
|
Device_ControlTemp((byte) mCurrentRoomIndex, SetTemp);
|
|
|
|
|
|
@@ -1438,9 +1447,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
try {
|
|
try {
|
|
if (msg.what == DEVICE_CMD_TEMP_CHANGE) {
|
|
if (msg.what == DEVICE_CMD_TEMP_CHANGE) {
|
|
Log.i(TAG, "DEVICE_CMD_TEMP_CHANGE !!!");
|
|
Log.i(TAG, "DEVICE_CMD_TEMP_CHANGE !!!");
|
|
-
|
|
|
|
- double SetTemp = mData.heatingV2.Device.Room[mCurrentRoomIndex].SetTemp;
|
|
|
|
- Log.i(TAG, "[mDeviceTempSetHandler] mCurrentRoomIndex : " + mCurrentRoomIndex + " , SetTemp : " + SetTemp);
|
|
|
|
|
|
+ int newIndex = ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+ double SetTemp = mData.heatingV2.Device.Room[newIndex].SetTemp;
|
|
|
|
|
|
Device_ControlTemp((byte) mCurrentRoomIndex, SetTemp);
|
|
Device_ControlTemp((byte) mCurrentRoomIndex, SetTemp);
|
|
|
|
|
|
@@ -1479,7 +1487,8 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
double TempRange = 1.0;
|
|
double TempRange = 1.0;
|
|
if (info.Support.SetTempPoint05) TempRange = 0.5;
|
|
if (info.Support.SetTempPoint05) TempRange = 0.5;
|
|
|
|
|
|
- HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[mCurrentRoomIndex];
|
|
|
|
|
|
+ byte newIndex = (byte) ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+ HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[newIndex];
|
|
if (UpDn) {
|
|
if (UpDn) {
|
|
// UP
|
|
// UP
|
|
roomData.SetTemp += TempRange;
|
|
roomData.SetTemp += TempRange;
|
|
@@ -1534,10 +1543,11 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
private void Data_CheckReservation() {
|
|
private void Data_CheckReservation() {
|
|
if (!mData.ChangeReservation) return;
|
|
if (!mData.ChangeReservation) return;
|
|
mData.ChangeReservation = false;
|
|
mData.ChangeReservation = false;
|
|
|
|
+ int newIndex = ROOM_POS[mCurrentRoomIndex];
|
|
|
|
|
|
//난방 개별 제어.
|
|
//난방 개별 제어.
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, mCurrentRoomIndex, "set_reservation", 0,
|
|
requestMultiCommand(JSON.KIND.Individual, JSON.REASON.Control, mCurrentRoomIndex, "set_reservation", 0,
|
|
- mData.heatingV2.Device.Room[mCurrentRoomIndex].Reservation.getInt());
|
|
|
|
|
|
+ mData.heatingV2.Device.Room[newIndex].Reservation.getInt());
|
|
//Device_SetReservation((byte) mCurrentRoomIndex,
|
|
//Device_SetReservation((byte) mCurrentRoomIndex,
|
|
// mData.heatingV2.Device.Room[mCurrentRoomIndex].Reservation.getInt());
|
|
// mData.heatingV2.Device.Room[mCurrentRoomIndex].Reservation.getInt());
|
|
}
|
|
}
|
|
@@ -1551,12 +1561,14 @@ public class HeatingV2PopupTestScreen extends WpadScreen {
|
|
|
|
|
|
byte SetTemp = 0x00;
|
|
byte SetTemp = 0x00;
|
|
byte SetTime = 0x00;
|
|
byte SetTime = 0x00;
|
|
|
|
+ int newIndex = ROOM_POS[mCurrentRoomIndex];
|
|
|
|
+
|
|
if (mData.ChangeSleepTemp) {
|
|
if (mData.ChangeSleepTemp) {
|
|
- SetTemp = mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.getTemp();
|
|
|
|
|
|
+ SetTemp = mData.heatingV2.Device.Room[newIndex].Sleep.getTemp();
|
|
}
|
|
}
|
|
mData.ChangeSleepTemp = false;
|
|
mData.ChangeSleepTemp = false;
|
|
if (mData.ChangeSleepTime) {
|
|
if (mData.ChangeSleepTime) {
|
|
- SetTime = mData.heatingV2.Device.Room[mCurrentRoomIndex].Sleep.getTime();
|
|
|
|
|
|
+ SetTime = mData.heatingV2.Device.Room[newIndex].Sleep.getTime();
|
|
}
|
|
}
|
|
mData.ChangeSleepTime = false;
|
|
mData.ChangeSleepTime = false;
|
|
|
|
|