|
@@ -523,7 +523,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
private void Draw_Update() {
|
|
|
DebugLogOutput("[Draw_Update]");
|
|
|
|
|
|
- int ConcentCount = mData.Em.eachRoom[mCurrentRoomIndex].ConCnt;
|
|
|
+ int ConcentCount = mData.Em.eachRoom[mCurrentRoomIndex].ConOnOff.length;
|
|
|
|
|
|
boolean Mode = mData.Em.eachRoom[mCurrentRoomIndex].ConMode;
|
|
|
|
|
@@ -556,7 +556,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
* 페이지에 따라 이미지를 다시 그린다.
|
|
|
*/
|
|
|
private void Draw_ContentPage(int page) {
|
|
|
- mTotalPage = (mData.Em.eachRoom[mCurrentRoomIndex].ConCnt / 2) + (mData.Em.eachRoom[mCurrentRoomIndex].ConCnt % 2);
|
|
|
+ mTotalPage = (mData.Em.eachRoom[mCurrentRoomIndex].ConOnOff.length / 2) + (mData.Em.eachRoom[mCurrentRoomIndex].ConOnOff.length % 2);
|
|
|
DebugLogOutput("[Draw_ContentPage] page [" + page + "], mTotalPage [" + mTotalPage + "]");
|
|
|
if (mTotalPage == 1) {
|
|
|
if (PagePrevBtn != null&& getLayout()!=null) getLayout().removeView(PagePrevBtn);
|
|
@@ -733,7 +733,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
protected void ShowRealUI()
|
|
|
{
|
|
|
//전체 갯수에서 확인이 필요함 만약에 4개라는 가정하에 가면 해당 정보가 맞음
|
|
|
- int ConcentCount = mData.Em.eachRoom[mCurrentRoomIndex].ConCnt;
|
|
|
+ int ConcentCount = mData.Em.eachRoom[mCurrentRoomIndex].ConOnOff.length;
|
|
|
if(ConcentCount == 1)
|
|
|
{
|
|
|
//홀수
|
|
@@ -1261,7 +1261,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[index].ConCnt)) {
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[index].ConOnOff.length)) {
|
|
|
Log.w(TAG, "[Device_SetConcentOnOff] Param (ConcentIdx) Out of range!!! (" + ConcentIdx + ")");
|
|
|
return -3;
|
|
|
}
|
|
@@ -1315,7 +1315,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConCnt)) {
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConOnOff.length)) {
|
|
|
Log.w(TAG, "[Device_SetConcentMode] Param (ConcentIdx) Out of range!!! (" + ConcentIdx + ")");
|
|
|
return -3;
|
|
|
}
|
|
@@ -1368,7 +1368,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConCnt)) {
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConOnOff.length)) {
|
|
|
Log.w(TAG, "[Device_SetConcentCutOff] Param (ConcentIdx) Out of range!!! (" + ConcentIdx + ")");
|
|
|
return -3;
|
|
|
}
|
|
@@ -1439,7 +1439,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
mCurrentRoomIndex++;
|
|
|
if (mCurrentRoomIndex >= mData.RoomCnt) mCurrentRoomIndex = 0;
|
|
|
}
|
|
|
- if (mData.Em.eachRoom[mCurrentRoomIndex].ConCnt > 0) return true;
|
|
|
+ if (mData.Em.eachRoom[mCurrentRoomIndex].ConOnOff.length > 0) return true;
|
|
|
}
|
|
|
|
|
|
return false;
|
|
@@ -1462,7 +1462,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
if (mData.Em == null) return;
|
|
|
if (mData.Em.eachRoom == null) return;
|
|
|
if ((RoomIdx < 0) || (RoomIdx >= mData.RoomCnt)) return;
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConCnt)) return;
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConOnOff.length)) return;
|
|
|
|
|
|
DataClasses.EnergyMeter.EachRoom Concent = mData.Em.eachRoom[RoomIdx];
|
|
|
if (Concent == null) return;
|
|
@@ -1501,7 +1501,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
if (mData.Em == null) return;
|
|
|
if (mData.Em.eachRoom == null) return;
|
|
|
if ((RoomIdx < 0) || (RoomIdx >= mData.RoomCnt)) return;
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConCnt)) return;
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConOnOff.length)) return;
|
|
|
|
|
|
DataClasses.EnergyMeter.EachRoom Concent = mData.Em.eachRoom[RoomIdx];
|
|
|
if (Concent == null) return;
|
|
@@ -1527,7 +1527,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
if (mData.Em == null) return;
|
|
|
if (mData.Em.eachRoom == null) return;
|
|
|
if ((RoomIdx < 0) || (RoomIdx >= mData.RoomCnt)) return;
|
|
|
- if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConCnt)) return;
|
|
|
+ if ((ConcentIdx < 0) || (ConcentIdx >= mData.Em.eachRoom[RoomIdx].ConOnOff.length)) return;
|
|
|
|
|
|
DataClasses.EnergyMeter.EachRoom Concent = mData.Em.eachRoom[RoomIdx];
|
|
|
if (Concent == null) return;
|
|
@@ -1551,7 +1551,7 @@ public class ConcentEnergyMeterPopupScreen extends WpadScreen {
|
|
|
// ConcentData
|
|
|
String ConcentData = "ConcentData" + ";";
|
|
|
for (byte i = 0; i < mData.RoomCnt; i++) {
|
|
|
- byte ConcentCount = mData.Em.eachRoom[i].ConCnt;
|
|
|
+ int ConcentCount = mData.Em.eachRoom[i].ConOnOff.length;
|
|
|
ConcentData += ConcentCount + ";";
|
|
|
|
|
|
byte Mode; //byte
|