소스 검색

버젼명 변경, 전기에너지 프로토콜 변경 에러 수정, 가스 2층만 되도록 수정, 제어 최대 개수 변경에 따른 index array 추가.

jslee(madeinlab) 3 년 전
부모
커밋
5789cc8bca
31개의 변경된 파일68개의 추가작업 그리고 30개의 파일을 삭제
  1. 1 1
      AutoPicture/src/main/AndroidManifest.xml
  2. 1 1
      LogOutputService/src/main/AndroidManifest.xml
  3. BIN
      ManagerSetting/libs/WallPadAPI.jar
  4. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  5. BIN
      WallPadAPI/jar/WallPadAPI.jar
  6. 1 1
      WallPadAddService/src/main/AndroidManifest.xml
  7. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  8. 1 1
      WallPadConfig/src/main/AndroidManifest.xml
  9. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  10. 1 1
      WallPadEmergency/src/main/AndroidManifest.xml
  11. 1 1
      WallPadEnergyCtrl/src/main/AndroidManifest.xml
  12. 2 2
      WallPadEnergyCtrl/src/main/java/kr/co/icontrols/wallpadenergyctrl/screen/VIPRemoteMeterMainScreen.java
  13. 1 1
      WallPadGlobalButton/src/main/AndroidManifest.xml
  14. 1 1
      WallPadGlobalScreen/src/main/AndroidManifest.xml
  15. 1 1
      WallPadHomeCtrl/src/main/AndroidManifest.xml
  16. 37 3
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java
  17. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_gas/HybridCookTopMainScreen.java
  18. 2 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java
  19. 2 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java
  20. 1 0
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/HybridCookTopTestScreen.java
  21. 3 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxMainTestScreen.java
  22. 3 2
      WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_multi/LightKnxPopupTestScreen.java
  23. BIN
      WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_1_disabled.png
  24. BIN
      WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_2_disabled.png
  25. BIN
      WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_3_disabled.png
  26. 1 1
      WallPadKeyBoard/src/main/AndroidManifest.xml
  27. BIN
      WallPadMain/libs/WallPadAPI.jar
  28. 1 1
      WallPadMain/src/main/AndroidManifest.xml
  29. 1 1
      WallPadMultiControlService/src/main/AndroidManifest.xml
  30. 1 1
      WallPadOutmodeRun/src/main/AndroidManifest.xml
  31. 1 1
      WallPadSecurity/src/main/AndroidManifest.xml

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

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

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.apps.ic_wallpad.service.log"
     android:versionCode="24"
-    android:versionName="2021.07.27.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
ManagerSetting/libs/WallPadAPI.jar


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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2022.01.24.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadAPI/jar/WallPadAPI.jar


+ 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.01.25.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2022.02.16.01">
+    android:versionName="2022.04.11.02">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

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

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

+ 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.01.20.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

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

+ 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.08.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

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

@@ -1487,14 +1487,14 @@ public class VIPRemoteMeterMainScreen extends WpadScreen {
             Show_MonthTable_Item_Use_Text_RIGHT[0].setText(eleccar1MonthItem);
 
         Show_MonthTable_Item_Use_Text_RIGHT[1] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
-        ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[0],
+        ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[1],
                 Common.ImgPosion.GetX(312),
                 Common.ImgPosion.GetY(293 + (1 * Margin_y) + TempMargin_y_ForEnergyNum2));
         if (Show_MonthTable_Item_Use_Text_RIGHT[1] != null)
             Show_MonthTable_Item_Use_Text_RIGHT[1].setText(eleccar2MonthItem);
 
         Show_MonthTable_Item_Use_Text_RIGHT[2] = new WpadTextView(getContext(), false, 295, 90, Gravity.CENTER, Color.WHITE, Common.fontsize._26_DEFAULT, false, ID.RemoteMeterMainScreenID.text.TEXT_INFO);
-        ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[0],
+        ViewRegistration(getLayout(), Show_MonthTable_Item_Use_Text_RIGHT[2],
                 Common.ImgPosion.GetX(312),
                 Common.ImgPosion.GetY(293 + (2 * Margin_y) + TempMargin_y_ForEnergyNum2));
         if (Show_MonthTable_Item_Use_Text_RIGHT[2] != null)

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

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

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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadglobalscreen"
     android:versionCode="17"
-    android:versionName="2021.07.27.01">
+    android:versionName="2022.04.11.02">
 
     <uses-feature android:name="android.hardware.camera" />
 

