Forráskód Böngészése

[WallPadMain]
1. 아이콘 누락 수정
2. 버전 업그레이드(2021.06.09.02)

[WallPadSecurity]
1. 일괄소등이 사용하는 경우에만 연동에서 사오게끔 수정

[ManagerSetting]
1. 초기 DB 데이터 수정(일괄소등 사용 -> 일괄소등 사용안함)

jglee 3 éve
szülő
commit
52fe24dcdb

BIN
10_Release/AutoPicture.apk


BIN
10_Release/LogOutputService.apk


BIN
10_Release/ManagerSetting.apk


BIN
10_Release/WallPadAddService.apk


BIN
10_Release/WallPadConfig.apk


BIN
10_Release/WallPadDevService.apk


BIN
10_Release/WallPadEmergency.apk


BIN
10_Release/WallPadEnergyCtrl.apk


BIN
10_Release/WallPadGlobalScreen.apk


BIN
10_Release/WallPadHomeCtrl.apk


BIN
10_Release/WallPadKeyBoard.apk


BIN
10_Release/WallPadMain.apk


BIN
10_Release/WallPadOutModeRun.apk


BIN
10_Release/WallPadSecurity.apk


+ 4 - 4
10_Release/release/output-metadata.json

@@ -4,15 +4,15 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "kr.co.icontrols.wallpadsecurity",
+  "applicationId": "kr.co.icontrols.wallpadmain",
   "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 1,
-      "versionName": "2021.06.04.01",
-      "outputFile": "../WallPadSecurity.apk"
+      "versionCode": 17,
+      "versionName": "2021.06.09.02",
+      "outputFile": "../WallPadMain.apk"
     }
   ]
 }

+ 3 - 3
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -442,7 +442,7 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_DOORLOCK, define.DEVICE_ENABLE, "종류(유선)"},
             {"1", "4", define.DEVICE_ID_THERMO, define.DEVICE_ENABLE, ""},
             {"1", "3", define.DEVICE_ID_LIGHT, define.DEVICE_ENABLE, "종류(현산향일체형조명기본형)"},
-            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(현산향LCD스마트스위치)L1설정(3)L2설정(4)"}, // 확인필요!!!
+
             {"1", "1", define.DEVICE_ID_DOORCAM, define.DEVICE_ENABLE, "종류(기본)"},
             {"1", "5", define.DEVICE_ID_REMOTE_METER, define.DEVICE_ENABLE, "EMS(사용함)요금테이블(사용안함)"},
             {"1", "1", define.DEVICE_ID_ELEVATOR, define.DEVICE_ENABLE, "종류(기본)"},
@@ -460,8 +460,8 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_DISABLE, "종류(사용안함)"},
             {"1", "1", define.DEVICE_ID_REMOTECON, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_IDLE_POWER_SAVING_SWITCH, define.DEVICE_DISABLE, "종류( 기본 )"},
-            {"1", "1", define.DEVICE_ID_DEVICE_RELIEF_CALL, define.DEVICE_DISABLE, ""}   // 안심통화
-
+            {"1", "1", define.DEVICE_ID_DEVICE_RELIEF_CALL, define.DEVICE_DISABLE, ""},   // 안심통화
+            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_DISABLE, ""}
 //
 
 

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

+ 2 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/screen/SUB_02.java

@@ -40,7 +40,8 @@ public class SUB_02 extends WpadScreen {
 
     int SUBSCREEN_INDEX = 2;
     int SCREEN_ICON_START = 0;
-    int SCREEN_ICON_CNT = 25;
+    int SCREEN_ICON_CNT = 24
+            ;
 
     WpadImageView [] BTN_SHORTCUT_ICON = new WpadImageView[SCREEN_ICON_CNT];
     WpadTextView [] TXT_SHORTCUT_NAME = new WpadTextView[SCREEN_ICON_CNT];

+ 6 - 3
WallPadSecurity/src/main/java/kr/co/icontrols/wallpadsecurity/screen/SetLinkCtrlMainScreen.java

@@ -181,6 +181,7 @@ public class SetLinkCtrlMainScreen extends WpadScreen{
 	private void makeLinkControlList() {
 		try {
 			WallpadDeviceSet devSet = new WallpadDeviceSet(this.getContext());
+			int[] naAllLightOffEnable = devSet.Get_BatchSW_Info();
 			int[] BatchInfo = devSet.Get_BatchSW_Info();
 			int retGasInt = devSet.Get_GAS_Info();
 			int[] VentiInfo = devSet.Get_Ventil_Info();
@@ -222,9 +223,11 @@ public class SetLinkCtrlMainScreen extends WpadScreen{
 				if (nElevInfo == WallpadDeviceSet.ELEVATOR_SIMPLE || nElevInfo == WallpadDeviceSet.ELEVATOR_FLOOR) OutModeList.add(MODE_TEXT.CALL_ELEVATOR);
 
 				// 일괄소등
-				OutModeList.add(MODE_TEXT.IGAL_RUN);
-				ComeBackList.add(MODE_TEXT.IGAL_RELEASE);
-				
+				// 여기에 일괄소등을 사용할 경우만 넣도록 수정
+				if (naAllLightOffEnable[0] == WallpadDeviceSet.DO_USE) {
+					OutModeList.add(MODE_TEXT.IGAL_RUN);
+					ComeBackList.add(MODE_TEXT.IGAL_RELEASE);
+				}
 				// 가스닫기
 				if (retGasInt == 1) {
 					OutModeList.add(MODE_TEXT.GAS_STOP);