Prechádzať zdrojové kódy

전기 에너지 현황 수정. 네트워크 스위치 인덱스 범위 수정. 에너지 생산량 배경 겹치는 문제 수정. 쿡탑 화면 갱신 수정. 알림 막기 수정.

jslee(madeinlab) 3 rokov pred
rodič
commit
1a8c4a9d23

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

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

+ 9 - 6
WallPadAddService/src/main/java/kr/co/icontrols/wallpadaddservice/screen/VIPElecCarMainScreen.java

@@ -425,19 +425,22 @@ public class VIPElecCarMainScreen extends WpadScreen {
 
         TXT_ChargerStatus[0] = new WpadTextView(getContext(), false, 547, 46, Gravity.CENTER, Color.WHITE, Common.fontsize._36, true, ElecCarMainScreenID.text.CHARGER1_STATUS);
         ViewRegistration(getLayout(), TXT_ChargerStatus[0], Common.ImgPosition.GetX(93), Common.ImgPosition.GetY(575));
-        TXT_ChargerStatus[0].setText("정보없음");
+        TXT_ChargerStatus[0].setText("충전 대기");
 
         TXT_ChargerStatus[1] = new WpadTextView(getContext(), false, 547, 46, Gravity.CENTER, Color.WHITE, Common.fontsize._36, true, ElecCarMainScreenID.text.CHARGER2_STATUS);
         ViewRegistration(getLayout(), TXT_ChargerStatus[1], Common.ImgPosition.GetX(640), Common.ImgPosition.GetY(575));
-        TXT_ChargerStatus[1].setText("정보없음");
+        TXT_ChargerStatus[1].setText("충전 대기");
 
         TXT_ChargingInfo[0] = new WpadTextView(getContext(), false, 547, 46, Gravity.CENTER, Color.WHITE, Common.fontsize._30, false, ElecCarMainScreenID.text.CHARGER1_INFO);
         ViewRegistration(getLayout(), TXT_ChargingInfo[0], Common.ImgPosition.GetX(93), Common.ImgPosition.GetY(624));
         TXT_ChargingInfo[0].setText("");
+        TXT_ChargingInfo[0].setVisibility(View.GONE);
 
         TXT_ChargingInfo[1] = new WpadTextView(getContext(), false, 547, 46, Gravity.CENTER, Color.WHITE, Common.fontsize._30, false, ElecCarMainScreenID.text.CHARGER2_INFO);
         ViewRegistration(getLayout(), TXT_ChargingInfo[1], Common.ImgPosition.GetX(640), Common.ImgPosition.GetY(624));
         TXT_ChargingInfo[1].setText("");
+        TXT_ChargingInfo[1].setVisibility(View.GONE);
+
 
 
         //변수 초기화
@@ -526,8 +529,8 @@ public class VIPElecCarMainScreen extends WpadScreen {
         try {
             if (Car_Charging_Info == null) return;
             if (Car_Charging_Info.arraylist.size() == 0) {
-                TXT_ChargerStatus[0].setText("정보없음");
-                TXT_ChargerStatus[1].setText("정보없음");
+                TXT_ChargerStatus[0].setText("충전 대기");
+                TXT_ChargerStatus[1].setText("충전 대기");
                 TXT_ChargingInfo[0].setText("");
                 TXT_ChargingInfo[1].setText("");
                 return;
@@ -570,8 +573,8 @@ public class VIPElecCarMainScreen extends WpadScreen {
             Log.e(TAG, "[Exception] MakeContentPage1_Image");
             //e.printStackTrace();
             LogUtil.errorLogInfo("", TAG, e);
-            TXT_ChargerStatus[0].setText("정보없음");
-            TXT_ChargerStatus[1].setText("정보없음");
+            TXT_ChargerStatus[0].setText("충전 대기");
+            TXT_ChargerStatus[1].setText("충전 대기");
             TXT_ChargingInfo[0].setText("");
             TXT_ChargingInfo[1].setText("");
         }

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.deviceservice"
     android:versionCode="1"
-    android:versionName="2022.04.11.03">
+    android:versionName="2022.04.11.04">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

+ 1 - 1
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/KNX_Controller.java

@@ -681,7 +681,7 @@ public class KNX_Controller extends DeviceManager {
              */
             public LightSwithcClass.Light_SwitchClass.InfoClass GetLightSwitchInfo(byte EmIndex, byte LightIndex) {
                 // 1. Param Check
-                if (!CheckEmIndex(EmIndex)) {
+                if (!CheckLightSwitchIndex(EmIndex)) {
                     Log.w(TAG, "[GetLightSwitchInfo] Param : EmIndex - Out Of Range !!! (EmIndex:" + EmIndex + ")");
                     return null;
                 }

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

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

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

@@ -198,6 +198,9 @@ public final class ID
 			public final static int BG_MONTHTABLE_VIP_ENERGY1     = BASE + 116; //vip 사용량 1
 			public final static int BG_MONTHTABLE_VIP_ENERGY2     = BASE + 117; //vip 사용량 2
 			public final static int BG_MONTHTABLE_VIP_ENERGY3     = BASE + 117; //vip 생산량
+
+			public final static int BG_3MONTH_GRAPH               = BASE + 118;
+
 		}
 		public static final class button
 		{

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

@@ -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) {

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

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

+ 17 - 5
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -1221,6 +1221,7 @@ public class MainActivity extends WpadActivity {
 							StartMultiControl(ID.screen.HeatingV2TestScreen, index+1);
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Gas) {
 							MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
+							MultiBtn[1].setButtonEventOffEnable(R.drawable.tab_floor_2_selected);
 							MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
 							//다른층은 2층으로 연동시킨다.
 							StartMultiControl(ID.screen.GasTestScreen, 2);
@@ -1695,14 +1696,24 @@ public class MainActivity extends WpadActivity {
 						else if(wpapi.GetGasKind() == 2)
 						{
 							SetTitleText(API_Menu.SubMenuCtrl.Name_Gas);
-							hybridCookTopMainScreen = new HybridCookTopMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
-							super.setCurrentScreen(hybridCookTopMainScreen);
+							if(ho==2) {
+								hybridCookTopMainScreen = new HybridCookTopMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
+								super.setCurrentScreen(hybridCookTopMainScreen);
+							}else {
+								StartMultiControl(ID.screen.GasTestScreen, 2);
+							}
 						}
 						else
 						{
 							SetTitleText(API_Menu.SubMenuCtrl.Name_Gas);
-							gasMainScreen = new GasMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
-							super.setCurrentScreen(gasMainScreen);
+							if(ho==2) {
+								hybridCookTopMainScreen = new HybridCookTopMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
+								super.setCurrentScreen(hybridCookTopMainScreen);
+							}else {
+								StartMultiControl(ID.screen.GasTestScreen, 2);
+							}
+							//gasMainScreen = new GasMainScreen(this, ScreenLayout, wpapi, OPERATION_MODE);
+							//super.setCurrentScreen(gasMainScreen);
 						}
 					}
 					catch (Exception e)
@@ -3145,8 +3156,9 @@ public class MainActivity extends WpadActivity {
 					MultiBtn[i].setVisibility(View.INVISIBLE);
 			}
 		}
-		MultiBtn[1].setButtonRearImage();
+		//MultiBtn[1].setButtonRearImage();
 		MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
+		MultiBtn[1].setButtonEventOffEnable(R.drawable.tab_floor_2_selected);
 		MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
 	}
 

+ 2 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HybridCookTopTestScreen.java

@@ -568,7 +568,7 @@ public class HybridCookTopTestScreen extends WpadScreen {
                     updateData();
                 }
             };
-            timer.schedule(TT, delay, 25000); //Timer 실행
+            timer.schedule(TT, delay, 2500); //Timer 실행
         }catch (Exception e){}
     }
 
@@ -835,7 +835,7 @@ public class HybridCookTopTestScreen extends WpadScreen {
                 roomView[i] = new HybridCookTopTestScreen.RoomView(left, top, i, isGas);
                 if(isGas)
                 {
-                    astrRoomTitle[i] ="가스브";
+                    astrRoomTitle[i] ="가스브";
                 }
                 else
                 {

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

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

+ 4 - 0
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/MAIN.java

@@ -1093,6 +1093,8 @@ public class MAIN extends WpadScreen {
                 nNotiIndex++;
             }
 
+            /* 아래 알림은 다 막는다
+
             if (bEventNoti&& !getIsSubWallpad()) {
                 mNOTIFICATION[nNotiIndex].BTN_NOTI.setImageChange(R.drawable.btn_icon_notification_event_normal, R.drawable.btn_icon_notification_event_pressed);
                 mNOTIFICATION[nNotiIndex].BTN_NOTI.setVisibility(View.VISIBLE);
@@ -1114,6 +1116,8 @@ public class MAIN extends WpadScreen {
                 nNotiIndex++;
             }
 
+             */
+
         } catch (RuntimeException re) {
             LogUtil.errorLogInfo("", TAG, re);
         }