|
@@ -60,6 +60,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
WpadImageView Show_BG_Calendar; //달력 배경
|
|
|
WpadImageView Show_BG_Description; //에너지 설명 배경(예, 전기 사용량을 작년 3개월과 ...)
|
|
|
WpadImageView Show_BG_Graph; //에너지 그래프 배경
|
|
|
+ WpadImageView Show_3Month_BG_Graph; //에너지 3개월 그래프 배경
|
|
|
WpadImageView Show_Today;
|
|
|
WpadImageView Show_Calendar_Item[] = new WpadImageView[31];
|
|
|
WpadImageView Show_Discription_SamePyung; //동평형 그래프 색
|
|
@@ -1687,8 +1688,8 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
//setTopSetTargetBtnVisible(false);
|
|
|
ShowListEnergy(false);
|
|
|
|
|
|
- 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));
|
|
|
+ Show_3Month_BG_Graph = new WpadImageView(getContext(), TOUCH_KIND.NONE, 890, 482, R.drawable.graph_bg, 0, ID.RemoteMeterMainScreenID.image.BG_3MONTH_GRAPH);
|
|
|
+ ViewRegistration(getLayout(), Show_3Month_BG_Graph, Common.ImgPosion.GetX(202), Common.ImgPosion.GetY(257));
|
|
|
|
|
|
Show_3Month_Discription_Text = new WpadTextView(getContext(), false, 890, 70, Gravity.CENTER, Color.parseColor("#646464"), Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
|
|
|
ViewRegistration(getLayout(), Show_3Month_Discription_Text,
|
|
@@ -1807,13 +1808,16 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
|
|
|
// 그래프 y축 시작위치: 730
|
|
|
for (int i = 0; i < usedValue_Myhome2; i++) {
|
|
|
- mDrawRectIndex++;
|
|
|
if (isColorRed == true) {
|
|
|
- drawRect[i] = new DrawRect(getContext(), point_x, (737 - (i)), 0);
|
|
|
+ drawRect[mDrawRectIndex] = new DrawRect(getContext(), point_x, (737 - (i)), 0);
|
|
|
+ //drawRect[i] = new DrawRect(getContext(), point_x, (737 - (i)), 0);
|
|
|
} else {
|
|
|
- drawRect[i] = new DrawRect(getContext(), point_x, (737 - (i)), 1);
|
|
|
+ drawRect[mDrawRectIndex] = new DrawRect(getContext(), point_x, (737 - (i)), 1);
|
|
|
+ //drawRect[i] = new DrawRect(getContext(), point_x, (737 - (i)), 1);
|
|
|
}
|
|
|
- getLayout().addView(drawRect[i]);
|
|
|
+
|
|
|
+ getLayout().addView(drawRect[mDrawRectIndex]);
|
|
|
+ mDrawRectIndex++;
|
|
|
}
|
|
|
//그래프 위에 그래프값 Text입력
|
|
|
ShowGraphValue(usedValue_Myhome, point_x, 737 - ((usedValue_Myhome2)), isShowBottomValue, BottomValue, (737));
|
|
@@ -1892,6 +1896,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
* @description 그래프를 삭제하기 위한 함수
|
|
|
*/
|
|
|
private void RemoveGraph() {
|
|
|
+ int size = drawRect.length;
|
|
|
for (int i = 0; i < mDrawRectIndex; i++) {
|
|
|
getLayout().removeView(drawRect[i]);
|
|
|
}
|
|
@@ -1979,7 +1984,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
RemoveListEnergy();
|
|
|
|
|
|
getLayout().removeView(Show_BG_Description);
|
|
|
- getLayout().removeView(Show_BG_Graph);
|
|
|
+ getLayout().removeView(Show_3Month_BG_Graph);
|
|
|
getLayout().removeView(Show_3Month_Discription_Text);
|
|
|
|
|
|
RemoveGraph();
|
|
@@ -2912,8 +2917,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
|
|
|
Show_3Month_Legend_Text[i].setText(Integer.toString(i * Temp_MaxValue / 5));
|
|
|
}
|
|
|
if (mEMS_Enable == true) {
|
|
|
- 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));
|
|
|
+ if(Show_3Month_BG_Graph==null) {
|
|
|
+ Show_3Month_BG_Graph = new WpadImageView(getContext(), TOUCH_KIND.NONE, 890, 482, R.drawable.graph_bg, 0, ID.RemoteMeterMainScreenID.image.BG_3MONTH_GRAPH);
|
|
|
+ ViewRegistration(getLayout(), Show_3Month_BG_Graph, Common.ImgPosion.GetX(202), Common.ImgPosion.GetY(257));
|
|
|
+ }
|
|
|
|
|
|
for (int i = 0; i < TempArray.size(); i++) {
|
|
|
if ((CalendarMonth + 1) == 2) {
|