Selaa lähdekoodia

[WallPadEnergyCtrl]
1. App Ver. 갱신
- 2022.08.23.01
2. 디버깅 로그 비활성화
3. 코드정리
4. 원격검침 데이터 요청 기능 개선
- 3개월, 전년비 화면 출력시 무조건 3개년 데이터 요청하는 로직 개선
> 필요한 데이터만 요청하도록 수정
> 3개년: 올해 또는 올해(1~2월)&전년
> 전년비: 올해&전년 또는 올해(1~2월)&전년&전전년
5. 전기 에너지 현황 화면의 기간 선택 문구 수정
- 당월 -> 월별

Jeffrey Nam 2 vuotta sitten
vanhempi
commit
9546f4e2f6

+ 1 - 1
WallPadEnergyCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadenergyctrl"
     package="kr.co.icontrols.wallpadenergyctrl"
     android:versionCode="01"
     android:versionCode="01"
-    android:versionName="2022.08.22.01">
+    android:versionName="2022.08.23.01">
 
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 1 - 1
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/declare/Common.java

@@ -8,7 +8,7 @@ import android.util.Log;
 
 
 public final class Common
 public final class Common
 {
 {
-    public final static boolean DEBUG_LOG_ON = true;
+    public final static boolean DEBUG_LOG_ON = false;
 
 
     public final static byte     INDEX_ALL = (byte)0xFF;           // 인덱스 전체 지정
     public final static byte     INDEX_ALL = (byte)0xFF;           // 인덱스 전체 지정
 
 

+ 57 - 88
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/imap/iMAPRemotemeter.java

@@ -111,8 +111,7 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
     String NewsVersionFromServer = null;
     String NewsVersionFromServer = null;
     
     
     
     
-    public iMAPRemotemeter(Context ctx)
-    {        
+    public iMAPRemotemeter(Context ctx) {
         DBMGR = new WallpadStatusData(ctx);
         DBMGR = new WallpadStatusData(ctx);
         AddressSet addc =  DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
         AddressSet addc =  DBMGR.getAddressMGR(); //DB에서 동호 정보 받아옴
         DBMGR.closeDB();
         DBMGR.closeDB();
@@ -132,8 +131,7 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
         this.ctx = ctx;
         this.ctx = ctx;
     }
     }
     
     
-    private String GetXMLGetRemoteMeter(boolean isDistinguishYear, boolean elect, boolean gas, boolean water, boolean hotwater, boolean energy, boolean carbon, boolean support_ems, int year, int month)
-    {
+    private String GetXMLGetRemoteMeter(boolean isDistinguishYear, boolean elect, boolean gas, boolean water, boolean hotwater, boolean energy, boolean carbon, boolean support_ems, int year, int month) {
         String retXML = null;      
         String retXML = null;      
 
 
         String elect_String = null;
         String elect_String = null;
@@ -144,47 +142,29 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
         String carbon_String = null;
         String carbon_String = null;
         String support_ems_String = null;
         String support_ems_String = null;
         
         
-        if (isDistinguishYear == true) {
-            isDistinguishYear_String = "year";
-        } else {
-            isDistinguishYear_String = "month";
-        }
-        if (elect == true) {
-            elect_String = "yes";
-        } else {
-            elect_String = "no";
-        }
-        if (gas == true) {
-            gas_String = "yes";
-        } else {
-            gas_String = "no";
-        }
+        if (isDistinguishYear) isDistinguishYear_String = "year";
+        else isDistinguishYear_String = "month";
 
 
-        if (water == true) {
-            water_String = "yes";
-        } else {
-            water_String = "no";
-        }
-        if (hotwater == true) {
-            hotwater_String = "yes";
-        } else {
-            hotwater_String = "no";
-        }
-        if (energy == true) {
-            energy_String = "yes";
-        } else {
-            energy_String = "no";
-        }
-        if (carbon == true) {
-            carbon_String = "yes";
-        } else {
-            carbon_String = "no";
-        }
-        if (support_ems == true) {
-            support_ems_String = "yes";
-        } else {
-            support_ems_String = "no";
-        }
+        if (elect) elect_String = "yes";
+        else elect_String = "no";
+
+        if (gas) gas_String = "yes";
+        else gas_String = "no";
+
+        if (water) water_String = "yes";
+        else water_String = "no";
+
+        if (hotwater) hotwater_String = "yes";
+        else hotwater_String = "no";
+
+        if (energy) energy_String = "yes";
+        else energy_String = "no";
+
+        if (carbon) carbon_String = "yes";
+        else carbon_String = "no";
+
+        if (support_ems) support_ems_String = "yes";
+        else support_ems_String = "no";
         
         
         retXML = XMLHeader +
         retXML = XMLHeader +
                 "   <service type = \"request\" name= \"get_ems_metering\">\r\n"+
                 "   <service type = \"request\" name= \"get_ems_metering\">\r\n"+
@@ -202,8 +182,8 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
         
         
         return retXML;
         return retXML;
     }
     }
-    private String GetXMLGetRemoteMeterVIP(boolean isDistinguishYear, boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell, int year, int month)
-    {
+
+    private String GetXMLGetRemoteMeterVIP(boolean isDistinguishYear, boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell, int year, int month) {
         String retXML = null;
         String retXML = null;
 
 
         String kepco_String = null;
         String kepco_String = null;
@@ -212,17 +192,14 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
         String photovoltaics_String = null;
         String photovoltaics_String = null;
         String fuelcell_String = null;
         String fuelcell_String = null;
 
 
-        if (isDistinguishYear == true) {
-            isDistinguishYear_String = "year";
-        } else {
-            isDistinguishYear_String = "month";
-        }
+        if (isDistinguishYear) isDistinguishYear_String = "year";
+        else isDistinguishYear_String = "month";
 
 
-        kepco_String = kepco==true?"yes":"no";
-        eleccar1_String = eleccar1==true?"yes":"no";
-        eleccar2_String = eleccar2==true?"yes":"no";
-        photovoltaics_String = photovoltaics==true?"yes":"no";
-        fuelcell_String = fuelcell==true?"yes":"no";
+        kepco_String = (kepco) ? "yes" : "no";
+        eleccar1_String = (eleccar1) ? "yes" : "no";
+        eleccar2_String = (eleccar2) ? "yes" : "no";
+        photovoltaics_String = (photovoltaics) ? "yes" : "no";
+        fuelcell_String = (fuelcell) ? "yes" : "no";
 
 
         retXML = XMLHeader +
         retXML = XMLHeader +
                 "   <service type = \"request\" name= \"get_elec_metering\">\r\n"+
                 "   <service type = \"request\" name= \"get_elec_metering\">\r\n"+
@@ -238,8 +215,8 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
 
 
         return retXML;
         return retXML;
     }
     }
-    private String GetXMLGetRemoteMeterVIP_RealTime(boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell)
-    {
+
+    private String GetXMLGetRemoteMeterVIP_RealTime(boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell) {
         String retXML = null;
         String retXML = null;
 
 
         String kepco_String = null;
         String kepco_String = null;
@@ -265,8 +242,8 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
 
 
         return retXML;
         return retXML;
     }
     }
-    public void SetServerIPcfg(String IPa, int port)
-    {
+
+    public void SetServerIPcfg(String IPa, int port) {
         ServerIP = IPa;
         ServerIP = IPa;
         SvrPort = port;
         SvrPort = port;
     }
     }
@@ -285,23 +262,20 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
                 if (result.equalsIgnoreCase("ok")) {
                 if (result.equalsIgnoreCase("ok")) {
                     String name = GetAttributeVal(0, "name");
                     String name = GetAttributeVal(0, "name");
                     String type = GetAttributeVal(0, "type");
                     String type = GetAttributeVal(0, "type");
-                    if ((name!=null && name.equalsIgnoreCase("get_ems_metering"))
-                            && (type!=null && type.equalsIgnoreCase("reply"))) {
+                    if ((name != null && name.equalsIgnoreCase("get_ems_metering")) && (type != null && type.equalsIgnoreCase("reply"))) {
                         if (SetItem("guidemap") == 1) {
                         if (SetItem("guidemap") == 1) {
-                            if (isDistinguishYear_String!=null && isDistinguishYear_String.equalsIgnoreCase("year")) {
+                            if (isDistinguishYear_String != null && isDistinguishYear_String.equalsIgnoreCase("year")) {
                                 String distinguish = GetAttributeVal(0, "distinguish");
                                 String distinguish = GetAttributeVal(0, "distinguish");
-                                if (distinguish!=null && distinguish.equalsIgnoreCase(
-                                        "year")) {
+                                if (distinguish != null && distinguish.equalsIgnoreCase("year")) {
                                     if (SetItem("valuelist") > 0) {
                                     if (SetItem("valuelist") > 0) {
                                         Proc.ProcSuccess();
                                         Proc.ProcSuccess();
                                         return;
                                         return;
                                     }
                                     }
                                 }
                                 }
                             }
                             }
-                            else if (isDistinguishYear_String!=null && isDistinguishYear_String.equalsIgnoreCase("month")) {
+                            else if (isDistinguishYear_String != null && isDistinguishYear_String.equalsIgnoreCase("month")) {
                                 String distinguish = GetAttributeVal(0, "distinguish");
                                 String distinguish = GetAttributeVal(0, "distinguish");
-                                if (distinguish!=null && distinguish.equalsIgnoreCase(
-                                        "month")) {
+                                if (distinguish != null && distinguish.equalsIgnoreCase("month")) {
                                     if (SetItem("valuelist") > 0) {
                                     if (SetItem("valuelist") > 0) {
                                         Proc.ProcSuccess();
                                         Proc.ProcSuccess();
                                         return;
                                         return;
@@ -310,22 +284,19 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
                             }
                             }
                         }
                         }
                     }
                     }
-                    else if ((name!=null && name.equalsIgnoreCase("get_elec_metering"))
-                            && (type!=null && type.equalsIgnoreCase("reply"))) {
+                    else if ((name != null && name.equalsIgnoreCase("get_elec_metering")) && (type != null && type.equalsIgnoreCase("reply"))) {
                         if (SetItem("guidemap") == 1) {
                         if (SetItem("guidemap") == 1) {
-                            if (isDistinguishYear_String!=null && isDistinguishYear_String.equalsIgnoreCase("year")) {
+                            if (isDistinguishYear_String != null && isDistinguishYear_String.equalsIgnoreCase("year")) {
                                 String distinguish = GetAttributeVal(0, "distinguish");
                                 String distinguish = GetAttributeVal(0, "distinguish");
-                                if (distinguish!=null && distinguish.equalsIgnoreCase(
-                                        "year")) {
+                                if (distinguish != null && distinguish.equalsIgnoreCase("year")) {
                                     if (SetItem("valuelist") > 0) {
                                     if (SetItem("valuelist") > 0) {
                                         Proc.ProcSuccess();
                                         Proc.ProcSuccess();
                                         return;
                                         return;
                                     }
                                     }
                                 }
                                 }
-                            } else if (isDistinguishYear_String!=null && isDistinguishYear_String.equalsIgnoreCase("month")) {
+                            } else if (isDistinguishYear_String != null && isDistinguishYear_String.equalsIgnoreCase("month")) {
                                 String distinguish = GetAttributeVal(0, "distinguish");
                                 String distinguish = GetAttributeVal(0, "distinguish");
-                                if (distinguish!=null && distinguish.equalsIgnoreCase(
-                                        "month")) {
+                                if (distinguish != null && distinguish.equalsIgnoreCase("month")) {
                                     if (SetItem("valuelist") > 0) {
                                     if (SetItem("valuelist") > 0) {
                                         Proc.ProcSuccess();
                                         Proc.ProcSuccess();
                                         return;
                                         return;
@@ -334,9 +305,8 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
                             }
                             }
                         }
                         }
                     }
                     }
-                    else if ((name!=null && name.equalsIgnoreCase("get_realtime_metering"))
-                            && (type!=null && type.equalsIgnoreCase("reply"))) {
-                        if (SetItem("photovoltaics") > 0 || SetItem("fuelcell")>0) {
+                    else if ((name != null && name.equalsIgnoreCase("get_realtime_metering")) && (type != null && type.equalsIgnoreCase("reply"))) {
+                        if (SetItem("photovoltaics") > 0 || SetItem("fuelcell") > 0) {
                             Proc.ProcSuccess();
                             Proc.ProcSuccess();
                             return;
                             return;
                         }
                         }
@@ -344,29 +314,28 @@ public class iMAPRemotemeter extends WallPadiMAPClient{
                 }
                 }
             } 
             } 
         }
         }
-        if(Proc!=null) Proc.ProcError();
 
 
+        if (Proc != null) Proc.ProcError();
     }
     }
+
     @Override
     @Override
-    protected void ProcError()
-    {
+    protected void ProcError() {
         Proc.ProcError();
         Proc.ProcError();
     }
     }
-    public void DoWork(boolean isDistinguishYear, boolean elect, boolean gas, boolean water, boolean hotwater, boolean energy, boolean carbon, boolean support_ems, int year, int month) 
-    {   
+
+    public void DoWork(boolean isDistinguishYear, boolean elect, boolean gas, boolean water, boolean hotwater, boolean energy, boolean carbon, boolean support_ems, int year, int month) {
         SetServerIPConfig(ServerIP, SvrPort);
         SetServerIPConfig(ServerIP, SvrPort);
         SendXMLDoc(GetXMLGetRemoteMeter(isDistinguishYear, elect, gas, water, hotwater, energy, carbon, support_ems, year, month), true);
         SendXMLDoc(GetXMLGetRemoteMeter(isDistinguishYear, elect, gas, water, hotwater, energy, carbon, support_ems, year, month), true);
     }
     }
 
 
-    public void DoWorkVIP(boolean isDistinguishYear, boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell, int year, int month)
-    {
+    public void DoWorkVIP(boolean isDistinguishYear, boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell, int year, int month) {
         SetServerIPConfig(ServerIP, SvrPort);
         SetServerIPConfig(ServerIP, SvrPort);
         SendXMLDoc(GetXMLGetRemoteMeterVIP(isDistinguishYear, kepco, eleccar1, eleccar2, photovoltaics, fuelcell, year, month), true);
         SendXMLDoc(GetXMLGetRemoteMeterVIP(isDistinguishYear, kepco, eleccar1, eleccar2, photovoltaics, fuelcell, year, month), true);
     }
     }
 
 
-    public void DoWDoWorkVIP_RealTime(boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell)
-    {
+    public void DoWDoWorkVIP_RealTime(boolean kepco, boolean eleccar1, boolean eleccar2, boolean photovoltaics, boolean fuelcell) {
         SetServerIPConfig(ServerIP, SvrPort);
         SetServerIPConfig(ServerIP, SvrPort);
         SendXMLDoc(GetXMLGetRemoteMeterVIP_RealTime(kepco, eleccar1, eleccar2, photovoltaics, fuelcell), true);
         SendXMLDoc(GetXMLGetRemoteMeterVIP_RealTime(kepco, eleccar1, eleccar2, photovoltaics, fuelcell), true);
     }
     }
+
 }
 }

+ 48 - 40
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPRemoteMeterMainScreen.java

@@ -172,7 +172,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
     int ShowNowTypeIndex = 0;
     int ShowNowTypeIndex = 0;
     String[] ShowListType_String = {
     String[] ShowListType_String = {
-            "월",
+            "월",
             "일별",
             "일별",
             "3개월",
             "3개월",
             "전년비",
             "전년비",
@@ -1647,9 +1647,11 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
             }
             }
             else {
             else {
                 //Quene 에 해야할일 삽입
                 //Quene 에 해야할일 삽입
-                TodoList.offer(CalendarYear - 1);
-                TodoList.offer(CalendarYear - 2);
-
+//                TodoList.offer(CalendarYear - 1);
+//                TodoList.offer(CalendarYear - 2);
+                Log.i(TAG, "[ShowYearEnergy] CalendarMonth [" + CalendarMonth + "]");
+                TodoList.offer(CalendarYear - 1);   //  전년도 정보 요청
+                if ((CalendarMonth + 1) < 3) TodoList.offer(CalendarYear - 2);   // 1~2월 인경우, 이전년도 정보가 필요함
                 //Get Data from Server
                 //Get Data from Server
                 getRMDataFromSVR(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
                 getRMDataFromSVR(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
             }
             }
@@ -1799,8 +1801,10 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                 mDrawBottomGraphValue3Month_Text = 3;
                 mDrawBottomGraphValue3Month_Text = 3;
             }
             }
             else {
             else {
-                TodoList.offer(CalendarYear - 1);
-                TodoList.offer(CalendarYear - 2);
+//                TodoList.offer(CalendarYear - 1);
+//                TodoList.offer(CalendarYear - 2);
+
+                if ((CalendarMonth + 1) < 3) TodoList.offer(CalendarYear - 1);   // 1~2월 인경우, 이전년도 정보가 필요함
                 //Get Data from Server
                 //Get Data from Server
                 getRMDataFromSVR(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
                 getRMDataFromSVR(ShowNowTypeIndex, CalendarYear, -1, ShowNowEnergyIndex);
             }
             }
@@ -2436,7 +2440,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                             if (nValueCnt != 0) {
                             if (nValueCnt != 0) {
                                 for (int i = 0; i < nValueCnt; i++) {
                                 for (int i = 0; i < nValueCnt; i++) {
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt [" + Integer.toString(nValueCnt) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt [" + Integer.toString(nValueCnt) + "]");
-                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(i, month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(" + i + ", month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
                                     if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1)) && (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
                                     if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1)) && (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
                                         result = true;
                                         result = true;
@@ -2450,14 +2454,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 0:
                                                 case 0:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "elect_used") != null) && (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "elect_used") != null) && (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "elect_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "elect_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "elect_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "elect_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "elect_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2475,14 +2479,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 1:
                                                 case 1:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "water_used") != null) && (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "water_used") != null) && (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "water_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "water_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "water_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "water_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "water_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2500,14 +2504,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 2:
                                                 case 2:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "gas_used") != null) && (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "gas_used") != null) && (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "gas_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "gas_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "gas_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "gas_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "gas_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2524,14 +2528,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 3:
                                                 case 3:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "hotwater_used") != null) && (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "hotwater_used") != null) && (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "hotwater_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "hotwater_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "hotwater_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "hotwater_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "hotwater_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2548,14 +2552,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 4:
                                                 case 4:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "energy_used") != null) && (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "energy_used") != null) && (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "energy_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "energy_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "energy_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "energy_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2572,14 +2576,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                                 case 5:
                                                 case 5:
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     monthTableClass[j] = new MonthTableClass("", "", "");
                                                     if ((imapRemotemeter.GetAttributeVal(i, "carbon_used") != null) && (imapRemotemeter.GetAttributeVal(i, "carbon_average_used_samesize") != null)) {
                                                     if ((imapRemotemeter.GetAttributeVal(i, "carbon_used") != null) && (imapRemotemeter.GetAttributeVal(i, "carbon_average_used_samesize") != null)) {
-                                                        if (imapRemotemeter.GetAttributeVal(i, "carbon_used").equals("1000000") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "carbon_used").equals("1000000")) {
                                                             TempString = "- / ";
                                                             TempString = "- / ";
                                                         }
                                                         }
                                                         else {
                                                         else {
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "carbon_used") + " / ";
                                                             TempString = imapRemotemeter.GetAttributeVal(i, "carbon_used") + " / ";
                                                         }
                                                         }
 
 
