|
@@ -58,7 +58,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
WpadImageView Show_ListTypeBG; //리스트의 배경 그리기
|
|
|
WpadImageView Show_EnergyListTypeBG; //에너지 선택 리스트의 배경 그리기
|
|
|
WpadImageView Show_BG_Calendar; //달력 배경
|
|
|
- WpadImageView Show_BG_Discription; //에너지 설명 배경(예, 전기 사용량을 작년 3개월과 ...)
|
|
|
+ WpadImageView Show_BG_Description; //에너지 설명 배경(예, 전기 사용량을 작년 3개월과 ...)
|
|
|
WpadImageView Show_BG_Graph; //에너지 그래프 배경
|
|
|
WpadImageView Show_Today;
|
|
|
WpadImageView Show_Calendar_Item[] = new WpadImageView[31];
|
|
@@ -147,7 +147,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
boolean mOpenListMonth = false;
|
|
|
int mCalendarItemIndex = 0;
|
|
|
MonthTableClass monthTableClass[] = new MonthTableClass[6];
|
|
|
- MonthTableClass monthTableClassRight[] = new MonthTableClass[4];
|
|
|
+ MonthTableClass monthTableClassRight[] = new MonthTableClass[5];
|
|
|
int mDrawRectIndex = 0;
|
|
|
DrawRect drawRect[] = new DrawRect[478 * 6];
|
|
|
int mDrawGraphValue = 0;
|
|
@@ -218,7 +218,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
ArrayList<UsedValueArrayClass> arrayListGas = new ArrayList<UsedValueArrayClass>();
|
|
|
ArrayList<UsedValueArrayClass> arrayListHotwater = new ArrayList<UsedValueArrayClass>();
|
|
|
ArrayList<UsedValueArrayClass> arrayListEnergy = new ArrayList<UsedValueArrayClass>();
|
|
|
- ArrayList<UsedValueArrayClass> arrayListElecCar = new ArrayList<UsedValueArrayClass>();
|
|
|
+ ArrayList<UsedValueArrayClass> arrayListElecCar1 = new ArrayList<UsedValueArrayClass>();
|
|
|
+ ArrayList<UsedValueArrayClass> arrayListElecCar2 = new ArrayList<UsedValueArrayClass>();
|
|
|
|
|
|
// [Class]
|
|
|
class CalendarClass {
|
|
@@ -523,12 +524,9 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
if (TargetId == ID.RemoteMeterMainScreenID.text.TITLE) {
|
|
|
DebugLogOutput("onTouchEvent - ID: " + ID.RemoteMeterMainScreenID.text.TITLE);
|
|
|
- //Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
}
|
|
|
|
|
|
if (TargetId == ID.RemoteMeterMainScreenID.button.SHOW_TYPE) {
|
|
|
- //Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
|
-
|
|
|
if (mOpenList == false) //리스트 열기
|
|
|
{
|
|
|
mOpenList = true;
|
|
@@ -831,11 +829,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
*/
|
|
|
private void LoadCalendarArray(int Year, int Month) {
|
|
|
mCal.set(Year, Month, 1); //월(0~11, 0:1월):
|
|
|
-
|
|
|
- //Log.d(TAG, "Year:"+ mCal.get(Calendar.YEAR));
|
|
|
- //Log.d(TAG, "Month:"+ mCal.get(Calendar.MONTH));
|
|
|
- //Log.d(TAG, "Day:"+ mCal.get(Calendar.DAY_OF_MONTH));
|
|
|
-
|
|
|
arraylist.add(new CalendarClass(0, 0, 0));
|
|
|
for (int Week = 0; Week < 6; Week++) {
|
|
|
for (int i = 0; i < 7; i++) {
|
|
@@ -881,8 +874,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
switch (ShowNowTypeIndex) {
|
|
|
case 0: //당월
|
|
|
- //RemoveMonthEnergy();
|
|
|
- //ShowMonthEnergy();
|
|
|
//vip
|
|
|
RemoveVipMonthEnergy();
|
|
|
ShowVipMonthEnergy();
|
|
@@ -1201,7 +1192,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
getLayout().removeView(NEW_SEL_02_Text);
|
|
|
getLayout().removeView(NEW_SEL_03_Text);
|
|
|
|
|
|
-
|
|
|
mShowListType = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.but_title, R.drawable.but_title_p, ID.RemoteMeterMainScreenID.button.SHOW_TYPE);
|
|
|
ViewRegistration(getLayout(), mShowListType, Common.ImgPosion.GetX(957), Common.ImgPosion.GetY(132));
|
|
|
mShowListTypeText = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
@@ -1250,7 +1240,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
} else {
|
|
|
mListEnergy = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.but_title_p, R.drawable.but_title, ID.RemoteMeterMainScreenID.button.SHOW_LIST_ENERGY_TYPE);
|
|
|
ViewRegistration(getLayout(), mListEnergy, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(132));
|
|
|
-
|
|
|
}
|
|
|
//한글
|
|
|
mShowListEnergyTypeText = new WpadTextView(getContext(), false, 200, 55, Gravity.LEFT, Color.WHITE, Common.fontsize._26_DEFAULT, true, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
@@ -1299,7 +1288,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
private void ShowMainPage() {
|
|
|
switch (ShowNowTypeIndex) {
|
|
|
case 0:
|
|
|
- //ShowMonthEnergy();
|
|
|
//VIP용 당월
|
|
|
ShowVipMonthEnergy();
|
|
|
break;
|
|
@@ -1482,18 +1470,35 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
*/
|
|
|
private void ShowMonthEnergyDataRight(int Margin_y) {
|
|
|
- String tempMonthItem = "";
|
|
|
+ String eleccar1MonthItem = "";
|
|
|
+ String eleccar2MonthItem = "";
|
|
|
+ double total = 0;
|
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
|
- for (int i = 0; i < 3; i++) {
|
|
|
- tempMonthItem = monthTableClassRight[1].Use;
|
|
|
+ eleccar1MonthItem = monthTableClassRight[1].Use;
|
|
|
+ eleccar2MonthItem = monthTableClassRight[4].Use;
|
|
|
|
|
|
- Show_MonthTable_Item_Use_Text_RIGHT[i] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
- ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[i],
|
|
|
- Common.ImgPosion.GetX(312),
|
|
|
- Common.ImgPosion.GetY(293 + (i * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
|
- if (Show_MonthTable_Item_Use_Text_RIGHT[i] != null)
|
|
|
- Show_MonthTable_Item_Use_Text_RIGHT[i].setText(tempMonthItem);
|
|
|
- }
|
|
|
+ total = Double.valueOf(eleccar1MonthItem) + Double.valueOf(eleccar2MonthItem);
|
|
|
+
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[0] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
+ ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[0],
|
|
|
+ Common.ImgPosion.GetX(312),
|
|
|
+ Common.ImgPosion.GetY(293 + (0 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
|
+ if (Show_MonthTable_Item_Use_Text_RIGHT[0] != null)
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[0].setText(eleccar1MonthItem);
|
|
|
+
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[1] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
+ ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[0],
|
|
|
+ Common.ImgPosion.GetX(312),
|
|
|
+ Common.ImgPosion.GetY(293 + (1 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
|
+ if (Show_MonthTable_Item_Use_Text_RIGHT[1] != null)
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[1].setText(eleccar2MonthItem);
|
|
|
+
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[2] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
+ ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[0],
|
|
|
+ Common.ImgPosion.GetX(312),
|
|
|
+ Common.ImgPosion.GetY(293 + (2 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
|
+ if (Show_MonthTable_Item_Use_Text_RIGHT[2] != null)
|
|
|
+ Show_MonthTable_Item_Use_Text_RIGHT[2].setText(total + "");
|
|
|
}
|
|
|
|
|
|
private void ShowMonthEnergyDataCenter(int Margin_x, int Margin_y) {
|
|
@@ -1534,17 +1539,13 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
*/
|
|
|
private void ShowDayEnergy() {
|
|
|
ShowListEnergy(false);
|
|
|
-
|
|
|
Show_BG_Calendar = new WpadImageView(getContext(), TOUCH_KIND.NONE, 1094, 532, R.drawable.bg, 0, ID.RemoteMeterMainScreenID.image.BG_CALENDAR);
|
|
|
ViewRegistration(getLayout(), Show_BG_Calendar, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(221));
|
|
|
|
|
|
-
|
|
|
ShowCalendar();
|
|
|
if (mSampleShow == Common.MODE_NOMAL) {
|
|
|
LoadRemotemeterDataFromServer(ShowNowTypeIndex, CalendarYear, CalendarMonth, ShowNowEnergyIndex);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1554,9 +1555,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//setTopSetTargetBtnVisible(false);
|
|
|
ShowListEnergy(false);
|
|
|
|
|
|
- //Show_BG_Discription = new WpadImageView(getContext(), TOUCH_KIND.NONE, 645, 42, R.drawable.discription_bg, 0, ID.RemoteMeterMainScreenID.image.BG_DISCRIPTION);
|
|
|
- //ViewRegistration(getLayout(), Show_BG_Discription, ImgPosion.GetX(337), ImgPosion.GetY(163));
|
|
|
-
|
|
|
Show_BG_Graph = new WpadImageView(getContext(), TOUCH_KIND.NONE, 890, 482, R.drawable.graph_bg_year, 0, ID.RemoteMeterMainScreenID.image.BG_GRAPH);
|
|
|
ViewRegistration(getLayout(), Show_BG_Graph, Common.ImgPosion.GetX(202), Common.ImgPosion.GetY(257));
|
|
|
|
|
@@ -1567,7 +1565,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
Show_3Month_Discription_Text.setText(ShowListEnergyType_String[ShowNowEnergyIndex] + "사용량을 작년 3개월과 올해 3개월분 비교 데이터입니다.");
|
|
|
|
|
|
-
|
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
|
int MaxValue = 1801;
|
|
|
int FirstValue[] = new int[2];
|
|
@@ -1592,7 +1589,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
//최근 3개월 비교일때 point_x : 274,378,570,674,866,970 (x축 위치)
|
|
|
//전년비 비교 or 최근 6개월 비교일때 252 시작으로 148씩 더하면 됨
|
|
|
-
|
|
|
DrawGraphAfterCalc((float) MaxValue, FirstValue[0], true, 252, true, "2013.01");
|
|
|
DrawGraphAfterCalc((float) MaxValue, FirstValue[1], false, 252 + (148 * 1), true, "2014.01");
|
|
|
|
|
@@ -1608,7 +1604,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
//Get Data from Server
|
|
|
LoadRemotemeterDataFromServer(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1623,7 +1618,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
LoadCalendarArray(CalendarYear, CalendarMonth);
|
|
|
|
|
|
for (int i = 1; i <= mCal.getActualMaximum(Calendar.DATE); i++) {
|
|
|
-
|
|
|
if ((i + mCal.get(Calendar.DAY_OF_WEEK) - 1) % 7 == 1) {
|
|
|
DayOfWeekColor = Color.RED;
|
|
|
} else if ((i + mCal.get(Calendar.DAY_OF_WEEK) - 1) % 7 == 0) {
|
|
@@ -1643,7 +1637,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
Common.ImgPosion.GetX(arraylist.get(i + mCal.get(Calendar.DAY_OF_WEEK) - 1).getStart_X() + 36), //요일(1~7, 1:일요일)
|
|
|
Common.ImgPosion.GetY(arraylist.get(i + mCal.get(Calendar.DAY_OF_WEEK) - 1).getStart_Y()));
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if ((TodayYear == CalendarYear) && (TodayMonth == CalendarMonth)) {
|
|
@@ -1694,9 +1687,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//setTopSetTargetBtnVisible(false);
|
|
|
ShowListEnergy(false);
|
|
|
|
|
|
- //Show_BG_Discription = new WpadImageView(getContext(), TOUCH_KIND.NONE, 645, 42, R.drawable.discription_bg, 0, ID.RemoteMeterMainScreenID.image.BG_DISCRIPTION);
|
|
|
- //ViewRegistration(getLayout(), Show_BG_Discription, ImgPosion.GetX(337), ImgPosion.GetY(163));
|
|
|
-
|
|
|
Show_BG_Graph = new WpadImageView(getContext(), TOUCH_KIND.NONE, 890, 482, R.drawable.graph_bg, 0, ID.RemoteMeterMainScreenID.image.BG_GRAPH);
|
|
|
ViewRegistration(getLayout(), Show_BG_Graph, Common.ImgPosion.GetX(202), Common.ImgPosion.GetY(257));
|
|
|
|
|
@@ -1778,8 +1768,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//Get Data from Server
|
|
|
LoadRemotemeterDataFromServer(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
//아래 날짜 기준
|
|
@@ -1789,7 +1777,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
Common.ImgPosion.GetX(254 + (number * 296)),
|
|
|
Common.ImgPosion.GetY(746));
|
|
|
Show_BottomGraphValue3Month_Text[number].setText(text);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1826,7 +1813,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
} else {
|
|
|
drawRect[i] = new DrawRect(getContext(), point_x, (737 - (i)), 1);
|
|
|
}
|
|
|
-
|
|
|
getLayout().addView(drawRect[i]);
|
|
|
}
|
|
|
//그래프 위에 그래프값 Text입력
|
|
@@ -1879,7 +1865,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
private void RemoveListEnergy() {
|
|
|
getLayout().removeView(mListEnergy);
|
|
|
getLayout().removeView(mShowListEnergyTypeText);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1924,7 +1909,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
private void RemoveMainPage() {
|
|
|
switch (ShowNowTypeIndex) {
|
|
|
case 0:
|
|
|
- //RemoveMonthEnergy();
|
|
|
//vip
|
|
|
RemoveVipMonthEnergy();
|
|
|
break;
|
|
@@ -1956,7 +1940,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
getLayout().removeView(Show_MonthTableRow1);
|
|
|
getLayout().removeView(Show_MonthTableEnergy);
|
|
|
|
|
|
-
|
|
|
for (int i = 0; i < mNumberOfEnergy; i++) {
|
|
|
getLayout().removeView(Show_MonthTable_Item_Use_Text_LEFT[i]);
|
|
|
}
|
|
@@ -1971,7 +1954,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
getLayout().removeView(Show_MonthVipTableEnergy2);
|
|
|
getLayout().removeView(Show_MonthVipTableEnergy3);
|
|
|
|
|
|
-
|
|
|
for (int i = 0; i < mNumberOfEnergy; i++) {
|
|
|
getLayout().removeView(Show_MonthTable_Item_Use_Text_LEFT[i]);
|
|
|
}
|
|
@@ -1996,7 +1978,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
private void Remove3MonthEnergy() {
|
|
|
RemoveListEnergy();
|
|
|
|
|
|
- getLayout().removeView(Show_BG_Discription);
|
|
|
+ getLayout().removeView(Show_BG_Description);
|
|
|
getLayout().removeView(Show_BG_Graph);
|
|
|
getLayout().removeView(Show_3Month_Discription_Text);
|
|
|
|
|
@@ -2011,7 +1993,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
}
|
|
|
mDrawBottomGraphValue3Month_Text = 0;
|
|
|
|
|
|
-
|
|
|
getLayout().removeView(Show_Discription_SamePyung);
|
|
|
getLayout().removeView(Show_Discription_Myhome);
|
|
|
getLayout().removeView(Show_Discription_SamePyung_Text);
|
|
@@ -2025,7 +2006,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
*/
|
|
|
private void RemoveYearEnergy() {
|
|
|
RemoveListEnergy();
|
|
|
- getLayout().removeView(Show_BG_Discription);
|
|
|
+ getLayout().removeView(Show_BG_Description);
|
|
|
getLayout().removeView(Show_BG_Graph);
|
|
|
getLayout().removeView(Show_3Month_Discription_Text);
|
|
|
|
|
@@ -2047,7 +2028,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
arrayListGas.removeAll(arrayListGas);
|
|
|
arrayListHotwater.removeAll(arrayListHotwater);
|
|
|
arrayListEnergy.removeAll(arrayListEnergy);
|
|
|
- arrayListElecCar.removeAll(arrayListElecCar);
|
|
|
+ arrayListElecCar1.removeAll(arrayListElecCar1);
|
|
|
+ arrayListElecCar2.removeAll(arrayListElecCar2);
|
|
|
}
|
|
|
|
|
|
final int DEFAULT_METERING_COUNT = 5;
|
|
@@ -2164,7 +2146,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
|
}
|
|
|
} else {
|
|
|
-
|
|
|
}
|
|
|
|
|
|
if (mEMS_Enable == false) {
|
|
@@ -2197,34 +2178,28 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
imapRemotemeter.DoWork(true, true, true, true, true, true, true, mEMS_Enable, year, month);
|
|
|
break;
|
|
|
case 100: //당월(전기차)
|
|
|
- imapRemotemeter.DoWorkVIP(true, true, true, true, true, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, true, true, true, true, true, year, month);
|
|
|
break;
|
|
|
|
|
|
case 1: //일별
|
|
|
switch (energy) {
|
|
|
case 0: //전기차1
|
|
|
- //imapRemotemeter.DoWork(false, true, false, false, false, false, false, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false,false, false, year, month);
|
|
|
break;
|
|
|
case 1: //전기차2
|
|
|
- //imapRemotemeter.DoWork(false, false, false, true, false, false, false, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, false, true,false, false, year, month);
|
|
|
break;
|
|
|
case 2: //태양광
|
|
|
- //imapRemotemeter.DoWork(false, false, true, false, false, false, false, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, false, true, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, false, false, true, false, year, month);
|
|
|
break;
|
|
|
case 3: //연료전지
|
|
|
- //imapRemotemeter.DoWork(false, false, false, false, true, false, false, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, false, false, true, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, false, false,false, true, year, month);
|
|
|
break;
|
|
|
case 4: //전기차
|
|
|
- //imapRemotemeter.DoWork(false, false, false, false, false, true, false, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false, false,false, year, month);
|
|
|
break;
|
|
|
case 5: //전기차
|
|
|
- //imapRemotemeter.DoWork(false, false, false, false, false, false, true, false, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false, false,false, year, month);
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -2235,28 +2210,22 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
case 3: //전년비
|
|
|
switch (energy) {
|
|
|
case 0: //전기차1
|
|
|
- //imapRemotemeter.DoWork(true, true, false, false, false, false, false, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, true, false, false,false, year, month);
|
|
|
break;
|
|
|
case 1: //전기차2
|
|
|
- //imapRemotemeter.DoWork(true, false, false, true, false, false, false, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, false, true, false,false, year, month);
|
|
|
break;
|
|
|
case 2: //태양광
|
|
|
- //imapRemotemeter.DoWork(true, false, true, false, false, false, false, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, false, true, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, false, false,true, false, year, month);
|
|
|
break;
|
|
|
case 3: //연료전지
|
|
|
- //imapRemotemeter.DoWork(true, false, false, false, true, false, false, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, false, false, true, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, false, false,false, true, year, month);
|
|
|
break;
|
|
|
case 4: //전기차
|
|
|
- //imapRemotemeter.DoWork(true, false, false, false, false, true, false, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, true, false,false, false, year, month);
|
|
|
break;
|
|
|
case 5: //전기차
|
|
|
- //imapRemotemeter.DoWork(true, false, false, false, false, false, true, mEMS_Enable, year, month);
|
|
|
- imapRemotemeter.DoWorkVIP(true, false, true, false, false, year, month);
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, true, false,false, false, year, month);
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -2268,7 +2237,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
}
|
|
|
|
|
|
imapRemotemeter.SetRetCtr(new RetProci() {
|
|
|
-
|
|
|
@Override
|
|
|
public void ProcSuccess() {
|
|
|
String TempString = null;
|
|
@@ -2477,7 +2445,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
&& (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
|
|
|
result = true;
|
|
|
//일단 kepco="yes" photovoltaics="yes" fuelcell="yes" eleccar="yes" 4개
|
|
|
- int Temp_mNumberOfEnergy = 4;
|
|
|
+ int Temp_mNumberOfEnergy = 5;
|
|
|
for (int j = 0; j < Temp_mNumberOfEnergy; j++) {
|
|
|
monthTableClassRight[j] = new MonthTableClass("", "", "");
|
|
|
}
|
|
@@ -2485,8 +2453,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
TempString = imapRemotemeter.GetAttributeVal(i, "kepco_used");
|
|
|
monthTableClassRight[0].Use = TempString;
|
|
|
}
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "eleccar_used") != null) {
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
|
|
|
monthTableClassRight[1].Use = TempString;
|
|
|
}
|
|
|
if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
|
|
@@ -2497,6 +2465,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
|
|
|
monthTableClassRight[3].Use = TempString;
|
|
|
}
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
|
|
|
+ monthTableClassRight[4].Use = TempString;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2521,18 +2493,18 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DebugLogOutput("day " + imapRemotemeter.GetAttributeVal(i, "day"));
|
|
|
switch (ShowNowEnergyIndex) {
|
|
|
case 0: // 전기차1
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
|
|
|
if (TempString.equals("1000000") == false) {
|
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
|
- imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
|
|
|
}
|
|
|
break;
|
|
|
|
|
|
case 1: // 전기차2
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
|
|
|
if (TempString.equals("1000000") == false) {
|
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
|
- imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
|
|
|
}
|
|
|
break;
|
|
|
|
|
@@ -2575,9 +2547,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
case 2: // 3개월 or 6개월
|
|
|
case 3: // 전년비
|
|
|
-
|
|
|
int NumberOfValuelist2 = imapRemotemeter.SetItem("valuelist");
|
|
|
-
|
|
|
if (NumberOfValuelist2 != 0) {
|
|
|
for (int i = 0; i < NumberOfValuelist2; i++) {
|
|
|
DebugLogOutput("NumberOfValuelist " + Integer.toString(NumberOfValuelist2));
|
|
@@ -2589,29 +2559,29 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
switch (ShowNowEnergyIndex) {
|
|
|
case 0: // 전기차1
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "eleccar_used") != null) {
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "eleccar_used").equals("1000000") == false) {
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used").equals("1000000") == false) {
|
|
|
+ Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
|
|
|
}
|
|
|
}
|
|
|
- arrayListElecCar.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
+ arrayListElecCar1.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
.parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListElecCar " + arrayListElecCar.size());
|
|
|
- DebugLogOutput("arrayListElecCar used " + arrayListElecCar.get(i).UsedValue_Myhome);
|
|
|
+ DebugLogOutput("arrayListElecCar1 " + arrayListElecCar1.size());
|
|
|
+ DebugLogOutput("arrayListElecCar1 used " + arrayListElecCar1.get(i).UsedValue_Myhome);
|
|
|
break;
|
|
|
|
|
|
case 1: // 전기차2
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "eleccar_used") != null) {
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "eleccar_used").equals("1000000") == false) {
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used").equals("1000000") == false) {
|
|
|
+ Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
|
|
|
}
|
|
|
}
|
|
|
- arrayListElecCar.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
+ arrayListElecCar2.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
.parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListElecCar " + arrayListElecCar.size());
|
|
|
- DebugLogOutput("arrayListElecCar used " + arrayListElecCar.get(i).UsedValue_Myhome);
|
|
|
+ DebugLogOutput("arrayListElecCar2 " + arrayListElecCar2.size());
|
|
|
+ DebugLogOutput("arrayListElecCar2 used " + arrayListElecCar2.get(i).UsedValue_Myhome);
|
|
|
break;
|
|
|
|
|
|
case 2: // 태양광
|
|
@@ -2665,11 +2635,11 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
|
}
|
|
|
}
|
|
|
- arrayListElecCar.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
+ arrayListElecCar1.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
.parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListElecCar " + arrayListElecCar.size());
|
|
|
- DebugLogOutput("arrayListElecCar used " + arrayListElecCar.get(i).UsedValue_Myhome);
|
|
|
+ DebugLogOutput("arrayListElecCar1 " + arrayListElecCar1.size());
|
|
|
+ DebugLogOutput("arrayListElecCar1 used " + arrayListElecCar1.get(i).UsedValue_Myhome);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
@@ -2704,11 +2674,11 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
switch (ShowNowEnergyIndex) {
|
|
|
case 0: // 전기차1
|
|
|
- Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
case 1: // 전기차2
|
|
|
- Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar2);
|
|
|
break;
|
|
|
|
|
|
case 2: // 태양광
|
|
@@ -2719,12 +2689,12 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
Show3MonthEnergy_inRetProci(arrayListFuelcell);
|
|
|
break;
|
|
|
|
|
|
- case 4: // 열량
|
|
|
- Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
|
+ case 4: // 예비용
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
- case 5: // 전기차
|
|
|
- Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
|
+ case 5: // 예비용
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
default:
|
|
@@ -2734,11 +2704,11 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//전년비
|
|
|
switch (ShowNowEnergyIndex) {
|
|
|
case 0: // 전기차1
|
|
|
- ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
case 1: // 전기차2
|
|
|
- ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar2);
|
|
|
break;
|
|
|
|
|
|
case 2: // 태양광
|
|
@@ -2749,12 +2719,12 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
ShowYearEnergy_inRetProci(arrayListFuelcell);
|
|
|
break;
|
|
|
|
|
|
- case 4: // 열량
|
|
|
- ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
|
+ case 4: // 예비용
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
- case 5: // 탄소
|
|
|
- ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
|
+ case 5: // 예비용
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar1);
|
|
|
break;
|
|
|
|
|
|
default:
|
|
@@ -2802,7 +2772,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DBMGR.closeDB();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
private void ShowYearEnergy_inRetProci(ArrayList<UsedValueArrayClass> TempArray) {
|
|
@@ -2833,7 +2802,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//전년비 비교 or 최근 6개월 비교일때 375 시작으로 107씩 더하면 됨
|
|
|
//전년비 비교 or 최근 6개월 비교일때 252 시작으로 148씩 더하면 됨(2017.11)
|
|
|
|
|
|
-
|
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
|
if ((CalendarMonth + 1) == 2) //2월인 경우
|
|
|
{
|
|
@@ -2873,7 +2841,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false,
|
|
|
(252 + (148 * 1)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
|
}
|
|
|
-
|
|
|
if ((TempArray.get(i).Year == CalendarYear - 2) && (TempArray.get(i).Month == 12)) {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, true,
|
|
|
(252 + (148 * 2)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
@@ -2882,7 +2849,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false,
|
|
|
(252 + (148 * 3)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
|
}
|
|
|
-
|
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == 1)) {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, true,
|
|
|
(252 + (148 * 4)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
@@ -2900,7 +2866,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false,
|
|
|
(252 + (148 * 1)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
|
}
|
|
|
-
|
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == (CalendarMonth + 1) - 1)) {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, true,
|
|
|
(252 + (148 * 2)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
@@ -2909,7 +2874,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false,
|
|
|
(252 + (148 * 3)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|
|
|
}
|
|
|
-
|
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == (CalendarMonth + 1))) {
|
|
|
DrawGraphAfterCalc(Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, true,
|
|
|
(252 + (148 * 4)), true, "" + TempArray.get(i).Year + "." + TempArray.get(i).Month);
|