Parcourir la source

[WallPadEnergyCtrl]
1. App Ver. 갱신
- 2022.08.18.01
2. 월별 에너지 사용량 기준일자 안내문구 추가
- 전기 에너지 현황 화면: 화면 상단에 안내문구 추가 (검침 기준일: 전월 12일 ~ 당월 11일)
- 에너지 생산량: 우측 바형 그래프 배경 이미지 교체 (문구 추가: 전월 12일 ~ 당월 11일)

Jeffrey Nam il y a 2 ans
Parent
commit
409229ae53

+ 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.05.23.07">
+    android:versionName="2022.08.18.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" />

+ 13 - 11
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/MainActivity.java

@@ -89,7 +89,7 @@ public class MainActivity extends WpadActivity {
 
 
     // Top Menu
     // Top Menu
     private WpadImageView TopBackground;
     private WpadImageView TopBackground;
-    private WpadTextView TopTitle;
+    private WpadTextView TopTitle, TOP_METERCHECKDATE;
     private WpadImageView TopHomeBtn,TopBackBtn, TopMenuBtn, TopSetTargetBtn;
     private WpadImageView TopHomeBtn,TopBackBtn, TopMenuBtn, TopSetTargetBtn;
     private WpadImageView Hide1Btn, Hide2Btn;
     private WpadImageView Hide1Btn, Hide2Btn;
     private TextButton    EnergyResetBtn;
     private TextButton    EnergyResetBtn;
@@ -326,6 +326,10 @@ public class MainActivity extends WpadActivity {
         TopTitle = new WpadTextView(this, false, 247+100, 80, Gravity.LEFT, Color.WHITE, Common.fontsize._44, true, ID.main.text.TITLE);
         TopTitle = new WpadTextView(this, false, 247+100, 80, Gravity.LEFT, Color.WHITE, Common.fontsize._44, true, ID.main.text.TITLE);
         ViewRegistration(TopLayout, TopTitle, 133, 15);
         ViewRegistration(TopLayout, TopTitle, 133, 15);
 
 
+        TOP_METERCHECKDATE = new WpadTextView(this, false, 320, 70, Gravity.BOTTOM, Color.LTGRAY, Common.fontsize._22, true, ID.main.text.SUB_TITLE);
+        ViewRegistration(TopLayout, TOP_METERCHECKDATE, 480, 15);
+        TOP_METERCHECKDATE.setText("검침 기준일: 전월 12일 ~ 당월 11일");
+
         TopHomeBtn = new WpadImageView(this, TOUCH_KIND.BUTTON, 110, 110, R.drawable.topbar_icon_home_normal, R.drawable.topbar_icon_home_pressed, ID.main.button.HOME);
         TopHomeBtn = new WpadImageView(this, TOUCH_KIND.BUTTON, 110, 110, R.drawable.topbar_icon_home_normal, R.drawable.topbar_icon_home_pressed, ID.main.button.HOME);
         ViewRegistration(TopLayout, TopHomeBtn, 1145, 0);
         ViewRegistration(TopLayout, TopHomeBtn, 1145, 0);
 
 
@@ -1190,10 +1194,11 @@ public class MainActivity extends WpadActivity {
      * 상단 타이틀 텍스트 수정
      * 상단 타이틀 텍스트 수정
      * @param SetText 수정할 타이틀 이름
      * @param SetText 수정할 타이틀 이름
      * **/
      * **/
-    private void SetTitleText(String SetText)
-    {
-        if(SetText != null)
-        {
+    private void SetTitleText(String SetText) {
+        if (SetText != null) {
+            if (SetText.equals(API_Menu.SubMenuEnergy.Name_RemoteMeter)) TOP_METERCHECKDATE.setVisibility(View.VISIBLE);
+            else TOP_METERCHECKDATE.setVisibility(View.INVISIBLE);
+
             TopTitle.setText(SetText);
             TopTitle.setText(SetText);
         }
         }
     }
     }
@@ -1204,16 +1209,13 @@ public class MainActivity extends WpadActivity {
     /**
     /**
      * 메뉴 레이아웃 생성
      * 메뉴 레이아웃 생성
      * **/
      * **/
-    private void OpenMenuLayout()
-    {
-        if(MenuOpen == true)
-        {
+    private void OpenMenuLayout() {
+        if (MenuOpen == true) {
 			Log.d(TAG, "MenuOpen == true");
 			Log.d(TAG, "MenuOpen == true");
             return;
             return;
         }
         }
 
 
-        if(menueListDataClass == null)
-        {
+        if (menueListDataClass == null) {
 			Log.d(TAG, "menueListDataClass = null");
 			Log.d(TAG, "menueListDataClass = null");
             return;
             return;
         }
         }

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

@@ -92,6 +92,7 @@ public final class ID
 		public static final class text
 		public static final class text
 		{
 		{
 			public final static int TITLE      = BASE + 300;
 			public final static int TITLE      = BASE + 300;
+			public final static int SUB_TITLE      = BASE + 301;
 		}
 		}
 		public static final class liveview
 		public static final class liveview
 		{
 		{

+ 1 - 4
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPIcEnergyMgrScreen.java

@@ -409,10 +409,9 @@ public class VIPIcEnergyMgrScreen extends WpadScreen {
             Btn_Fuel = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 160, 74, R.drawable.btn_3_fuel_cell_normal, R.drawable.btn_3_fuel_cell_pressed, ID.IcEnergyMgrID.button.FUEL);
             Btn_Fuel = new WpadImageView(getContext(), TOUCH_KIND.BUTTON, 160, 74, R.drawable.btn_3_fuel_cell_normal, R.drawable.btn_3_fuel_cell_pressed, ID.IcEnergyMgrID.button.FUEL);
             ViewRegistration(getLayout(), Btn_Fuel, getPos.Get(R.drawable.btn_3_fuel_cell_normal).x, getPos.Get(R.drawable.btn_3_fuel_cell_normal).y);
             ViewRegistration(getLayout(), Btn_Fuel, getPos.Get(R.drawable.btn_3_fuel_cell_normal).x, getPos.Get(R.drawable.btn_3_fuel_cell_normal).y);
 
 
-            Background_04 = new WpadImageView(context, TOUCH_KIND.NONE, 499, 576, R.drawable.vip_box_3_2, 0, ID.IcEnergyMgrID.image.BACKGROUND);
+            Background_04 = new WpadImageView(context, TOUCH_KIND.NONE, 499, 576, R.drawable.vip_box_3_2_metercheckdate, 0, ID.IcEnergyMgrID.image.BACKGROUND);
             ViewRegistration(layout, Background_04, Common.ImgPosion.GetX(731), Common.ImgPosion.GetY(135));
             ViewRegistration(layout, Background_04, Common.ImgPosion.GetX(731), Common.ImgPosion.GetY(135));
 
 
-
             Kepco_HomeUse = new WpadTextView(context, false, 50, 20, Gravity.LEFT, Color.parseColor("#ffffff"), ContentsFontSize, false, ID.IcEnergyMgrID.text_energy_num_3.ELECTRIC_HOMEUSE);
             Kepco_HomeUse = new WpadTextView(context, false, 50, 20, Gravity.LEFT, Color.parseColor("#ffffff"), ContentsFontSize, false, ID.IcEnergyMgrID.text_energy_num_3.ELECTRIC_HOMEUSE);
             ViewRegistration(layout, Kepco_HomeUse, Common.ImgPosion.GetX(1166), Common.ImgPosion.GetY(343));
             ViewRegistration(layout, Kepco_HomeUse, Common.ImgPosion.GetX(1166), Common.ImgPosion.GetY(343));
             Kepco_HomeUse.setVisibility(View.GONE);
             Kepco_HomeUse.setVisibility(View.GONE);
@@ -422,8 +421,6 @@ public class VIPIcEnergyMgrScreen extends WpadScreen {
 
 
             Fuel_HomeUse = new WpadTextView(context, false, 50, 20, Gravity.LEFT, Color.parseColor("#ffffff"), ContentsFontSize, false, ID.IcEnergyMgrID.text_energy_num_3.GAS_HOMEUSE);
             Fuel_HomeUse = new WpadTextView(context, false, 50, 20, Gravity.LEFT, Color.parseColor("#ffffff"), ContentsFontSize, false, ID.IcEnergyMgrID.text_energy_num_3.GAS_HOMEUSE);
             ViewRegistration(layout, Fuel_HomeUse, Common.ImgPosion.GetX(1166), Common.ImgPosion.GetY(515));
             ViewRegistration(layout, Fuel_HomeUse, Common.ImgPosion.GetX(1166), Common.ImgPosion.GetY(515));
-
-
         }
         }
 
 
         if (RealtimeMeterUse == false) {
         if (RealtimeMeterUse == false) {

+ 4 - 9
WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPRemoteMeterMainScreen.java

@@ -374,28 +374,23 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
 
 
         //달력 년도 월 표시
         //달력 년도 월 표시
         mYearMonth = new WpadTextView(getContext(), false, 286, 54, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
         mYearMonth = new WpadTextView(getContext(), false, 286, 54, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
-        ViewRegistration(getLayout(), mYearMonth,
-                Common.ImgPosion.GetX(497),
-                Common.ImgPosion.GetY(132));
+        ViewRegistration(getLayout(), mYearMonth, Common.ImgPosion.GetX(497), Common.ImgPosion.GetY(132));
         mYearMonth.setText(CalendarYear + "년 " + (CalendarMonth + 1) + "월");
         mYearMonth.setText(CalendarYear + "년 " + (CalendarMonth + 1) + "월");
 
 
         //버튼
         //버튼
         MonthMinus = new WpadImageView(context, TOUCH_KIND.BUTTON, 80, 54, R.drawable.but_arrow_left, R.drawable.but_arrow_left_p, ID.RemoteMeterMainScreenID.button.MONTH_MINUS);
         MonthMinus = new WpadImageView(context, TOUCH_KIND.BUTTON, 80, 54, R.drawable.but_arrow_left, R.drawable.but_arrow_left_p, ID.RemoteMeterMainScreenID.button.MONTH_MINUS);
-        MonthMinus.setTouchDelayMs(Common.BTN_DELAY_NETWORK_REQ);
         ViewRegistration(layout, MonthMinus, Common.ImgPosion.GetX(417), Common.ImgPosion.GetY(132));
         ViewRegistration(layout, MonthMinus, Common.ImgPosion.GetX(417), Common.ImgPosion.GetY(132));
+        MonthMinus.setTouchDelayMs(Common.BTN_DELAY_NETWORK_REQ);
 
 
         MonthPlus = new WpadImageView(context, TOUCH_KIND.BUTTON, 80, 54, R.drawable.but_arrow_right, R.drawable.but_arrow_right_p, ID.RemoteMeterMainScreenID.button.MONTH_PLUS);
         MonthPlus = new WpadImageView(context, TOUCH_KIND.BUTTON, 80, 54, R.drawable.but_arrow_right, R.drawable.but_arrow_right_p, ID.RemoteMeterMainScreenID.button.MONTH_PLUS);
-        MonthPlus.setTouchDelayMs(Common.BTN_DELAY_NETWORK_REQ);
         ViewRegistration(layout, MonthPlus, Common.ImgPosion.GetX(783), Common.ImgPosion.GetY(132));
         ViewRegistration(layout, MonthPlus, Common.ImgPosion.GetX(783), Common.ImgPosion.GetY(132));
-
+        MonthPlus.setTouchDelayMs(Common.BTN_DELAY_NETWORK_REQ);
 
 
         mShowListType = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 54, R.drawable.but_title, R.drawable.but_title_p, ID.RemoteMeterMainScreenID.button.SHOW_TYPE);
         mShowListType = new WpadImageView(context, TOUCH_KIND.BUTTON, 230, 54, R.drawable.but_title, R.drawable.but_title_p, ID.RemoteMeterMainScreenID.button.SHOW_TYPE);
         ViewRegistration(layout, mShowListType, Common.ImgPosion.GetX(957), Common.ImgPosion.GetY(132));
         ViewRegistration(layout, mShowListType, Common.ImgPosion.GetX(957), Common.ImgPosion.GetY(132));
 
 
         mShowListTypeText = new WpadTextView(context, false, 230, 54, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
         mShowListTypeText = new WpadTextView(context, false, 230, 54, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
-        ViewRegistration(layout, mShowListTypeText,
-                Common.ImgPosion.GetX(957),
-                Common.ImgPosion.GetY(132));
+        ViewRegistration(layout, mShowListTypeText, Common.ImgPosion.GetX(957), Common.ImgPosion.GetY(132));
 
 
         //EMS 적용 시 - 당월 표 출력
         //EMS 적용 시 - 당월 표 출력
         if (mEMS_Enable == true) {
         if (mEMS_Enable == true) {

BIN
WallPadEnergyCtrl/src/main/res/drawable-ldpi/vip_box_3_2_metercheckdate.png