-                                                        if (imapRemotemeter.GetAttributeVal(i, "carbon_average_used_samesize").equals("null") == true) {
+                                                        if (imapRemotemeter.GetAttributeVal(i, "carbon_average_used_samesize").equals("null")) {
                                                             TempString = TempString + "-";
                                                             TempString = TempString + "-";
                                                         }
                                                         }
                                                         else {
                                                         else {
@@ -2631,33 +2635,37 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                             nValueCnt = imapRemotemeter.SetItem("valuelist");
                             nValueCnt = imapRemotemeter.SetItem("valuelist");
                             if (nValueCnt != 0) {
                             if (nValueCnt != 0) {
                                 for (int i = 0; i < nValueCnt; i++) {
                                 for (int i = 0; i < nValueCnt; i++) {
-                                    DebugLogOutput("NumberOfValuelist " + Integer.toString(nValueCnt));
-                                    DebugLogOutput("GetAttributeVal(i, month) " + imapRemotemeter.GetAttributeVal(i, "month"));
-                                    DebugLogOutput("CalendarMonth " + (CalendarMonth + 1));
-                                    if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1))
-                                            && (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt [" + Integer.toString(nValueCnt) + "]");
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(" + i + ", month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
+                                    if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1)) && (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
                                         result = true;
                                         result = true;
                                         //일단 kepco="yes" photovoltaics="yes" fuelcell="yes" eleccar="yes" 4개
                                         //일단 kepco="yes" photovoltaics="yes" fuelcell="yes" eleccar="yes" 4개
                                         int Temp_mNumberOfEnergy = 5;
                                         int Temp_mNumberOfEnergy = 5;
                                         for (int j = 0; j < Temp_mNumberOfEnergy; j++) {
                                         for (int j = 0; j < Temp_mNumberOfEnergy; j++) {
                                             monthTableClassRight[j] = new MonthTableClass("", "", "");
                                             monthTableClassRight[j] = new MonthTableClass("", "", "");
                                         }
                                         }
+
                                         if (imapRemotemeter.GetAttributeVal(i, "kepco_used") != null) {
                                         if (imapRemotemeter.GetAttributeVal(i, "kepco_used") != null) {
                                             TempString = imapRemotemeter.GetAttributeVal(i, "kepco_used");
                                             TempString = imapRemotemeter.GetAttributeVal(i, "kepco_used");
                                             monthTableClassRight[0].Use = TempString;
                                             monthTableClassRight[0].Use = TempString;
                                         }
                                         }
+
                                         if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
                                         if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
                                             TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
                                             TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
                                             monthTableClassRight[1].Use = TempString;
                                             monthTableClassRight[1].Use = TempString;
                                         }
                                         }
+
                                         if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
                                         if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
                                             TempString = imapRemotemeter.GetAttributeVal(i, "photovoltaics_used");
                                             TempString = imapRemotemeter.GetAttributeVal(i, "photovoltaics_used");
                                             monthTableClassRight[2].Use = TempString;
                                             monthTableClassRight[2].Use = TempString;
                                         }
                                         }
+
                                         if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used") != null) {
                                         if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used") != null) {
                                             TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
                                             TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
                                             monthTableClassRight[3].Use = TempString;
                                             monthTableClassRight[3].Use = TempString;
                                         }
                                         }
