|
@@ -84,7 +84,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
WpadImageView Energy_SEL_04;
|
|
WpadImageView Energy_SEL_04;
|
|
WpadImageView Energy_SEL_05;
|
|
WpadImageView Energy_SEL_05;
|
|
|
|
|
|
- WpadImageView mListMonth; //당월 사용량/생산량 선택버튼
|
|
|
|
|
|
+ //WpadImageView mListMonth; //당월 사용량/생산량 선택버튼=> 버튼 삭제됨
|
|
WpadImageView MONTH_SEL_01; //사용량
|
|
WpadImageView MONTH_SEL_01; //사용량
|
|
WpadImageView MONTH_SEL_02; //생산량
|
|
WpadImageView MONTH_SEL_02; //생산량
|
|
WpadImageView Show_MonthVipTableEnergy1; //VIP 사용량 테이블 1
|
|
WpadImageView Show_MonthVipTableEnergy1; //VIP 사용량 테이블 1
|
|
@@ -163,7 +163,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
private WallPadAPI mAPI = null;
|
|
private WallPadAPI mAPI = null;
|
|
|
|
|
|
// [Value]
|
|
// [Value]
|
|
- int ShowMonthTypeIndex = 0;
|
|
|
|
|
|
+ //int ShowMonthTypeIndex = 0;
|
|
String[] ShowMonthType_String = {
|
|
String[] ShowMonthType_String = {
|
|
"사용량",
|
|
"사용량",
|
|
"생산량",
|
|
"생산량",
|
|
@@ -179,12 +179,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
int ShowNowEnergyIndex = 0;
|
|
int ShowNowEnergyIndex = 0;
|
|
String[] ShowListEnergyType_String = {
|
|
String[] ShowListEnergyType_String = {
|
|
- "전기 kWh",
|
|
|
|
- "수도 ㎥",
|
|
|
|
- "가스 ㎥",
|
|
|
|
- "온수 ㎥",
|
|
|
|
- "난방 ㎥/MWh",
|
|
|
|
- "전기차 kWh"
|
|
|
|
|
|
+ "전기차1 kWh",
|
|
|
|
+ "전기차2 kWh",
|
|
|
|
+ "태양광 kWh",
|
|
|
|
+ "연료전지 kWh"
|
|
};
|
|
};
|
|
//메뉴화면 글자 조정을 위함. 한글: 36p, 단위:20p
|
|
//메뉴화면 글자 조정을 위함. 한글: 36p, 단위:20p
|
|
int ShowEnergyIndex = 0;
|
|
int ShowEnergyIndex = 0;
|
|
@@ -215,8 +213,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
|
|
|
|
// [사용량 정보]
|
|
// [사용량 정보]
|
|
- ArrayList<UsedValueArrayClass> arrayListElect = new ArrayList<UsedValueArrayClass>();
|
|
|
|
- ArrayList<UsedValueArrayClass> arrayListWater = new ArrayList<UsedValueArrayClass>();
|
|
|
|
|
|
+ ArrayList<UsedValueArrayClass> arrayListPhotovoltaics = new ArrayList<UsedValueArrayClass>();
|
|
|
|
+ ArrayList<UsedValueArrayClass> arrayListFuelcell = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListGas = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListGas = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListHotwater = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListHotwater = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListEnergy = new ArrayList<UsedValueArrayClass>();
|
|
ArrayList<UsedValueArrayClass> arrayListEnergy = new ArrayList<UsedValueArrayClass>();
|
|
@@ -620,7 +618,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
//리스트 열림
|
|
//리스트 열림
|
|
RemoveListEnergy();
|
|
RemoveListEnergy();
|
|
//신규 조그 월패드는 리스트 Background 없음
|
|
//신규 조그 월패드는 리스트 Background 없음
|
|
- /*
|
|
|
|
int TempImage;
|
|
int TempImage;
|
|
int TempHeight;
|
|
int TempHeight;
|
|
switch(mNumberOfEnergy)
|
|
switch(mNumberOfEnergy)
|
|
@@ -656,9 +653,9 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
- Show_EnergyListTypeBG = new WpadImageView(getContext(), TOUCH_KIND.NONE, 182, TempHeight,TempImage, 0, ID.RemoteMeterMainScreenID.image.BG_ENERGY_LISTTYPE_BG);
|
|
|
|
- ViewRegistration(getLayout(), Show_EnergyListTypeBG, TopImgPosion.GetX(243), TopImgPosion.GetY(82));
|
|
|
|
- */
|
|
|
|
|
|
+ //Show_EnergyListTypeBG = new WpadImageView(getContext(), TOUCH_KIND.NONE, 182, TempHeight,TempImage, 0, ID.RemoteMeterMainScreenID.image.BG_ENERGY_LISTTYPE_BG);
|
|
|
|
+ //ViewRegistration(getLayout(), Show_EnergyListTypeBG, TopImgPosion.GetX(243), TopImgPosion.GetY(82));
|
|
|
|
+
|
|
ShowListEnergy(true);
|
|
ShowListEnergy(true);
|
|
|
|
|
|
//리스트가 열렸고 버튼 등록해야함.
|
|
//리스트가 열렸고 버튼 등록해야함.
|
|
@@ -671,24 +668,28 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
ViewRegistration(getLayout(), Energy_SEL_02, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(241));
|
|
ViewRegistration(getLayout(), Energy_SEL_02, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(241));
|
|
}
|
|
}
|
|
//VIP인 경우 에너지 개수가 달라서 별로도 처리
|
|
//VIP인 경우 에너지 개수가 달라서 별로도 처리
|
|
- if(bVIP){
|
|
|
|
|
|
+ if (bVIP) {
|
|
Energy_SEL_03 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_03);
|
|
Energy_SEL_03 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_03);
|
|
ViewRegistration(getLayout(), Energy_SEL_03, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(296));
|
|
ViewRegistration(getLayout(), Energy_SEL_03, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(296));
|
|
|
|
|
|
- Energy_SEL_04 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_04);
|
|
|
|
- ViewRegistration(getLayout(), Energy_SEL_04, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(351));
|
|
|
|
|
|
+ //Energy_SEL_04 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_04);
|
|
|
|
+ //ViewRegistration(getLayout(), Energy_SEL_04, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(351));
|
|
|
|
|
|
- Energy_SEL_05 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_05);
|
|
|
|
- ViewRegistration(getLayout(), Energy_SEL_05, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(406));
|
|
|
|
- ListEnergyTextWrite(6);
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
|
|
+ //Energy_SEL_05 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_05);
|
|
|
|
+ //ViewRegistration(getLayout(), Energy_SEL_05, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(406));
|
|
|
|
+ ListEnergyTextWrite(4);
|
|
|
|
+ } else {
|
|
switch (mNumberOfEnergy) {
|
|
switch (mNumberOfEnergy) {
|
|
case 2:
|
|
case 2:
|
|
- ListEnergyTextWrite(2);
|
|
|
|
|
|
+ //ListEnergyTextWrite(2);
|
|
break;
|
|
break;
|
|
case 3:
|
|
case 3:
|
|
- ListEnergyTextWrite(3);
|
|
|
|
|
|
+ //ListEnergyTextWrite(3);
|
|
|
|
+ break;
|
|
|
|
+ case 4:
|
|
|
|
+ Energy_SEL_03 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_03);
|
|
|
|
+ ViewRegistration(getLayout(), Energy_SEL_03, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(296));
|
|
|
|
+ ListEnergyTextWrite(4);
|
|
break;
|
|
break;
|
|
case 5:
|
|
case 5:
|
|
Energy_SEL_03 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_03);
|
|
Energy_SEL_03 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.ENERGY_NEW_SEL_03);
|
|
@@ -739,11 +740,11 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
ListClose();
|
|
ListClose();
|
|
|
|
|
|
//리스트 열림
|
|
//리스트 열림
|
|
- RemoveListMonth();
|
|
|
|
- ShowListMonth(true);
|
|
|
|
|
|
+ //RemoveListMonth();
|
|
|
|
+ //ShowListMonth(true);
|
|
|
|
|
|
//리스트가 열렸고 버튼 등록해야함.
|
|
//리스트가 열렸고 버튼 등록해야함.
|
|
-
|
|
|
|
|
|
+ /*삭제됨
|
|
MONTH_SEL_01 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.MONTH_SEL_01);
|
|
MONTH_SEL_01 = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.meter_list_text_bg, R.drawable.meter_list_text_bg_p, ID.RemoteMeterMainScreenID.button.MONTH_SEL_01);
|
|
ViewRegistration(getLayout(), MONTH_SEL_01, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(186));
|
|
ViewRegistration(getLayout(), MONTH_SEL_01, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(186));
|
|
|
|
|
|
@@ -761,8 +762,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetY(241));
|
|
Common.ImgPosion.GetY(241));
|
|
MONTH_SEL_02_Text.setText(ShowMonthType_String[(ShowMonthTypeIndex + 2) % 2]);
|
|
MONTH_SEL_02_Text.setText(ShowMonthType_String[(ShowMonthTypeIndex + 2) % 2]);
|
|
|
|
+
|
|
|
|
+ */
|
|
} else {
|
|
} else {
|
|
- ListMonthClose();
|
|
|
|
|
|
+ //ListMonthClose();
|
|
}
|
|
}
|
|
} else if (TargetId == ID.RemoteMeterMainScreenID.button.MONTH_SEL_01) {
|
|
} else if (TargetId == ID.RemoteMeterMainScreenID.button.MONTH_SEL_01) {
|
|
ListMonthClickEvent(MONTH_SEL_01_Text);
|
|
ListMonthClickEvent(MONTH_SEL_01_Text);
|
|
@@ -819,8 +822,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
((MainActivity) (getContext())).StartPopup(ID.screen.RemoteMeterPopupSetTargetScreen);
|
|
((MainActivity) (getContext())).StartPopup(ID.screen.RemoteMeterPopupSetTargetScreen);
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
//Sound().Play(SND.effect.TOUCH_LATCHED);
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -912,6 +913,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
/**
|
|
/**
|
|
* @description 에너지 리스트 버튼의 리스트 닫기
|
|
* @description 에너지 리스트 버튼의 리스트 닫기
|
|
*/
|
|
*/
|
|
|
|
+
|
|
private void ListEnergyClose() {
|
|
private void ListEnergyClose() {
|
|
mOpenListEnergy = false;
|
|
mOpenListEnergy = false;
|
|
getLayout().removeView(Show_EnergyListTypeBG);
|
|
getLayout().removeView(Show_EnergyListTypeBG);
|
|
@@ -924,16 +926,16 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
getLayout().removeView(Energy_SEL_01_Text);
|
|
getLayout().removeView(Energy_SEL_01_Text);
|
|
getLayout().removeView(Energy_SEL_02_Text);
|
|
getLayout().removeView(Energy_SEL_02_Text);
|
|
switch (mNumberOfEnergy) {
|
|
switch (mNumberOfEnergy) {
|
|
|
|
+ case 4:
|
|
|
|
+ getLayout().removeView(Energy_SEL_03);
|
|
|
|
+ getLayout().removeView(Energy_SEL_03_Text);
|
|
|
|
+ break;
|
|
case 5:
|
|
case 5:
|
|
getLayout().removeView(Energy_SEL_03);
|
|
getLayout().removeView(Energy_SEL_03);
|
|
getLayout().removeView(Energy_SEL_04);
|
|
getLayout().removeView(Energy_SEL_04);
|
|
|
|
|
|
getLayout().removeView(Energy_SEL_03_Text);
|
|
getLayout().removeView(Energy_SEL_03_Text);
|
|
getLayout().removeView(Energy_SEL_04_Text);
|
|
getLayout().removeView(Energy_SEL_04_Text);
|
|
- if(bVIP){
|
|
|
|
- getLayout().removeView(Energy_SEL_05);
|
|
|
|
- getLayout().removeView(Energy_SEL_05_Text);
|
|
|
|
- }
|
|
|
|
break;
|
|
break;
|
|
case 6:
|
|
case 6:
|
|
getLayout().removeView(Energy_SEL_03);
|
|
getLayout().removeView(Energy_SEL_03);
|
|
@@ -953,6 +955,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
/**
|
|
/**
|
|
* @description 당월 사용량/생산량 리스트 버튼의 리스트 닫기
|
|
* @description 당월 사용량/생산량 리스트 버튼의 리스트 닫기
|
|
*/
|
|
*/
|
|
|
|
+ /* 삭제됨
|
|
private void ListMonthClose() {
|
|
private void ListMonthClose() {
|
|
mOpenListMonth = false;
|
|
mOpenListMonth = false;
|
|
RemoveListMonth();
|
|
RemoveListMonth();
|
|
@@ -965,10 +968,13 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
getLayout().removeView(MONTH_SEL_02_Text);
|
|
getLayout().removeView(MONTH_SEL_02_Text);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ */
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @param //3종, 5종, 6종 중 선택
|
|
* @param //3종, 5종, 6종 중 선택
|
|
* @description 에너지 리스트 버튼의 텍스트 출력
|
|
* @description 에너지 리스트 버튼의 텍스트 출력
|
|
*/
|
|
*/
|
|
|
|
+
|
|
private void ListEnergyTextWrite(int number) {
|
|
private void ListEnergyTextWrite(int number) {
|
|
if (number == 2) {
|
|
if (number == 2) {
|
|
//텍스트 출력
|
|
//텍스트 출력
|
|
@@ -997,6 +1003,25 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetY(241));
|
|
Common.ImgPosion.GetY(241));
|
|
Energy_SEL_02_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 2) % 3]);
|
|
Energy_SEL_02_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 2) % 3]);
|
|
|
|
+ } else if (number == 4) {
|
|
|
|
+ //텍스트 출력
|
|
|
|
+ Energy_SEL_01_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
+ ViewRegistration(getLayout(), Energy_SEL_01_Text,
|
|
|
|
+ Common.ImgPosion.GetX(93),
|
|
|
|
+ Common.ImgPosion.GetY(186));
|
|
|
|
+ Energy_SEL_01_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 1) % 4]);
|
|
|
|
+
|
|
|
|
+ Energy_SEL_02_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
+ ViewRegistration(getLayout(), Energy_SEL_02_Text,
|
|
|
|
+ Common.ImgPosion.GetX(93),
|
|
|
|
+ Common.ImgPosion.GetY(241));
|
|
|
|
+ Energy_SEL_02_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 2) % 4]);
|
|
|
|
+
|
|
|
|
+ Energy_SEL_03_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
+ ViewRegistration(getLayout(), Energy_SEL_03_Text,
|
|
|
|
+ Common.ImgPosion.GetX(93),
|
|
|
|
+ Common.ImgPosion.GetY(296));
|
|
|
|
+ Energy_SEL_03_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 3) % 4]);
|
|
} else if (number == 5) {
|
|
} else if (number == 5) {
|
|
//텍스트 출력
|
|
//텍스트 출력
|
|
Energy_SEL_01_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
Energy_SEL_01_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
@@ -1047,14 +1072,6 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetX(93),
|
|
Common.ImgPosion.GetY(351));
|
|
Common.ImgPosion.GetY(351));
|
|
Energy_SEL_04_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 4) % 6]);
|
|
Energy_SEL_04_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 4) % 6]);
|
|
-
|
|
|
|
- if(bVIP){
|
|
|
|
- Energy_SEL_05_Text = new WpadTextView(getContext(), false, 230, 55, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
- ViewRegistration(getLayout(), Energy_SEL_05_Text,
|
|
|
|
- Common.ImgPosion.GetX(93),
|
|
|
|
- Common.ImgPosion.GetY(406));
|
|
|
|
- Energy_SEL_05_Text.setText(ShowListEnergyType_String[(ShowNowEnergyIndex + 5) % 6]);
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1071,22 +1088,16 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
RemoveMainEnergy();
|
|
RemoveMainEnergy();
|
|
if (wpadtextview.getText().equals(ShowListEnergyType_String[0])) {
|
|
if (wpadtextview.getText().equals(ShowListEnergyType_String[0])) {
|
|
- DebugLogOutput("전기 선택");
|
|
|
|
ShowNowEnergyIndex = 0;
|
|
ShowNowEnergyIndex = 0;
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[1])) {
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[1])) {
|
|
- DebugLogOutput("수도 선택!");
|
|
|
|
ShowNowEnergyIndex = 1;
|
|
ShowNowEnergyIndex = 1;
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[2])) {
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[2])) {
|
|
- DebugLogOutput("가스 선택");
|
|
|
|
ShowNowEnergyIndex = 2;
|
|
ShowNowEnergyIndex = 2;
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[3])) {
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[3])) {
|
|
- DebugLogOutput("온수 선택");
|
|
|
|
ShowNowEnergyIndex = 3;
|
|
ShowNowEnergyIndex = 3;
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[4])) {
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[4])) {
|
|
- DebugLogOutput("난방 선택");
|
|
|
|
ShowNowEnergyIndex = 4;
|
|
ShowNowEnergyIndex = 4;
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[5])) {
|
|
} else if (wpadtextview.getText().equals(ShowListEnergyType_String[5])) {
|
|
- DebugLogOutput("전기차 선택");
|
|
|
|
ShowNowEnergyIndex = 5;
|
|
ShowNowEnergyIndex = 5;
|
|
}
|
|
}
|
|
ShowMainEnergy();
|
|
ShowMainEnergy();
|
|
@@ -1105,12 +1116,12 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
if (wpadtextview.getText().equals(ShowMonthType_String[0])) {
|
|
if (wpadtextview.getText().equals(ShowMonthType_String[0])) {
|
|
DebugLogOutput("사용량 선택");
|
|
DebugLogOutput("사용량 선택");
|
|
- ShowMonthTypeIndex = 0;
|
|
|
|
|
|
+ //ShowMonthTypeIndex = 0;
|
|
} else if (wpadtextview.getText().equals(ShowMonthType_String[1])) {
|
|
} else if (wpadtextview.getText().equals(ShowMonthType_String[1])) {
|
|
DebugLogOutput("생산량 선택!");
|
|
DebugLogOutput("생산량 선택!");
|
|
- ShowMonthTypeIndex = 1;
|
|
|
|
|
|
+ //ShowMonthTypeIndex = 1;
|
|
}
|
|
}
|
|
- ListMonthClose();
|
|
|
|
|
|
+ //ListMonthClose();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1261,6 +1272,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
* @param //False면 닫힌상태, True면 열린상태 입력
|
|
* @param //False면 닫힌상태, True면 열린상태 입력
|
|
* @description 당월 사용량/생산량 리스트 버튼 등록
|
|
* @description 당월 사용량/생산량 리스트 버튼 등록
|
|
*/
|
|
*/
|
|
|
|
+ /* 당월 사용량/생산량 버튼 삭제됨
|
|
private void ShowListMonth(boolean ListClosed) {
|
|
private void ShowListMonth(boolean ListClosed) {
|
|
if (ListClosed == false) {
|
|
if (ListClosed == false) {
|
|
mListMonth = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.but_title, R.drawable.but_title_p, ID.RemoteMeterMainScreenID.button.SHOW_LIST_MONTH_TYPE);
|
|
mListMonth = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 230, 55, R.drawable.but_title, R.drawable.but_title_p, ID.RemoteMeterMainScreenID.button.SHOW_LIST_MONTH_TYPE);
|
|
@@ -1278,6 +1290,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
mShowListMonthTypeText.setText(ShowMonthType_String[ShowMonthTypeIndex]);
|
|
mShowListMonthTypeText.setText(ShowMonthType_String[ShowMonthTypeIndex]);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* @description 매인페이지 변경 (당월, 일별, 3개월, 전년비 중 선택)
|
|
* @description 매인페이지 변경 (당월, 일별, 3개월, 전년비 중 선택)
|
|
@@ -1359,15 +1373,15 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
switch (mNumberOfEnergy) {
|
|
switch (mNumberOfEnergy) {
|
|
case 3:
|
|
case 3:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 5:
|
|
case 5:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 6:
|
|
case 6:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 74, 74);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 74, 74);
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|
|
@@ -1385,18 +1399,17 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
*/
|
|
*/
|
|
private void ShowVipMonthEnergy() {
|
|
private void ShowVipMonthEnergy() {
|
|
//사용량, 생산량 선택
|
|
//사용량, 생산량 선택
|
|
- ShowListMonth(false);
|
|
|
|
|
|
+ //ShowListMonth(false);
|
|
|
|
|
|
- if (ShowMonthTypeIndex == 0) { //사용량
|
|
|
|
- Show_MonthVipTableEnergy1 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 532, R.drawable.bg_vip_2, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY1);
|
|
|
|
- ViewRegistration(getLayout(), Show_MonthVipTableEnergy1, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(221));
|
|
|
|
|
|
+ //사용량
|
|
|
|
+ //Show_MonthVipTableEnergy1 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 532, R.drawable.bg_vip_2, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY1);
|
|
|
|
+ //ViewRegistration(getLayout(), Show_MonthVipTableEnergy1, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(221));
|
|
|
|
|
|
- Show_MonthVipTableEnergy2 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 348, R.drawable.bg_vip_3, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY2);
|
|
|
|
- ViewRegistration(getLayout(), Show_MonthVipTableEnergy2, Common.ImgPosion.GetX(667), Common.ImgPosion.GetY(221));
|
|
|
|
- } else if (ShowMonthTypeIndex == 1) { //생산량
|
|
|
|
- Show_MonthVipTableEnergy3 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 348, R.drawable.bg_vip_1, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY3);
|
|
|
|
- ViewRegistration(getLayout(), Show_MonthVipTableEnergy3, Common.ImgPosion.GetX(360), Common.ImgPosion.GetY(221));
|
|
|
|
- }
|
|
|
|
|
|
+ Show_MonthVipTableEnergy2 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 348, R.drawable.bg_vip_3, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY2);
|
|
|
|
+ ViewRegistration(getLayout(), Show_MonthVipTableEnergy2, Common.ImgPosion.GetX(93), Common.ImgPosion.GetY(221));
|
|
|
|
+ //생산량
|
|
|
|
+ Show_MonthVipTableEnergy3 = new WpadImageView(getContext(), TOUCH_KIND.NONE, 520, 348, R.drawable.bg_vip_1, 0, ID.RemoteMeterMainScreenID.image.BG_MONTHTABLE_VIP_ENERGY3);
|
|
|
|
+ ViewRegistration(getLayout(), Show_MonthVipTableEnergy3, Common.ImgPosion.GetX(667), Common.ImgPosion.GetY(221));
|
|
|
|
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
for (int i = 0; i < 6; i++) {
|
|
for (int i = 0; i < 6; i++) {
|
|
@@ -1411,15 +1424,15 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
switch (mNumberOfEnergy) {
|
|
switch (mNumberOfEnergy) {
|
|
case 3:
|
|
case 3:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 5:
|
|
case 5:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 6:
|
|
case 6:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 74, 74);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 74, 74);
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|
|
@@ -1441,6 +1454,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
/**
|
|
/**
|
|
* @description 당월 표의 텍스트 데이터 출력
|
|
* @description 당월 표의 텍스트 데이터 출력
|
|
*/
|
|
*/
|
|
|
|
+ /* 삭제됨
|
|
private void ShowMonthEnergyData(int NumberOfEnergy, int Margin_x, int Margin_y) {
|
|
private void ShowMonthEnergyData(int NumberOfEnergy, int Margin_x, int Margin_y) {
|
|
String tempMonthItem = "";
|
|
String tempMonthItem = "";
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
@@ -1466,15 +1480,16 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- private void ShowMonthEnergyDataRight(int Margin_x, int Margin_y) {
|
|
|
|
|
|
+ */
|
|
|
|
+ private void ShowMonthEnergyDataRight(int Margin_y) {
|
|
String tempMonthItem = "";
|
|
String tempMonthItem = "";
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
for (int i = 0; i < 3; i++) {
|
|
for (int i = 0; i < 3; i++) {
|
|
tempMonthItem = monthTableClassRight[1].Use;
|
|
tempMonthItem = monthTableClassRight[1].Use;
|
|
|
|
|
|
- Show_MonthTable_Item_Use_Text_RIGHT[i] = new WpadTextView(getContext(), false, 273, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
|
|
+ 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],
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[i],
|
|
- Common.ImgPosion.GetX(902),
|
|
|
|
|
|
+ Common.ImgPosion.GetX(312),
|
|
Common.ImgPosion.GetY(293 + (i * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
Common.ImgPosion.GetY(293 + (i * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
if (Show_MonthTable_Item_Use_Text_RIGHT[i] != null)
|
|
if (Show_MonthTable_Item_Use_Text_RIGHT[i] != null)
|
|
Show_MonthTable_Item_Use_Text_RIGHT[i].setText(tempMonthItem);
|
|
Show_MonthTable_Item_Use_Text_RIGHT[i].setText(tempMonthItem);
|
|
@@ -1482,35 +1497,35 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
private void ShowMonthEnergyDataCenter(int Margin_x, int Margin_y) {
|
|
private void ShowMonthEnergyDataCenter(int Margin_x, int Margin_y) {
|
|
- String kepcoMonthItem = "";
|
|
|
|
|
|
+ String photovoltaicsMonthItem = "";
|
|
String fuelcellMonthItem = "";
|
|
String fuelcellMonthItem = "";
|
|
double total = 0;
|
|
double total = 0;
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
int TempMargin_y_ForEnergyNum2 = 0;
|
|
- kepcoMonthItem = monthTableClassRight[0].Use;
|
|
|
|
|
|
+ photovoltaicsMonthItem = monthTableClassRight[2].Use;
|
|
fuelcellMonthItem = monthTableClassRight[3].Use;
|
|
fuelcellMonthItem = monthTableClassRight[3].Use;
|
|
|
|
|
|
- total = Double.valueOf(kepcoMonthItem) + Double.valueOf(fuelcellMonthItem);
|
|
|
|
|
|
+ total = Double.valueOf(photovoltaicsMonthItem) + Double.valueOf(fuelcellMonthItem);
|
|
|
|
|
|
- Show_MonthTable_Item_Use_Text_CENTER[0] = new WpadTextView(getContext(), false, 273, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
|
|
+ Show_MonthTable_Item_Use_Text_CENTER[0] = new WpadTextView(getContext(), false, 295, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[0],
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[0],
|
|
- Common.ImgPosion.GetX(602),
|
|
|
|
|
|
+ Common.ImgPosion.GetX(900),
|
|
Common.ImgPosion.GetY(293 + (0 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
Common.ImgPosion.GetY(293 + (0 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[0] != null)
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[0] != null)
|
|
- Show_MonthTable_Item_Use_Text_CENTER[0].setText(kepcoMonthItem);
|
|
|
|
|
|
+ Show_MonthTable_Item_Use_Text_CENTER[0].setText(photovoltaicsMonthItem);
|
|
|
|
|
|
- Show_MonthTable_Item_Use_Text_CENTER[1] = new WpadTextView(getContext(), false, 273, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
|
|
+ Show_MonthTable_Item_Use_Text_CENTER[1] = new WpadTextView(getContext(), false, 295, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[1],
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[1],
|
|
- Common.ImgPosion.GetX(602),
|
|
|
|
|
|
+ Common.ImgPosion.GetX(900),
|
|
Common.ImgPosion.GetY(293 + (1 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
Common.ImgPosion.GetY(293 + (1 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[1] != null)
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[1] != null)
|
|
Show_MonthTable_Item_Use_Text_CENTER[1].setText(fuelcellMonthItem);
|
|
Show_MonthTable_Item_Use_Text_CENTER[1].setText(fuelcellMonthItem);
|
|
|
|
|
|
- Show_MonthTable_Item_Use_Text_CENTER[2] = new WpadTextView(getContext(), false, 273, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
|
|
|
+ Show_MonthTable_Item_Use_Text_CENTER[2] = new WpadTextView(getContext(), false, 295, Margin_x, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[2],
|
|
ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_CENTER[2],
|
|
- Common.ImgPosion.GetX(602),
|
|
|
|
|
|
+ Common.ImgPosion.GetX(900),
|
|
Common.ImgPosion.GetY(293 + (2 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
Common.ImgPosion.GetY(293 + (2 * Margin_y) + TempMargin_y_ForEnergyNum2));
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[2] != null)
|
|
if (Show_MonthTable_Item_Use_Text_CENTER[2] != null)
|
|
- Show_MonthTable_Item_Use_Text_CENTER[2].setText(total+"");
|
|
|
|
|
|
+ Show_MonthTable_Item_Use_Text_CENTER[2].setText(total + "");
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -1550,7 +1565,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(202),
|
|
Common.ImgPosion.GetX(202),
|
|
Common.ImgPosion.GetY(187));
|
|
Common.ImgPosion.GetY(187));
|
|
|
|
|
|
- Show_3Month_Discription_Text.setText(mShowListEnergyTypeText.getText() + "사용량을 작년 3개월과 올해 3개월분 비교 데이터입니다.");
|
|
|
|
|
|
+ Show_3Month_Discription_Text.setText(ShowListEnergyType_String[ShowNowEnergyIndex] + "사용량을 작년 3개월과 올해 3개월분 비교 데이터입니다.");
|
|
|
|
|
|
|
|
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
@@ -1690,9 +1705,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(202),
|
|
Common.ImgPosion.GetX(202),
|
|
Common.ImgPosion.GetY(187));
|
|
Common.ImgPosion.GetY(187));
|
|
if (mEMS_Enable == true) {
|
|
if (mEMS_Enable == true) {
|
|
- Show_3Month_Discription_Text.setText("최근 3개월간의 " + mShowListEnergyTypeText.getText() + "사용량 입니다.");
|
|
|
|
|
|
+ Show_3Month_Discription_Text.setText("최근 3개월간의 " + ShowListEnergyType_String[ShowNowEnergyIndex] + "사용량 입니다.");
|
|
|
|
|
|
//동평형, 우리집 좌표 필요 //수정필요
|
|
//동평형, 우리집 좌표 필요 //수정필요
|
|
|
|
+ /*
|
|
Show_Discription_SamePyung = new WpadImageView(getContext(), TOUCH_KIND.NONE, 30, 15, R.drawable.image_dong, 0, ID.RemoteMeterMainScreenID.image.BG_DISCRIPTION_SAMEPYUNG);
|
|
Show_Discription_SamePyung = new WpadImageView(getContext(), TOUCH_KIND.NONE, 30, 15, R.drawable.image_dong, 0, ID.RemoteMeterMainScreenID.image.BG_DISCRIPTION_SAMEPYUNG);
|
|
ViewRegistration(getLayout(), Show_Discription_SamePyung, Common.ImgPosion.GetX(1109), Common.ImgPosion.GetY(264));
|
|
ViewRegistration(getLayout(), Show_Discription_SamePyung, Common.ImgPosion.GetX(1109), Common.ImgPosion.GetY(264));
|
|
|
|
|
|
@@ -1710,8 +1726,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
Common.ImgPosion.GetX(1139),
|
|
Common.ImgPosion.GetX(1139),
|
|
Common.ImgPosion.GetY(285));
|
|
Common.ImgPosion.GetY(285));
|
|
Show_Discription_Myhome_Text.setText("우리집");
|
|
Show_Discription_Myhome_Text.setText("우리집");
|
|
|
|
+
|
|
|
|
+ */
|
|
} else {
|
|
} else {
|
|
- Show_3Month_Discription_Text.setText("최근 6개월간의 " + mShowListEnergyTypeText.getText() + "사용량 입니다.");
|
|
|
|
|
|
+ Show_3Month_Discription_Text.setText("최근 6개월간의 " + ShowListEnergyType_String[ShowNowEnergyIndex] + "사용량 입니다.");
|
|
}
|
|
}
|
|
|
|
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
if (mSampleShow == Common.MODE_BUSINESS_SAMPLE) {
|
|
@@ -1857,6 +1875,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
/**
|
|
/**
|
|
* @description 에너지 리스트 버튼 삭제
|
|
* @description 에너지 리스트 버튼 삭제
|
|
*/
|
|
*/
|
|
|
|
+
|
|
private void RemoveListEnergy() {
|
|
private void RemoveListEnergy() {
|
|
getLayout().removeView(mListEnergy);
|
|
getLayout().removeView(mListEnergy);
|
|
getLayout().removeView(mShowListEnergyTypeText);
|
|
getLayout().removeView(mShowListEnergyTypeText);
|
|
@@ -1866,12 +1885,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
/**
|
|
/**
|
|
* @description 당월 사용량/생산량 리스트 버튼 삭제
|
|
* @description 당월 사용량/생산량 리스트 버튼 삭제
|
|
*/
|
|
*/
|
|
|
|
+ /* 삭제됨
|
|
private void RemoveListMonth() {
|
|
private void RemoveListMonth() {
|
|
getLayout().removeView(mListMonth);
|
|
getLayout().removeView(mListMonth);
|
|
getLayout().removeView(mShowListMonthTypeText);
|
|
getLayout().removeView(mShowListMonthTypeText);
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* @description 전기, 수도, 가스, 온수, 난방, 탄소 중 현재 표현된 에너지 정보 제거<br>
|
|
* @description 전기, 수도, 가스, 온수, 난방, 탄소 중 현재 표현된 에너지 정보 제거<br>
|
|
@@ -2021,8 +2042,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
* @description 전년비, 3개월 비교 그래프 생성을 위한 ArrayList를 초기화 하는 함수
|
|
* @description 전년비, 3개월 비교 그래프 생성을 위한 ArrayList를 초기화 하는 함수
|
|
*/
|
|
*/
|
|
private void AllArrayListClear() {
|
|
private void AllArrayListClear() {
|
|
- arrayListElect.removeAll(arrayListElect);
|
|
|
|
- arrayListWater.removeAll(arrayListWater);
|
|
|
|
|
|
+ arrayListPhotovoltaics.removeAll(arrayListPhotovoltaics);
|
|
|
|
+ arrayListFuelcell.removeAll(arrayListFuelcell);
|
|
arrayListGas.removeAll(arrayListGas);
|
|
arrayListGas.removeAll(arrayListGas);
|
|
arrayListHotwater.removeAll(arrayListHotwater);
|
|
arrayListHotwater.removeAll(arrayListHotwater);
|
|
arrayListEnergy.removeAll(arrayListEnergy);
|
|
arrayListEnergy.removeAll(arrayListEnergy);
|
|
@@ -2052,9 +2073,13 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
(Integer.parseInt(MetringInfo[1]) == 3) ||
|
|
(Integer.parseInt(MetringInfo[1]) == 3) ||
|
|
(Integer.parseInt(MetringInfo[1]) == 5) ||
|
|
(Integer.parseInt(MetringInfo[1]) == 5) ||
|
|
(Integer.parseInt(MetringInfo[1]) == 6)) {
|
|
(Integer.parseInt(MetringInfo[1]) == 6)) {
|
|
- mNumberOfEnergy = Integer.parseInt(MetringInfo[1]);
|
|
|
|
|
|
+ //mNumberOfEnergy = Integer.parseInt(MetringInfo[1]);
|
|
|
|
+ //vip는 4개
|
|
|
|
+ mNumberOfEnergy = 4;
|
|
} else {
|
|
} else {
|
|
- mNumberOfEnergy = 5;
|
|
|
|
|
|
+ //mNumberOfEnergy = 5;
|
|
|
|
+ //vip는 4개
|
|
|
|
+ mNumberOfEnergy = 4;
|
|
}
|
|
}
|
|
|
|
|
|
if (MetringInfo[5].equals("사용함")) {
|
|
if (MetringInfo[5].equals("사용함")) {
|
|
@@ -2069,16 +2094,22 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
Log.e(TAG, "exception : " + re);
|
|
Log.e(TAG, "exception : " + re);
|
|
- mNumberOfEnergy = 5;
|
|
|
|
|
|
+ //mNumberOfEnergy = 5;
|
|
|
|
+ //vip는 4개
|
|
|
|
+ mNumberOfEnergy = 4;
|
|
mEMS_Enable = true;
|
|
mEMS_Enable = true;
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
//e.printStackTrace();
|
|
//e.printStackTrace();
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
LogUtil.errorLogInfo("", TAG, e);
|
|
- mNumberOfEnergy = 5;
|
|
|
|
|
|
+ //mNumberOfEnergy = 5;
|
|
|
|
+ //vip는 4개
|
|
|
|
+ mNumberOfEnergy = 4;
|
|
mEMS_Enable = true;
|
|
mEMS_Enable = true;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- mNumberOfEnergy = 5;
|
|
|
|
|
|
+ //mNumberOfEnergy = 5;
|
|
|
|
+ //vip는 4개
|
|
|
|
+ mNumberOfEnergy = 4;
|
|
mEMS_Enable = true;
|
|
mEMS_Enable = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2171,20 +2202,25 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
case 1: //일별
|
|
case 1: //일별
|
|
switch (energy) {
|
|
switch (energy) {
|
|
- case 0: //전기
|
|
|
|
- imapRemotemeter.DoWork(false, true, false, false, false, false, false, false, year, month);
|
|
|
|
|
|
+ case 0: //전기차1
|
|
|
|
+ //imapRemotemeter.DoWork(false, true, false, false, false, false, false, false, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
break;
|
|
break;
|
|
- case 1: //수도
|
|
|
|
- imapRemotemeter.DoWork(false, false, false, true, false, false, false, false, year, month);
|
|
|
|
|
|
+ case 1: //전기차2
|
|
|
|
+ //imapRemotemeter.DoWork(false, false, false, true, false, false, false, false, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
break;
|
|
break;
|
|
- case 2: //가스
|
|
|
|
- imapRemotemeter.DoWork(false, false, true, false, false, false, false, false, year, month);
|
|
|
|
|
|
+ case 2: //태양광
|
|
|
|
+ //imapRemotemeter.DoWork(false, false, true, false, false, false, false, false, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, false, true, false, year, month);
|
|
break;
|
|
break;
|
|
- case 3: //온수
|
|
|
|
- imapRemotemeter.DoWork(false, false, false, false, true, false, false, false, year, month);
|
|
|
|
|
|
+ case 3: //연료전지
|
|
|
|
+ //imapRemotemeter.DoWork(false, false, false, false, true, false, false, false, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, false, false, true, year, month);
|
|
break;
|
|
break;
|
|
- case 4: //난방
|
|
|
|
- imapRemotemeter.DoWork(false, false, false, false, false, true, false, false, year, month);
|
|
|
|
|
|
+ case 4: //전기차
|
|
|
|
+ //imapRemotemeter.DoWork(false, false, false, false, false, true, false, false, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(false, false, true, false, false, year, month);
|
|
break;
|
|
break;
|
|
case 5: //전기차
|
|
case 5: //전기차
|
|
//imapRemotemeter.DoWork(false, false, false, false, false, false, true, false, year, month);
|
|
//imapRemotemeter.DoWork(false, false, false, false, false, false, true, false, year, month);
|
|
@@ -2198,24 +2234,29 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
case 2: //3개월 or 6개월
|
|
case 2: //3개월 or 6개월
|
|
case 3: //전년비
|
|
case 3: //전년비
|
|
switch (energy) {
|
|
switch (energy) {
|
|
- case 0: //전기
|
|
|
|
- imapRemotemeter.DoWork(true, true, false, false, false, false, false, mEMS_Enable, year, month);
|
|
|
|
|
|
+ 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);
|
|
break;
|
|
break;
|
|
- case 1: //수도
|
|
|
|
- imapRemotemeter.DoWork(true, false, false, true, false, false, false, mEMS_Enable, year, month);
|
|
|
|
|
|
+ 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);
|
|
break;
|
|
break;
|
|
- case 2: //가스
|
|
|
|
- imapRemotemeter.DoWork(true, false, true, false, false, false, false, mEMS_Enable, year, month);
|
|
|
|
|
|
+ case 2: //태양광
|
|
|
|
+ //imapRemotemeter.DoWork(true, false, true, false, false, false, false, mEMS_Enable, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, false, true, false, year, month);
|
|
break;
|
|
break;
|
|
- case 3: //온수
|
|
|
|
- imapRemotemeter.DoWork(true, false, false, false, true, false, false, mEMS_Enable, year, month);
|
|
|
|
|
|
+ case 3: //연료전지
|
|
|
|
+ //imapRemotemeter.DoWork(true, false, false, false, true, false, false, mEMS_Enable, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, false, false, true, year, month);
|
|
break;
|
|
break;
|
|
- case 4: //난방
|
|
|
|
- imapRemotemeter.DoWork(true, false, false, false, false, true, false, mEMS_Enable, year, month);
|
|
|
|
|
|
+ case 4: //전기차
|
|
|
|
+ //imapRemotemeter.DoWork(true, false, false, false, false, true, false, mEMS_Enable, year, month);
|
|
|
|
+ imapRemotemeter.DoWorkVIP(true, false, true, false, false, year, month);
|
|
break;
|
|
break;
|
|
case 5: //전기차
|
|
case 5: //전기차
|
|
//imapRemotemeter.DoWork(true, false, false, false, false, false, true, mEMS_Enable, year, month);
|
|
//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, year, month);
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
@@ -2401,21 +2442,21 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
if ((result == true) && (ShowNowTypeIndex == 0)) {
|
|
if ((result == true) && (ShowNowTypeIndex == 0)) {
|
|
switch (mNumberOfEnergy) {
|
|
switch (mNumberOfEnergy) {
|
|
case 2:
|
|
case 2:
|
|
- ShowMonthEnergyData(3, 273, 228);
|
|
|
|
|
|
+ //ShowMonthEnergyData(3, 273, 228);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 3:
|
|
case 3:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 151, 151);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 5:
|
|
case 5:
|
|
- if (ShowMonthTypeIndex == 0) {
|
|
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
|
|
- }
|
|
|
|
|
|
+ //if (ShowMonthTypeIndex == 0) {
|
|
|
|
+ // ShowMonthEnergyData(mNumberOfEnergy, 90, 90);
|
|
|
|
+ //}
|
|
break;
|
|
break;
|
|
|
|
|
|
case 6:
|
|
case 6:
|
|
- ShowMonthEnergyData(mNumberOfEnergy, 90, 74);
|
|
|
|
|
|
+ //ShowMonthEnergyData(mNumberOfEnergy, 90, 74);
|
|
break;
|
|
break;
|
|
|
|
|
|
default:
|
|
default:
|
|
@@ -2460,11 +2501,9 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
if (result == true) {
|
|
if (result == true) {
|
|
- if (ShowMonthTypeIndex == 0) {
|
|
|
|
- ShowMonthEnergyDataRight(90, 90);
|
|
|
|
- } else if (ShowMonthTypeIndex == 1) {
|
|
|
|
- ShowMonthEnergyDataCenter(90, 90);
|
|
|
|
- }
|
|
|
|
|
|
+ //사용량, 생산량 같이 표현
|
|
|
|
+ ShowMonthEnergyDataRight(90);
|
|
|
|
+ ShowMonthEnergyDataCenter(90, 90);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
@@ -2481,43 +2520,43 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
&& (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
|
|
&& (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
|
|
DebugLogOutput("day " + imapRemotemeter.GetAttributeVal(i, "day"));
|
|
DebugLogOutput("day " + imapRemotemeter.GetAttributeVal(i, "day"));
|
|
switch (ShowNowEnergyIndex) {
|
|
switch (ShowNowEnergyIndex) {
|
|
- case 0: // 전기
|
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "elect_used");
|
|
|
|
|
|
+ case 0: // 전기차1
|
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
if (TempString.equals("1000000") == false) {
|
|
if (TempString.equals("1000000") == false) {
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
- imapRemotemeter.GetAttributeVal(i, "elect_used"));
|
|
|
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 1: // 수도
|
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "water_used");
|
|
|
|
|
|
+ case 1: // 전기차2
|
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
if (TempString.equals("1000000") == false) {
|
|
if (TempString.equals("1000000") == false) {
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
- imapRemotemeter.GetAttributeVal(i, "water_used"));
|
|
|
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 2: // 가스
|
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "gas_used");
|
|
|
|
|
|
+ case 2: // 태양광
|
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "photovoltaics_used");
|
|
if (TempString.equals("1000000") == false) {
|
|
if (TempString.equals("1000000") == false) {
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
- imapRemotemeter.GetAttributeVal(i, "gas_used"));
|
|
|
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 3: // 온수
|
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "hotwater_used");
|
|
|
|
|
|
+ case 3: // 연료전지
|
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
|
|
if (TempString.equals("1000000") == false) {
|
|
if (TempString.equals("1000000") == false) {
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
- imapRemotemeter.GetAttributeVal(i, "hotwater_used"));
|
|
|
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 4: // 난방
|
|
|
|
- TempString = imapRemotemeter.GetAttributeVal(i, "energy_used");
|
|
|
|
|
|
+ case 4: // 전기차
|
|
|
|
+ TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
|
|
if (TempString.equals("1000000") == false) {
|
|
if (TempString.equals("1000000") == false) {
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))),
|
|
- imapRemotemeter.GetAttributeVal(i, "energy_used"));
|
|
|
|
|
|
+ imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -2549,78 +2588,56 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
float Temp_SameSize = 0;
|
|
float Temp_SameSize = 0;
|
|
|
|
|
|
switch (ShowNowEnergyIndex) {
|
|
switch (ShowNowEnergyIndex) {
|
|
- case 0: // 전기
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "elect_used") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "elect_used").equals("1000000") == false) {
|
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "elect_used"));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize").equals("null") == false) {
|
|
|
|
- Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize"));
|
|
|
|
|
|
+ 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"));
|
|
}
|
|
}
|
|
- DebugLogOutput("elect_average_used_samesize " + imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize"));
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
- arrayListElect.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
- .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, Temp_SameSize));
|
|
|
|
|
|
+ arrayListElecCar.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
+ .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListElect " + arrayListElect.size());
|
|
|
|
- DebugLogOutput("arrayListElect used " + arrayListElect.get(i).UsedValue_Myhome);
|
|
|
|
|
|
+ DebugLogOutput("arrayListElecCar " + arrayListElecCar.size());
|
|
|
|
+ DebugLogOutput("arrayListElecCar used " + arrayListElecCar.get(i).UsedValue_Myhome);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 1: // 수도
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "water_used") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "water_used").equals("1000000") == false) {
|
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "water_used"));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize").equals("null") == false) {
|
|
|
|
- Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize"));
|
|
|
|
|
|
+ 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"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- arrayListWater.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
- .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, Temp_SameSize));
|
|
|
|
|
|
+ arrayListElecCar.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
+ .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListWater " + arrayListWater.size());
|
|
|
|
- DebugLogOutput("arrayListWater used " + arrayListWater.get(i).UsedValue_Myhome);
|
|
|
|
|
|
+ DebugLogOutput("arrayListElecCar " + arrayListElecCar.size());
|
|
|
|
+ DebugLogOutput("arrayListElecCar used " + arrayListElecCar.get(i).UsedValue_Myhome);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 2: // 가스
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "gas_used") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "gas_used").equals("1000000") == false) {
|
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "gas_used"));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize").equals("null") == false) {
|
|
|
|
- Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize"));
|
|
|
|
|
|
+ case 2: // 태양광
|
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
|
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used").equals("1000000") == false) {
|
|
|
|
+ Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- arrayListGas.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
- .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, Temp_SameSize));
|
|
|
|
|
|
+ arrayListPhotovoltaics.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
+ .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListGas " + arrayListGas.size());
|
|
|
|
- DebugLogOutput("arrayListGas used " + arrayListGas.get(i).UsedValue_Myhome);
|
|
|
|
|
|
+ DebugLogOutput("arrayListPhotovoltaics " + arrayListPhotovoltaics.size());
|
|
|
|
+ DebugLogOutput("arrayListPhotovoltaics used " + arrayListPhotovoltaics.get(i).UsedValue_Myhome);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 3: // 온수
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "hotwater_used") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "hotwater_used").equals("1000000") == false) {
|
|
|
|
- Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "hotwater_used"));
|
|
|
|
|
|
+ case 3: // 연료전지
|
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used") != null) {
|
|
|
|
+ if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used").equals("1000000") == false) {
|
|
|
|
+ Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize") != null) {
|
|
|
|
- if (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize").equals("null") == false) {
|
|
|
|
- Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize"));
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- arrayListHotwater.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
- .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, Temp_SameSize));
|
|
|
|
|
|
+ arrayListFuelcell.add(new UsedValueArrayClass(Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")), Integer
|
|
|
|
+ .parseInt(imapRemotemeter.GetAttributeVal(i, "month")), Temp_Myhome, 0));
|
|
|
|
|
|
- DebugLogOutput("arrayListHotwater " + arrayListHotwater.size());
|
|
|
|
- DebugLogOutput("arrayListHotwater used " + arrayListHotwater.get(i).UsedValue_Myhome);
|
|
|
|
|
|
+ DebugLogOutput("arrayListFuelcell " + arrayListFuelcell.size());
|
|
|
|
+ DebugLogOutput("arrayListFuelcell used " + arrayListFuelcell.get(i).UsedValue_Myhome);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 4: // 난방
|
|
case 4: // 난방
|
|
@@ -2686,27 +2703,27 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
switch (ShowNowEnergyIndex) {
|
|
switch (ShowNowEnergyIndex) {
|
|
- case 0: // 전기
|
|
|
|
- Show3MonthEnergy_inRetProci(arrayListElect);
|
|
|
|
|
|
+ case 0: // 전기차1
|
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 1: // 수도
|
|
|
|
- Show3MonthEnergy_inRetProci(arrayListWater);
|
|
|
|
|
|
+ case 1: // 전기차2
|
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 2: // 가스
|
|
|
|
- Show3MonthEnergy_inRetProci(arrayListGas);
|
|
|
|
|
|
+ case 2: // 태양광
|
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListPhotovoltaics);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 3: // 온수
|
|
|
|
- Show3MonthEnergy_inRetProci(arrayListHotwater);
|
|
|
|
|
|
+ case 3: // 연료전지
|
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListFuelcell);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 4: // 열량
|
|
case 4: // 열량
|
|
- Show3MonthEnergy_inRetProci(arrayListEnergy);
|
|
|
|
|
|
+ Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 5: // 탄소
|
|
|
|
|
|
+ case 5: // 전기차
|
|
Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
Show3MonthEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
@@ -2716,24 +2733,24 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
} else if (inputType == 3) {
|
|
} else if (inputType == 3) {
|
|
//전년비
|
|
//전년비
|
|
switch (ShowNowEnergyIndex) {
|
|
switch (ShowNowEnergyIndex) {
|
|
- case 0: // 전기
|
|
|
|
- ShowYearEnergy_inRetProci(arrayListElect);
|
|
|
|
|
|
+ case 0: // 전기차1
|
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 1: // 수도
|
|
|
|
- ShowYearEnergy_inRetProci(arrayListWater);
|
|
|
|
|
|
+ case 1: // 전기차2
|
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 2: // 가스
|
|
|
|
- ShowYearEnergy_inRetProci(arrayListGas);
|
|
|
|
|
|
+ case 2: // 태양광
|
|
|
|
+ ShowYearEnergy_inRetProci(arrayListPhotovoltaics);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case 3: // 온수
|
|
|
|
- ShowYearEnergy_inRetProci(arrayListHotwater);
|
|
|
|
|
|
+ case 3: // 연료전지
|
|
|
|
+ ShowYearEnergy_inRetProci(arrayListFuelcell);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 4: // 열량
|
|
case 4: // 열량
|
|
- ShowYearEnergy_inRetProci(arrayListEnergy);
|
|
|
|
|
|
+ ShowYearEnergy_inRetProci(arrayListElecCar);
|
|
break;
|
|
break;
|
|
|
|
|
|
case 5: // 탄소
|
|
case 5: // 탄소
|
|
@@ -2911,7 +2928,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
CalcMaxValueArrayList.add((int) TempArray.get(i).UsedValue_Myhome);
|
|
CalcMaxValueArrayList.add((int) TempArray.get(i).UsedValue_Myhome);
|
|
- CalcMaxValueArrayList.add((int) TempArray.get(i).UsedValue_SamePyung);
|
|
|
|
|
|
+ //동평형 제거
|
|
|
|
+ //CalcMaxValueArrayList.add((int) TempArray.get(i).UsedValue_SamePyung);
|
|
}
|
|
}
|
|
|
|
|
|
DebugLogOutput("CalcMaxValueArrayList " + CalcMaxValueArrayList.size());
|
|
DebugLogOutput("CalcMaxValueArrayList " + CalcMaxValueArrayList.size());
|
|
@@ -2936,66 +2954,66 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
if ((CalendarMonth + 1) == 2) {
|
|
if ((CalendarMonth + 1) == 2) {
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == 12)) {
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == 12)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 274, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 200, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 378, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 326, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 570, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 470, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 674, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 622, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 2)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 2)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 866, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 766, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 2)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 2)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 970, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 918, false, "");
|
|
}
|
|
}
|
|
} else if ((CalendarMonth + 1) == 1) {
|
|
} else if ((CalendarMonth + 1) == 1) {
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == 11)) {
|
|
if ((TempArray.get(i).Year == (CalendarYear - 1)) && (TempArray.get(i).Month == 11)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 274, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 200, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 11)) {
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 11)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 378, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 326, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 570, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 470, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
if ((TempArray.get(i).Year == CalendarYear - 1) && (TempArray.get(i).Month == 12)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 674, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 622, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 866, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 766, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 970, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 918, false, "");
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 2)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 2)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 274, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 200, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 2)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 2)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 378, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 326, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 570, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 470, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 1)) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1) - 1)) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 674, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 622, false, "");
|
|
}
|
|
}
|
|
|
|
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1))) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1))) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 866, false, "");
|
|
|
|
|
|
+ //DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_SamePyung, true, 766, false, "");
|
|
}
|
|
}
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1))) {
|
|
if ((TempArray.get(i).Year == CalendarYear) && (TempArray.get(i).Month == (CalendarMonth + 1))) {
|
|
- DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 970, false, "");
|
|
|
|
|
|
+ DrawGraphAfterCalc((float) Temp_MaxValue, TempArray.get(i).UsedValue_Myhome, false, 918, false, "");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|