|
@@ -79,7 +79,9 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
private int ROOM_CNT = ROOM_CNT_NORMAL; // 한 화면에 표시하는 방개수
|
|
|
private final static int ROOM_CNT_EASYMODE = 4;
|
|
|
private final static int ROOM_CNT_NORMAL = 6;
|
|
|
- private final int[] ROOM_POS = {0,1,2,3,4,5,6,7,8,9,10,11,12};
|
|
|
+ //private final int[] ROOM_POS = {0,1,2,3,4,5,6,7,8,9,10,11,12};
|
|
|
+ private final int[] ROOM_POS = {7,6,5,4,3,2,1,0,8,9,10,11,12};
|
|
|
+
|
|
|
|
|
|
int nDistributionPanelType = Version.DISTRIBUTION_MODEL.OTHER;
|
|
|
|
|
@@ -342,6 +344,7 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
// 1. Data Create
|
|
|
DebugLogOutput("[HeatingV2MainScreen] - Step1 : Data Create");
|
|
|
OPERATION_MODE = operationMode;
|
|
|
+ //OPERATION_MODE = Common.MODE_BUSINESS_SAMPLE;
|
|
|
WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
|
|
|
nDistributionPanelType = wds.Get_DistributionPannelType_Info();
|
|
|
wds.closeDB();
|
|
@@ -759,6 +762,8 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
|
|
|
Intent data = new Intent();
|
|
|
|
|
|
+ //index = ROOM_POS[index];
|
|
|
+
|
|
|
// 타겟 룸인덱스
|
|
|
data.putExtra("ROOM_INDEX", index);
|
|
|
|
|
@@ -853,21 +858,22 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
}
|
|
|
}
|
|
|
else {
|
|
|
- if (!checkRoomIndex(index)) return;
|
|
|
|
|
|
byte pos = (byte) ROOM_POS[index];
|
|
|
|
|
|
- HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[pos];
|
|
|
- //HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[index];
|
|
|
+ if (!checkRoomIndex(pos)) return;
|
|
|
+
|
|
|
+ //HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[pos];
|
|
|
+ HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[index];
|
|
|
|
|
|
// 운전모드 표시
|
|
|
- drawModeChange(index, roomData.bValveStatus, roomData.Mode);
|
|
|
+ drawModeChange(pos, roomData.bValveStatus, roomData.Mode);
|
|
|
|
|
|
// 현재온도 표시
|
|
|
- drawCurrentTemper(index, roomData.NowTemp);
|
|
|
+ drawCurrentTemper(pos, roomData.NowTemp);
|
|
|
|
|
|
// 설정온도 표시
|
|
|
- if (Data_DriveModeConverterOnOff(index)) drawSetTemper(index, roomData.SetTemp);
|
|
|
+ if (Data_DriveModeConverterOnOff(index)) drawSetTemper(pos, roomData.SetTemp);
|
|
|
else roomView[index].TXT_TEMPER_SET.setText("");
|
|
|
}
|
|
|
|
|
@@ -1064,8 +1070,8 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
*/
|
|
|
private void drawEntireRoomTitle(int idx) {
|
|
|
if (mData == null) return;
|
|
|
- int room_title = ROOM_POS[idx];
|
|
|
- drawRoomTitle(idx, astrRoomTitle[room_title]);
|
|
|
+ int newIndex = ROOM_POS[idx];
|
|
|
+ drawRoomTitle(idx, astrRoomTitle[newIndex]);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1378,6 +1384,7 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
*/
|
|
|
private int ctrlDeviceMode(byte RoomIdx, byte DeiveMode) {
|
|
|
DebugLogOutput("[ctrlDeviceMode] - (RoomIdx:" + RoomIdx + ", DeiveMode:" + String.format("%02x", DeiveMode) + ")");
|
|
|
+ RoomIdx = (byte) ROOM_POS[RoomIdx];
|
|
|
return ctrlDeviceUnitStatus(RoomIdx, DeiveMode, 0);
|
|
|
}
|
|
|
|
|
@@ -1474,7 +1481,7 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
byte RoomCount = (byte) ROOM_CNT;
|
|
|
int GetRoomCount = DB_GetSampleRoomNumber();
|
|
|
if(GetRoomCount > 0) RoomCount = (byte) GetRoomCount;
|
|
|
-// RoomCount = 6; // 테스트 @@@@@@@@@@
|
|
|
+ RoomCount = 8; // 테스트 @@@@@@@@@@
|
|
|
mData.heatingV2.Device.SetRoomCount(RoomCount);
|
|
|
|
|
|
HeatingV2.Info info = mData.heatingV2.Device.info;
|
|
@@ -1514,44 +1521,50 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
HeatingV2.RoomData roomData = mData.heatingV2.Device.Room[i];
|
|
|
switch (i) {
|
|
|
case 0:
|
|
|
+ case 7:
|
|
|
roomData.Mode = HeatingV2.MODE.HeatingON;
|
|
|
- roomData.SetTemp = 19.5;
|
|
|
- roomData.NowTemp = 18.0;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
ON = true;
|
|
|
break;
|
|
|
|
|
|
case 1:
|
|
|
+ case 8:
|
|
|
roomData.Mode = HeatingV2.MODE.HeatingON;
|
|
|
- roomData.SetTemp = 16.0;
|
|
|
- roomData.NowTemp = 16.5;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
ON = true;
|
|
|
break;
|
|
|
|
|
|
case 2:
|
|
|
+ case 9:
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020GL) roomData.Mode = HeatingV2.MODE.Pause;
|
|
|
else roomData.Mode = HeatingV2.MODE.Outing;
|
|
|
|
|
|
- roomData.SetTemp = 16.5;
|
|
|
- roomData.NowTemp = 15.0;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
|
|
|
break;
|
|
|
|
|
|
case 3:
|
|
|
+ case 10:
|
|
|
roomData.Mode = HeatingV2.MODE.HeatingOFF;
|
|
|
- roomData.SetTemp = 22.0;
|
|
|
- roomData.NowTemp = 20.5;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
break;
|
|
|
|
|
|
case 4:
|
|
|
+ case 11:
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020GL) roomData.Mode = HeatingV2.MODE.Sleep;
|
|
|
else roomData.Mode = HeatingV2.MODE.HeatingON;
|
|
|
|
|
|
- roomData.SetTemp = 20.0;
|
|
|
- roomData.NowTemp = 14.5;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
ON = true;
|
|
|
break;
|
|
|
|
|
|
case 5:
|
|
|
+ case 12:
|
|
|
if (Version.getModelType() == Version.MODEL_TYPE.IHN_1020GL) {
|
|
|
roomData.Mode = HeatingV2.MODE.Reservation;
|
|
|
ON = true;
|
|
@@ -1560,14 +1573,15 @@ public class HeatingV2MainScreen extends WpadScreen {
|
|
|
roomData.Mode = HeatingV2.MODE.HeatingOFF;
|
|
|
}
|
|
|
|
|
|
- roomData.SetTemp = 18.0;
|
|
|
- roomData.NowTemp = 17.0;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
break;
|
|
|
|
|
|
case 6:
|
|
|
+ case 13:
|
|
|
roomData.Mode = HeatingV2.MODE.HeatingON;
|
|
|
- roomData.SetTemp = 16.0;
|
|
|
- roomData.NowTemp = 16.5;
|
|
|
+ roomData.SetTemp = 10.0+i;
|
|
|
+ roomData.NowTemp = 10.5+i;
|
|
|
ON = true;
|
|
|
break;
|
|
|
}
|