+ 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.06.01">
+    android:versionName="2022.04.11.02">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

+ 37 - 3
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/MainActivity.java

@@ -1188,6 +1188,7 @@ public class MainActivity extends WpadActivity {
 					int index = TargetId - ID.main.button.MULTI1;
 					for(int i = 0; i< MultiBtn.length; i++){
 						MultiBtn[i].setButtonFrontImage();
+						MultiBtn[i].setButtonEventOffDisable();
 					}
 					MultiBtn[index].setButtonRearImage();
 
@@ -1198,7 +1199,13 @@ public class MainActivity extends WpadActivity {
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V2 || mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V1) {
 							setChangeScreen(API_Menu.SubMenuCtrl.Heating_V2, false);
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Gas) {
-							setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
+							if(ho==2){
+								setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
+							}else{
+								StartMultiControl(ID.screen.GasTestScreen, 2);
+							}
+							//setChangeScreen(API_Menu.SubMenuCtrl.Gas, false);
+
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
 							setChangeScreen(API_Menu.SubMenuCtrl.SystemAircon, false);
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.ChangAir_Normal) {
@@ -1213,7 +1220,10 @@ public class MainActivity extends WpadActivity {
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V2 || mCurrentScreenId == API_Menu.SubMenuCtrl.Heating_V1) {
 							StartMultiControl(ID.screen.HeatingV2TestScreen, index+1);
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.Gas) {
-							StartMultiControl(ID.screen.GasTestScreen, index+1);
+							MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
+							MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
+							//다른층은 2층으로 연동시킨다.
+							StartMultiControl(ID.screen.GasTestScreen, 2);
 						} else if (mCurrentScreenId == API_Menu.SubMenuCtrl.SystemAircon) {
 							StartMultiControl(ID.screen.KnxSystemAirconMainTestScreen, index+1);
 							//StartMultiControl(ID.screen.SystemAirconTest1Screen, index+1);
@@ -1710,7 +1720,7 @@ public class MainActivity extends WpadActivity {
 					setAIRBackBtnVisible(false);
 					setKccDimmBtnVisible(false);
 					setVentilBackBtnVisible(false);
-					setMultiBtnVisible(true);
+					setGasMultiBtnVisible(true);
 					result = true;
 					break;
 
@@ -3102,6 +3112,7 @@ public class MainActivity extends WpadActivity {
 					MultiBtn[i].setVisibility(View.VISIBLE);
 				MultiBtn[i].bringToFront();
 				MultiBtn[i].setButtonFrontImage();
+				MultiBtn[i].setButtonEventOffDisable();
 			} else {
 				if (MultiBtn[i].getVisibility() != View.INVISIBLE)
 					MultiBtn[i].setVisibility(View.INVISIBLE);
@@ -3116,6 +3127,29 @@ public class MainActivity extends WpadActivity {
 		}
 	}
 
+	/**
+	 * 멀티 가스 제어 층 버튼 활성화 & 비활성화
+	 *
+	 * @param Enabled - true : 활성화,  false : 비활성화
+	 * @return (boolean) true : 성공,  false : 실패
+	 */
+	public void setGasMultiBtnVisible(boolean Enabled) {
+		for (int i = 0; i < MultiBtn.length; i++) {
+			if (Enabled == true) {
+				if (MultiBtn[i].getVisibility() != View.VISIBLE)
+					MultiBtn[i].setVisibility(View.VISIBLE);
+				MultiBtn[i].bringToFront();
+				MultiBtn[i].setButtonFrontImage();
+			} else {
+				if (MultiBtn[i].getVisibility() != View.INVISIBLE)
+					MultiBtn[i].setVisibility(View.INVISIBLE);
+			}
+		}
+		MultiBtn[1].setButtonRearImage();
+		MultiBtn[0].setButtonEventOffEnable(R.drawable.tab_floor_1_disabled);
+		MultiBtn[2].setButtonEventOffEnable(R.drawable.tab_floor_3_disabled);
+	}
+
 	/**
 	 * 상단 KCC디밍조절 버튼 활성화 & 비활성화
 	 *

+ 1 - 0
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_gas/HybridCookTopMainScreen.java

@@ -355,6 +355,7 @@ public class HybridCookTopMainScreen extends WpadScreen {
                 AlarmText = new WpadTextView(getContext(), false, 1280, 110, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, 0);
                 ViewRegistration(getLayout(), AlarmText, 0, Common.ImgPosion.GetY(375));
                 AlarmText.setText("쿡탑제어기가 연결이 되어 있지 않습니다.");
+                AlarmText.setVisibility(View.GONE);
             }
         }
         else {

+ 2 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxMainScreen.java

@@ -180,11 +180,11 @@ public class LightKnxMainScreen extends WpadScreen {
     private static final int EM_TYPE = 0;
     private static final int SWITCH_TYPE = 1;
 
-    private final int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
+    private final int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
     //private final int[] ROOM_POS = {10,11,12,13,14,15,16,7,8,9,0,1,2,3,4,5,6,17,18,19,20};
 
     private String[] mKNXDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실", "드레스룸3", "추가룸1", "추가룸2", "추가룸3", "추가룸4", "추가룸5"};
+            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실", "드레스룸3", "추가룸1", "추가룸2", "추가룸3", "추가룸4", "추가룸5", "추가룸6", "추가룸7"};
 
     // [Class]
 

+ 2 - 2
WallPadHomeCtrl/src/main/java/kr/co/icontrols/wallpadhomectrl/screen/screen_light/LightKnxPopupRoomScreen.java

@@ -114,12 +114,12 @@ public class LightKnxPopupRoomScreen extends WpadScreen {
     public static final int min = 1;
     public int SeekBarValue = 1;
 
-    private final int[] ROOM_POS = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20};
+    private final int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
     //private final int[] ROOM_POS = {10,11,12,13,14,15,16,7,8,9,0,1,2,3,4,5,6,17,18,19,20};
 
 
     private String[] mKNXDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실","드레스룸3","추가룸1","추가룸2","추가룸3","추가룸4","추가룸5"};
+            "복도1", "욕실1", "욕실2","보조주방","욕실3","욕실4","욕실5","복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실","드레스룸3","추가룸1","추가룸2","추가룸3","추가룸4","추가룸5", "추가룸6", "추가룸7"};
 
 
     /**

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

@@ -534,6 +534,7 @@ public class HybridCookTopTestScreen extends WpadScreen {
         AlarmText = new WpadTextView(getContext(), false, 1280, 110, Gravity.CENTER, Color.WHITE, Common.fontsize._36, false, 0);
         ViewRegistration(getLayout(), AlarmText, 0, Common.ImgPosion.GetY(375));
         AlarmText.setText("쿡탑제어기가 연결이 되어 있지 않습니다.");
+        AlarmText.setVisibility(View.GONE);
 
         // 임시로 샘플 데이터를 통해 화면에 출력하도록 한다.
         //Sample_DataDefaultSetting();

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

@@ -182,10 +182,11 @@ public class LightKnxMainTestScreen extends WpadScreen {
     private static final int EM_TYPE = 0;
     private static final int SWITCH_TYPE = 1;
 
-    private final int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
+    private final int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
+
 
     private String[] mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시", "임시", "임시", "임시"};
+            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실", "드레스룸3", "추가룸1", "추가룸2", "추가룸3", "추가룸4", "추가룸5", "추가룸6", "추가룸7"};
 
 
     // [Class]

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

@@ -104,11 +104,12 @@ public class LightKnxPopupTestScreen extends WpadScreen {
     public static final int min = 1;
     public int SeekBarValue = 1;
 
-    private int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20};
+    private int[] ROOM_POS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30};
+
 
 
     private String[] mDefaultRoomNameList = new String[]{"거실", "거실", "침실4", "침실1", "파우더룸", "침실2", "주방1", "침실3",
-            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "임시", "임시", "임시", "임시"};
+            "복도1", "욕실1", "욕실2", "보조주방", "욕실3", "욕실4", "욕실5", "복도2", "현관", "신발장", "창고", "주방2", "간이주방", "서재1", "작업실", "드레스룸3", "추가룸1", "추가룸2", "추가룸3", "추가룸4", "추가룸5", "추가룸6", "추가룸7"};
 
 
     /**

BIN
WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_1_disabled.png


BIN
WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_2_disabled.png


BIN
WallPadHomeCtrl/src/main/res/drawable-ldpi/tab_floor_3_disabled.png


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

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadkeyboard"
     android:versionCode="17"
-    android:versionName="2021.07.27.01">
+    android:versionName="2022.04.11.02">
 
     <uses-feature android:required="false" android:name="android.hardware.touchscreen"/>
 

BIN
WallPadMain/libs/WallPadAPI.jar


+ 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.01.24.02">
+    android:versionName="2022.04.11.02">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

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

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

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

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

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

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