+
                                         if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
                                         if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
                                             TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
                                             TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
                                             monthTableClassRight[4].Use = TempString;
                                             monthTableClassRight[4].Use = TempString;
@@ -2665,7 +2673,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                     }
                                     }
                                 }
                                 }
 
 
-                                if (result == true) {
+                                if (result) {
                                     //사용량, 생산량 같이 표현
                                     //사용량, 생산량 같이 표현
                                     ShowMonthEnergyDataRight(90);
                                     ShowMonthEnergyDataRight(90);
                                     ShowMonthEnergyDataCenter(90, 90);
                                     ShowMonthEnergyDataCenter(90, 90);
@@ -2678,49 +2686,49 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                             if (nValueCnt1 != 0) {
                             if (nValueCnt1 != 0) {
                                 for (int i = 0; i < nValueCnt1; i++) {
                                 for (int i = 0; i < nValueCnt1; i++) {
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt1 [" + Integer.toString(nValueCnt1) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt1 [" + Integer.toString(nValueCnt1) + "]");
-                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(i, month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(" + i + ", month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
                                     if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1)) && (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "year")) == (CalendarYear))) {
                                     if ((Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "month")) == (CalendarMonth + 1)) && (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: // 전기차1
                                             case 0: // 전기차1
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar1_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
 
 
                                             case 1: // 전기차2
                                             case 1: // 전기차2
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar2_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
 
 
                                             case 2: // 태양광
                                             case 2: // 태양광
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "photovoltaics_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "photovoltaics_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
 
 
                                             case 3: // 연료전지
                                             case 3: // 연료전지
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "fuelcell_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
 
 
                                             case 4: // 전기차
                                             case 4: // 전기차
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
 
 
                                             case 5: // 전기차
                                             case 5: // 전기차
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
                                                 TempString = imapRemotemeter.GetAttributeVal(i, "eleccar_used");
-                                                if (TempString.equals("1000000") == false) {
+                                                if (!TempString.equals("1000000")) {
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                     CalendarItemShow(mCalendarItemIndex, (Integer.parseInt(imapRemotemeter.GetAttributeVal(i, "day"))), imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                 }
                                                 }
                                                 break;
                                                 break;
@@ -2736,7 +2744,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                             if (nValueCnt2 != 0) {
                             if (nValueCnt2 != 0) {
                                 for (int i = 0; i < nValueCnt2; i++) {
                                 for (int i = 0; i < nValueCnt2; i++) {
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt2 [" + Integer.toString(nValueCnt2) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] nValueCnt2 [" + Integer.toString(nValueCnt2) + "]");
-                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(i, month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
+                                    DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] GetAttributeVal(" + i + ", month) [" + imapRemotemeter.GetAttributeVal(i, "month") + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
                                     DebugLogOutput("[getRMDataFromSVR.ProcSuccess()] CalendarMonth [" + (CalendarMonth + 1) + "]");
 
 
                                     float Temp_Myhome = 0;
                                     float Temp_Myhome = 0;
@@ -2745,7 +2753,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                     switch (ShowNowEnergyIndex) {
                                     switch (ShowNowEnergyIndex) {
                                         case 0: // 전기차1
                                         case 0: // 전기차1
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "eleccar1_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "eleccar1_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar1_used"));
                                                 }
                                                 }
                                             }
                                             }
@@ -2756,7 +2764,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
                                         case 1: // 전기차2
                                         case 1: // 전기차2
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "eleccar2_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "eleccar2_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar2_used"));
                                                 }
                                                 }
                                             }
                                             }
@@ -2767,7 +2775,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
                                         case 2: // 태양광
                                         case 2: // 태양광
                                             if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "photovoltaics_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "photovoltaics_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "photovoltaics_used"));
                                                 }
                                                 }
                                             }
                                             }
@@ -2778,7 +2786,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
                                         case 3: // 연료전지
                                         case 3: // 연료전지
                                             if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "fuelcell_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "fuelcell_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "fuelcell_used"));
                                                 }
                                                 }
                                             }
                                             }
@@ -2789,12 +2797,12 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
                                         case 4: // 난방
                                         case 4: // 난방
                                             if (imapRemotemeter.GetAttributeVal(i, "energy_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "energy_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "energy_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "energy_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "energy_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "energy_used"));
                                                 }
                                                 }
                                             }
                                             }
                                             if (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize").equals("null") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize").equals("null")) {
                                                     Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize"));
                                                     Temp_SameSize = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "energy_average_used_samesize"));
                                                 }
                                                 }
                                             }
                                             }
@@ -2807,7 +2815,7 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
                                         case 5: // 전기차
                                         case 5: // 전기차
                                             //전기차는 동평형이 없다. 다른 에너지도 없는지 확인이 필요함.
                                             //전기차는 동평형이 없다. 다른 에너지도 없는지 확인이 필요함.
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar_used") != null) {
                                             if (imapRemotemeter.GetAttributeVal(i, "eleccar_used") != null) {
-                                                if (imapRemotemeter.GetAttributeVal(i, "eleccar_used").equals("1000000") == false) {
+                                                if (!imapRemotemeter.GetAttributeVal(i, "eleccar_used").equals("1000000")) {
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                     Temp_Myhome = Float.parseFloat(imapRemotemeter.GetAttributeVal(i, "eleccar_used"));
                                                 }
                                                 }
                                             }
                                             }