ソースを参照

[모든앱]
1. 이전버전으로 롤백
- 2021년 12월 9일 오후 3:35:20
- SHA-1: 7059e7a6cb4af3196b504e6de6117700e2e875eb
2. 구현한 일광소등 기능 삭제
- 기존 코드로도 일괄소등 기능 동작함

SHA-1: 7059e7a6cb4af3196b504e6de6117700e2e875eb

* [WallPadMain]
1. App Ver. 갱신
- 2021.12.09.01
2. 릴리즈용 버전 갱신
- 일괄소등 릴레이 연동기능 추가해야함

Changwoo Nam 4 年 前
コミット
c64d9f3832
64 ファイル変更158 行追加180 行削除
  1. BIN
      10_Release/AutoPicture.apk
  2. BIN
      10_Release/LogOutputService.apk
  3. BIN
      10_Release/ManagerSetting.apk
  4. BIN
      10_Release/WallPadAddService.apk
  5. BIN
      10_Release/WallPadCall.apk
  6. BIN
      10_Release/WallPadConfig.apk
  7. BIN
      10_Release/WallPadDevService.apk
  8. BIN
      10_Release/WallPadEmergency.apk
  9. BIN
      10_Release/WallPadEnergyCtrl.apk
  10. BIN
      10_Release/WallPadGlobalButton.apk
  11. BIN
      10_Release/WallPadGlobalScreen.apk
  12. BIN
      10_Release/WallPadHomeCtrl.apk
  13. BIN
      10_Release/WallPadKeyBoard.apk
  14. BIN
      10_Release/WallPadMain.apk
  15. BIN
      10_Release/WallPadOutModeRun.apk
  16. BIN
      10_Release/WallPadSecurity.apk
  17. BIN
      AutoPicture/libs/WallPadAPI.jar
  18. 1 1
      AutoPicture/src/main/AndroidManifest.xml
  19. BIN
      LogOutputService/libs/WallPadAPI.jar
  20. BIN
      LogOutputService/libs/WallPadAPIforSVC.jar
  21. 1 1
      LogOutputService/src/main/AndroidManifest.xml
  22. BIN
      ManagerSetting/libs/WallPadAPI.jar
  23. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  24. 0 1
      ManagerSetting/src/main/java/com/artncore/managersetting/domain/Const.java
  25. 12 8
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java
  26. 40 21
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java
  27. 54 57
      ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingDebuggingFragment.java
  28. 0 1
      ManagerSetting/src/main/res/values/strings.xml
  29. BIN
      WallPadAPI/jar/WallPadAPI.jar
  30. BIN
      WallPadAPI/jar/WallPadAPIforSVC.jar
  31. 5 8
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java
  32. 9 9
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java
  33. 1 1
      WallPadAPI/src/main/java/com/artncore/commons/define.java
  34. 6 4
      WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java
  35. BIN
      WallPadAddService/libs/WallPadAPI.jar
  36. 1 1
      WallPadAddService/src/main/AndroidManifest.xml
  37. BIN
      WallPadCall/libs/WallPadAPI.jar
  38. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  39. BIN
      WallPadConfig/libs/WallPadAPI.jar
  40. 1 1
      WallPadConfig/src/main/AndroidManifest.xml
  41. BIN
      WallPadDevService/libs/WallPadAPIforSVC.jar
  42. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  43. 3 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/ServiceMain.java
  44. 1 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLightHDC_Controller.java
  45. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingFinder_Controller.java
  46. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV1_Controller.java
  47. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV2_Controller.java
  48. 1 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Light_Controller.java
  49. BIN
      WallPadEmergency/libs/WallPadAPI.jar
  50. 1 1
      WallPadEmergency/src/main/AndroidManifest.xml
  51. BIN
      WallPadEnergyCtrl/libs/WallPadAPI.jar
  52. 1 1
      WallPadEnergyCtrl/src/main/AndroidManifest.xml
  53. BIN
      WallPadGlobalScreen/libs/WallPadAPI.jar
  54. 1 1
      WallPadGlobalScreen/src/main/AndroidManifest.xml
  55. BIN
      WallPadHomeCtrl/libs/WallPadAPI.jar
  56. 1 1
      WallPadHomeCtrl/src/main/AndroidManifest.xml
  57. BIN
      WallPadMain/libs/WallPadAPI.jar
  58. 1 1
      WallPadMain/src/main/AndroidManifest.xml
  59. 6 38
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/popup/CollectiveLightCTRL.java
  60. 0 4
      WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java
  61. BIN
      WallPadOutmodeRun/libs/WallPadAPI.jar
  62. 1 1
      WallPadOutmodeRun/src/main/AndroidManifest.xml
  63. BIN
      WallPadSecurity/libs/WallPadAPI.jar
  64. 1 1
      WallPadSecurity/src/main/AndroidManifest.xml

BIN
10_Release/AutoPicture.apk


BIN
10_Release/LogOutputService.apk


BIN
10_Release/ManagerSetting.apk


BIN
10_Release/WallPadAddService.apk


BIN
10_Release/WallPadCall.apk


BIN
10_Release/WallPadConfig.apk


BIN
10_Release/WallPadDevService.apk


BIN
10_Release/WallPadEmergency.apk


BIN
10_Release/WallPadEnergyCtrl.apk


BIN
10_Release/WallPadGlobalButton.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


BIN
AutoPicture/libs/WallPadAPI.jar


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

BIN
LogOutputService/libs/WallPadAPI.jar


BIN
LogOutputService/libs/WallPadAPIforSVC.jar


+ 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.12.13.01">
+    android:versionName="2021.12.06.01">
 
     <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="2021.12.13.01">
+    android:versionName="2021.12.06.01">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

+ 0 - 1
ManagerSetting/src/main/java/com/artncore/managersetting/domain/Const.java

@@ -90,7 +90,6 @@ public class Const {
     public static final String LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER     = "대외향일괄소등제어기";
     public static final String LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH            = "현산향스마트스위치";
     public static final String LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH        = "현산향LCD스마트스위치";
-    public static final String LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER        = "현산향일괄소등제어기";
 
 
     public static final String LIGHT_BATCH_CONTROL_TYPE_L1 = "L1설정";

+ 12 - 8
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/CheckControllerFragment.java

@@ -743,7 +743,10 @@ public class CheckControllerFragment extends Fragment {
                         Temp_TYPE_LIGHT_BATCH_CONTROL = InfoList.get(5);
 
                         String controllerName = InfoList.get(2) + " - " + InfoList.get(5);
-                        controllerVO = new ControllerVO(type, controllerName, 0, 0);
+                        controllerVO = new ControllerVO(type
+                                , controllerName
+                                , 0
+                                , 0);
                     }
                 }
             }
@@ -1214,21 +1217,22 @@ public class CheckControllerFragment extends Fragment {
 */
 
             case Const.CONTROLLER_TYPE_LIGHT_BATCH_CONTROLL:
-                if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH)) {
+                if(Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH))
+                {
                     testAPI = mWallPadAPI.Get_SmartSwitchPolController();
                 }
-                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER)) {
+                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER))
+                {
                     testAPI = mWallPadAPI.Get_AllLightController();
                 }
-                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH)) {
+                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH))
+                {
                     testAPI = mWallPadAPI.Get_SmartSwitchEvtController();
                 }
-                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH)) {
+                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH))
+                {
                     testAPI = mWallPadAPI.Get_SmartSwitchPolController();
                 }
-                else if (Temp_TYPE_LIGHT_BATCH_CONTROL.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER)) {
-                    testAPI = mWallPadAPI.Get_AllLightHDCController();
-                }
                 break;
 
             case Const.CONTROLLER_TYPE_REALTIME_MEASURING_METER:

+ 40 - 21
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java

@@ -633,9 +633,6 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                             else if (Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER.equals(strType)) {
                                 batchControllCurrent = 2;
                             }
-                            else if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER.equals(strType)) {
-                                batchControllCurrent = 3;
-                            }
                         }
                     }
                 }
@@ -650,11 +647,15 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                 else {
                     itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_smart_switch));
                     itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_batch_controller));
-                    itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_batch_controller));
                 }
 
                 String controllerName = mActivity.getString(R.string.contoller_smat_switch_and_light_batch_controll);
-                controllerVO = new ControllerVO(type, controllerName, batchControllerCount, batchControllCurrent, itemList);
+                controllerVO = new ControllerVO(type
+                        , controllerName
+                        , batchControllerCount
+                        , batchControllCurrent
+                        , itemList
+                );
             }
             break;
 
@@ -1542,28 +1543,33 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
 
                     int i = 4;
                     if (position == 0) {
-                        value += "(" + Const.CONTROLLER_SETTING_DO_NOT_USED + ")";
+                        value += "("
+                                + Const.CONTROLLER_SETTING_DO_NOT_USED
+                                + ")"
+                        ;
                     }
                     else {
                         String typeName = null;
 
-                        if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH)) {
+                        if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH))
                             typeName = Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH;
-                        }
-                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER)) {
+                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER))
                             typeName = Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER;
-                        }
-                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH)) {
+                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH))
                             typeName = Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH;
-                        }
-                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH)) {
+                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH))
                             typeName = Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH;
-                        }
-                        else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER)) {
-                            typeName = Const.LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER;
-                        }
 
-                        value += "(" + Const.CONTROLLER_SETTING_DO_USED + ")" + Const.CONTROLLER_SETTING_TYPE + "(" + typeName + ")";
+                        value += "("
+                                + Const.CONTROLLER_SETTING_DO_USED
+                                + ")"
+
+                                + Const.CONTROLLER_SETTING_TYPE
+                                + "("
+                                + typeName
+                                + ")"
+                        ;
+
                         i += 2;
                     }
 
@@ -1572,12 +1578,25 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
                         String deviceNo = InfoList.get(0);
                         String circuitNo = InfoList.get(1);
 
-                        value = deviceNo + "(" + circuitNo + ":" + value;
+                        value = deviceNo
+                                + "("
+
+                                + circuitNo
+                                + ":"
+
+                                + value
+                        ;
 
                         for (; i + 1 <InfoList.size(); i=i+2) {
-                            value += InfoList.get(i) + "(" + InfoList.get(i+1) + ")";
+                            value += InfoList.get(i)
+                                    + "("
+                                    + InfoList.get(i+1)
+                                    + ")"
+                            ;
                         }
-                        value += ")";
+
+                        value += ")"
+                        ;
 
                         mMainDatabaseManager.setSettingDataSubDev(itemType, 0, value);
                     }

+ 54 - 57
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingDebuggingFragment.java

@@ -124,14 +124,6 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
     public static final int LOG_PATH_TYPE_NAND_INDEX = 0;
     public static final int LOG_PATH_TYPE_SERVER_INDEX = 1;
 
-    public static class ALLLIGHT_SW_TYPE {
-        public static int NONE = 0;
-        public static int COMMON_SMARTSWITCH_POL = 1;   // 대외향/현산향 스마트스위치 (폴링)
-        public static int COMMON_BATCHSWITCH = 2;   // 대외향 일괄소등스위치
-        public static int HDC_BATCHSWITCH = 3;   // 현산향 일괄소등스위치
-        public static int HDC_SMARTSWITCH_EVT = 4;   // 현산향 스마트 스위치 (이벤트)
-    }
-
     private Activity mActivity;
     private WallPadAPI mWallPadAPI;
 
@@ -144,7 +136,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
     WallPadDevAPI deviceAPI = null;
 
     //제어기기 타입 타입
-    private int AllLightSwitchType = ALLLIGHT_SW_TYPE.NONE; //일괄소등
+    private int AllLightSwitchType = 0; //일괄소등
     private int LightSwitchType = 0; //조명
     private int DoorCamType = 0; //현관카메라
 
@@ -544,91 +536,107 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
                 int Current = Const.CONTROLLER_SETTING_DO_USED_INDEX;
 
                 List<String> InfoList = mMainDatabaseManager.getSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SMART_SWITCH_LIGHT_AND_BATCH_CONTROL);
-                if ((InfoList != null) && (InfoList.size() > 5)) {
-                    if (Const.CONTROLLER_SETTING_DO_USED.equals(InfoList.get(3))) {
+                if ((InfoList != null) && (InfoList.size() > 5))
+                {
+                    if (Const.CONTROLLER_SETTING_DO_USED.equals(InfoList.get(3)))
+                    {
                         String strType = InfoList.get(5);
-                        if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH)) {
-                            try {
+                        if(strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH))
+                        {
+                            try
+                            {
                                 SmartSwitchPolAPI smartSwitchPolAPI = mWallPadAPI.Get_SmartSwitchPolController();
                                 deviceAPI = smartSwitchPolAPI;
-                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_SMARTSWITCH_POL;
-                            } catch (Exception e) {
+                                AllLightSwitchType = 1;
+                            }
+                            catch(Exception e)
+                            {
                                 Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
                                 e.printStackTrace();
                                 return;
                             }
                         }
-                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER)) {
-                            try {
+                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER))
+                        {
+                            try
+                            {
                                 AllLightAPI allLightAPI = mWallPadAPI.Get_AllLightController();
                                 deviceAPI = allLightAPI;
-                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_BATCHSWITCH;
-                            } catch (Exception e) {
+                                AllLightSwitchType = 2;
+                            }
+                            catch(Exception e)
+                            {
                                 Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
                                 e.printStackTrace();
                                 return;
                             }
                         }
-                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH)) {
-                            try {
+                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH))
+                        {
+                            try
+                            {
                                 SmartSwitchEvtAPI smartSwitchEvtAPI = mWallPadAPI.Get_SmartSwitchEvtController();
                                 deviceAPI = smartSwitchEvtAPI;
-                                AllLightSwitchType = ALLLIGHT_SW_TYPE.HDC_SMARTSWITCH_EVT;
-                            } catch (Exception e) {
+                                AllLightSwitchType = 4;
+                            }
+                            catch(Exception e)
+                            {
                                 Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
                                 e.printStackTrace();
                                 return;
                             }
                         }
-                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH)) {
-                            try {
+                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH))
+                        {
+                            try
+                            {
                                 SmartSwitchPolAPI smartSwitchPolAPI = mWallPadAPI.Get_SmartSwitchPolController();
                                 deviceAPI = smartSwitchPolAPI;
-                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_SMARTSWITCH_POL;
-                            } catch (Exception e) {
-                                Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
-                                e.printStackTrace();
-                                return;
+                                AllLightSwitchType = 1;
                             }
-                        }
-                        else if (strType.equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_BATCH_CONTROLLER)) {
-                            try {
-                                AllLightHDCAPI mAllLightHDCAPI = mWallPadAPI.Get_AllLightHDCController();
-                                deviceAPI = mAllLightHDCAPI;
-                                AllLightSwitchType = ALLLIGHT_SW_TYPE.HDC_BATCHSWITCH;
-                            } catch (Exception e) {
+                            catch(Exception e)
+                            {
                                 Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
                                 e.printStackTrace();
                                 return;
                             }
                         }
-                        else {
+                        else
+                        {
                             return;
                         }
 
                         String controllerName = "";
 
-                        if ((WpadScale.getWidthPixels() == 800) && (WpadScale.getHeightPixels() == 480)) {
+                        if((WpadScale.getWidthPixels() == 800) && (WpadScale.getHeightPixels() == 480))
+                        {
                             controllerName = InfoList.get(2);
                         }
-                        else {
+                        else
+                        {
                             controllerName = InfoList.get(2) + " - " + InfoList.get(5);
                         }
 
 
-                        if (deviceAPI == null){return;}
+                        if(deviceAPI == null){return;}
 
                         boolean bLogStatus = deviceAPI.GetLogOnOff();
 
                         Log.d(TAG, "LogStatus : " + bLogStatus);
 
-                        if (bLogStatus == true) {
+                        if(bLogStatus == true)
+                        {
                             Current = Const.CONTROLLER_SETTING_DO_USED_INDEX;
                         }
-                        else {
+                        else
+                        {
                             Current = Const.CONTROLLER_SETTING_DO_NOT_USED_INDEX;
                         }
-                        controllerVO = new ControllerVO(type, controllerName, Count, Current);
+                        controllerVO = new ControllerVO(type
+                                , controllerName
+                                , Count
+                                , Current
+                        );
                     }
                 }
             }
@@ -1621,7 +1629,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
 
             case Const.CONTROLLER_TYPE_LIGHT_BATCH_CONTROLL:
             {
-                switch (AllLightSwitchType)
+                switch(AllLightSwitchType)
                 {
                     case 1:
                         try
@@ -1654,18 +1662,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
                         break;
 
                     case 3:
-                        try
-                        {
-                            AllLightHDCAPI mAllLightHDCAPI = mWallPadAPI.Get_AllLightHDCController();
-                            deviceAPI = mAllLightHDCAPI;
-                            DebugLogOutput("Get_AllLightHDCController");
-                        }
-                        catch(Exception e)
-                        {
-                            Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
-                            e.printStackTrace();
-                        }
-                        DeviceSetLogOnOff(deviceAPI, position);
+
                         break;
 
                     case 4:

+ 0 - 1
ManagerSetting/src/main/res/values/strings.xml

@@ -288,7 +288,6 @@
     <string name="controller_light_batch_item_common_batch_controller">대외향일괄소등제어기 (일괄소등제어기or조명3로스위치)</string>
     <string name="controller_light_batch_item_common_hdc_smart_switch">현산향스마트스위치 (iSS-101)</string>
     <string name="controller_light_batch_item_common_hdc_lcd_smart_switch">현산향LCD스마트스위치 (iSS-430)</string>
-    <string name="controller_light_batch_item_common_hdc_batch_controller">현산향일괄소등제어기</string>
 <!--
    현산향 조명 타입 구분자
 -->

BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


+ 5 - 8
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java

@@ -199,11 +199,10 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 
 
 
-	public static final int BATCH_TYPE_GENERAL       = 21;   // 대외향일괄소등제어기 + 3로조명확장스위치 (id 검색하여 해당 드라이버 로딩)
-	public static final int BATCH_TYPE_SMART         = 22;   // 대외향스마트스위치 - iSS-201
-	public static final int BATCH_TYPE_HDC_OLD_SMART = 25;   // 현산향스마트스위치 - iSS-101
-	public static final int BATCH_TYPE_HDC_LCD_SMART = 26;   // 현산향스마트스위치 - iSS-430
-	public static final int BATCH_TYPE_HDC_BATCHSWITCH = 27;   // 현산향일괄소등제어기
+	public static final int BATCH_TYPE_GENERAL       = 21; //대외향일괄소등제어기 + 3로조명확장스위치 (id 검색하여 해당 드라이버 로딩)
+	public static final int BATCH_TYPE_SMART         = 22; //대외향스마트스위치 - iSS-201
+	public static final int BATCH_TYPE_HDC_OLD_SMART = 25; //현산향스마트스위치 - iSS-101
+	public static final int BATCH_TYPE_HDC_LCD_SMART = 26; //현산향스마트스위치 - iSS-430
 
 	/**
 	 * @description
@@ -213,8 +212,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 	 * BATCH_TYPE_GENERAL:        대외향일괄소등제어기 <br>
 	 * BATCH_TYPE_SMART:          대외향스마트스위치(iSS-201)<br>
 	 * BATCH_TYPE_HDC_OLD_SMART:  현산향스마트스위치(iSS-101)<br>
-	 * BATCH_TYPE_HDC_LCD_SMART: 현산향스마트스위치(iSS-430)<br>
-	 * BATCH_TYPE_HDC_BATCHSWITCH: 현산향일괄소등제어기<br>
+	 *  BATCH_TYPE_HDC_LCD_SMART: 현산향스마트스위치(iSS-430)<br>
 	 * int[2] - L1설정 <br>
 	 * int[3] - L2설정
 	 */
@@ -267,7 +265,6 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 				if (GetData[1].indexOf("대외향스마트스위치") > 0) returnData[1] = BATCH_TYPE_SMART;
 				else if (GetData[1].indexOf("대외향일괄소등제어기") > 0) returnData[1] = BATCH_TYPE_GENERAL;
 				else if (GetData[1].indexOf("현산향스마트스위치") > 0) returnData[1] = BATCH_TYPE_HDC_OLD_SMART;
-				else if (GetData[1].indexOf("현산향일괄소등제어기") > 0) returnData[1] = BATCH_TYPE_HDC_BATCHSWITCH;
 				else {
 					returnData[0] = 0;
 					return returnData;

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

@@ -192,7 +192,7 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_DISABLE, "종류(사용안함)"},
     };
 
-    private static String[][] iHN1010_I_ALT_DevicesSettingInitData = new String[][] {
+    private static String[][] iHN1000_DevicesSettingInitData = new String[][] {
 
             {"1", "1", define.DEVICE_ID_GAS, define.DEVICE_ENABLE, ""},
             {"1", "1", define.DEVICE_ID_ELECTRIC_RANGE, define.DEVICE_DISABLE, ""},
@@ -200,7 +200,7 @@ public class wallpaddbmgr {
             {"1", "4", define.DEVICE_ID_THERMO, define.DEVICE_ENABLE, ""},
             {"1", "3", define.DEVICE_ID_LIGHT, define.DEVICE_ENABLE, "종류(대외기본형)"},
             {"1", "5", define.DEVICE_ID_REALTIMEMETER, define.DEVICE_DISABLE, ""},
-            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(현산향일괄소등제어기)L1설정(3)L2설정(4)"},
+            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(대외향일괄소등제어기)L1설정(3)L2설정(4)"},
             {"1", "1", define.DEVICE_ID_REMOTECON, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_DOORCAM, define.DEVICE_ENABLE, "종류(기본)"},
             {"1", "1", define.DEVICE_ID_VENTIL, define.DEVICE_DISABLE, ""},
@@ -2023,20 +2023,20 @@ public class wallpaddbmgr {
         }
         else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT)
         {
-            for (int i = 0; i < iHN1010_I_ALT_DevicesSettingInitData.length; i++) {
+            for (int i = 0; i < iHN1000_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"
-                        , iHN1010_I_ALT_DevicesSettingInitData[i][2]
+                        , iHN1000_DevicesSettingInitData[i][2]
                         , 0
-                        , iHN1010_I_ALT_DevicesSettingInitData[i][0]+
+                        , iHN1000_DevicesSettingInitData[i][0]+
                                 "("
-                                + iHN1010_I_ALT_DevicesSettingInitData[i][1]+
+                                +iHN1000_DevicesSettingInitData[i][1]+
                                 ":"
-                                + iHN1010_I_ALT_DevicesSettingInitData[i][2]+
+                                +iHN1000_DevicesSettingInitData[i][2]+
                                 "("+
-                                iHN1010_I_ALT_DevicesSettingInitData[i][3]+
+                                iHN1000_DevicesSettingInitData[i][3]+
                                 ")"+
-                                iHN1010_I_ALT_DevicesSettingInitData[i][4]+
+                                iHN1000_DevicesSettingInitData[i][4]+
                                 ")"
                 );
             }

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -4,7 +4,7 @@ import android.os.Environment;
 
 public class define {
 	/** WallPadAPI Version 을 정의합니다. */
-	public static final String WALLPADAPI_VERSION = "2021.12.13.01";
+	public static final String WALLPADAPI_VERSION = "2021.12.06.01";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////

+ 6 - 4
WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java

@@ -155,6 +155,7 @@ public class WallPadAPI {
                 WallpadDeviceSet wds = new WallpadDeviceSet(mContext);
                 int nDPType = wds.Get_DistributionPannelType_Info();
                 wds.closeDB();
+                Log.d(TAG, "[SetBatchSwitchStatus] nDPType [" + nDPType + "]");
 
                 int ret = -1;
                 if (nDPType == Version.DISTRIBUTION_MODEL.SMART_DIST) {
@@ -178,8 +179,8 @@ public class WallPadAPI {
 
                 return ret;
             }
-            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                    || mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
+            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
+                    || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
                 // AC 분전반 사용 (AC 조명)
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
@@ -236,6 +237,7 @@ public class WallPadAPI {
                 WallpadDeviceSet wds = new WallpadDeviceSet(mContext);
                 int nDPType = wds.Get_DistributionPannelType_Info();
                 wds.closeDB();
+                Log.d(TAG, "[GetBatchSwitchStatus] nDPType [" + nDPType + "]");
 
                 if (nDPType == Version.DISTRIBUTION_MODEL.SMART_DIST) {
                     // 스마트 분전반
@@ -268,8 +270,8 @@ public class WallPadAPI {
                     else return 1;
                 }
             }
-            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                    || mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
+            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
+                    || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
                     AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();

BIN
WallPadAddService/libs/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="2021.12.13.01">
+    android:versionName="2021.12.06.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadCall/libs/WallPadAPI.jar


+ 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="2021.12.13.01">
+    android:versionName="2021.12.07.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

BIN
WallPadConfig/libs/WallPadAPI.jar


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

BIN
WallPadDevService/libs/WallPadAPIforSVC.jar


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

+ 3 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/ServiceMain.java

@@ -981,8 +981,8 @@ public class ServiceMain extends Service {
 					///////////////////////////////////////////
 
 					// 0. 로딩여부 판단
-					int [] Get_BatchSW_Info = ServiceMain.dataBaseLoader.data.wallpadDeviceSet.Get_BatchSW_Info;
-					if (Get_BatchSW_Info[0] == WallpadDeviceSet.DO_NOT_USE || Get_BatchSW_Info[1] != WallpadDeviceSet.BATCH_TYPE_HDC_BATCHSWITCH) return;
+					if(mModelType != Version.MODEL_TYPE.IHN_1020GL) return;
+					if(Get_HDCIntLightType()) return;
 
 					// 1. Class 생성
 					allLightHDC_Controller = new AllLightHDC_Controller();
@@ -2222,8 +2222,7 @@ public class ServiceMain extends Service {
 						"</portmap>   <drivermap> " +
 
 						// COM2 - Ctrl_Module1 EtcLivingLight_Controller
-						"<driver name = \"AllLightHDC_Driver\"            module =\"Ctrl_Module1\"               startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
-//						"<driver name = \"BatchLight_Driver\"             module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
+						"<driver name = \"BatchLight_Driver\"             module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
 						"<driver name = \"Light_Driver\"                  module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x12\"    option = \"null\"  />"+
 						"<driver name = \"EtcLivingLight_Controller\"     module =\"Ctrl_Module1\"              startaddr = \"0x16\"    endaddr = \"0x16\"    option = \"null\"  />"+
 						"<driver name = \"Ventilation_Driver\"            module =\"Ctrl_Module1\"              startaddr = \"0x61\"    endaddr = \"0x68\"    option = \"null\"  />"+

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

@@ -121,8 +121,7 @@ public class AllLightHDC_Controller extends DeviceManager
     public AllLightHDC_Controller()
     {
         /** 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+        log_sw = false;
 
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingFinder_Controller.java

@@ -114,8 +114,8 @@ public class HeatingFinder_Controller extends DeviceManager
     public HeatingFinder_Controller()
     {
         /* 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+        log_sw = false;
+        SerialLog = false;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV1_Controller.java

@@ -155,8 +155,8 @@ public class HeatingV1_Controller extends DeviceManager
     public HeatingV1_Controller()
     {
         /** 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+        log_sw = false;
+        SerialLog = false;
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);
 

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV2_Controller.java

@@ -210,8 +210,8 @@ public class HeatingV2_Controller extends DeviceManager
     public HeatingV2_Controller()
     {
         /** 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+        log_sw = false;
+        SerialLog = false;
         /** 모델정보 가져오기 */
         mModelType = Version.getModelType();
 

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

@@ -163,8 +163,7 @@ public class Light_Controller extends DeviceManager
     public Light_Controller()
     {
         /* 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+        log_sw = false;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

BIN
WallPadEmergency/libs/WallPadAPI.jar


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

BIN
WallPadEnergyCtrl/libs/WallPadAPI.jar


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

BIN
WallPadGlobalScreen/libs/WallPadAPI.jar


+ 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.12.13.01">
+    android:versionName="2021.12.06.01">
 
     <uses-feature android:name="android.hardware.camera" />
 

BIN
WallPadHomeCtrl/libs/WallPadAPI.jar


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

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

+ 6 - 38
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/popup/CollectiveLightCTRL.java

@@ -1,7 +1,6 @@
 package kr.co.icontrols.wallpadmain.popup;
 
 import com.artncore.WallPadDataMgr.WallpadStatusData;
-import com.artncore.commons.define;
 import com.artncore.wallpadapi.WallPadAPI;
 
 import android.content.Context;
@@ -88,9 +87,7 @@ public class CollectiveLightCTRL extends WpadScreen {
             ViewRegistration(layout, TXT_TITLE, getPosition(ID.POPUPS.COLLECTIVELIGHTCTRL.ELEMENTS.TEXTS.TITLE).X, getPosition(ID.POPUPS.COLLECTIVELIGHTCTRL.ELEMENTS.TEXTS.TITLE).Y);
             TXT_TITLE.setText(strTitle);
         }
-
-        registorBR_AllLightCtrl(true, 0);
-
+        
         displayCollectiveLightStatus();
 	}
 
@@ -98,7 +95,6 @@ public class CollectiveLightCTRL extends WpadScreen {
 	protected void onClose() {
 		super.onClose();
 		Log.d(TAG, "[END   - Screen] ********************************************");
-        registorBR_AllLightCtrl(false, 0);
 	}
 	
 	private void displayCollectiveLightStatus() {
@@ -173,41 +169,13 @@ public class CollectiveLightCTRL extends WpadScreen {
 		return super.addBrActionFilter(action);
 	}
 
-    /**
-     * 디바이스에 알림 BR 을 등록한다. (멀티스위치)
-     * @return (int) - >=0 : 성공, <0 : 실패
-     */
-    private int registorBR_AllLightCtrl(boolean OnOff, int nDevKind) {
-        if (OnOff) {
-            super.addBrActionFilter(define.NOTIFY_ACNAME);
-        }
-        else {
-            super.removeBrActionFilter(define.NOTIFY_ACNAME);
-        }
-        return 0;
-    }
-
 	@Override
 	protected void onBrReceive(Intent intent) {
-        // TODO Auto-generated method stub
-        super.onBrReceive(intent);
-        String ActionName = intent.getAction();
-        if (ActionName.equals(define.NOTIFY_ACNAME)) {
-            int kind = intent.getIntExtra(define.NOTIBR_KIND, 0);
-            Log.i(TAG, "[onBrReceive] ActionName [" + ActionName + "], kind [" + kind + "]");
-            switch (kind) {
-                case define.NOTIFY_ALL_LIGHT_OFF:
-                    // 일괄소등 설정 (조명 OFF)
-                    syncBTNAllLightOff(true);
-                    break;
-
-                case define.NOTIFY_ALL_LIGHT_ON:
-                    // 일괄소등 해제 (조명 ON)
-                    syncBTNAllLightOff(false);
-                    break;
-            }
-        }
-    }
+		// TODO Auto-generated method stub
+		super.onBrReceive(intent);
+		Common.DebugLog("--------------------onBrReceive ---> intent.getAction(): " + intent.getAction());
+		
+	}
     
 	private void Exit() {
 		((PopupActivity)(super.getContext())).finish();

+ 0 - 4
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/IconManager.java

@@ -528,10 +528,6 @@ public class IconManager {
                     mIconInfoTable.addIconInfo(ID.ICONS.MENUS.MAIN_LIGHTS_OUT.getID(), ID.ICONS.MENUS.MAIN_LIGHTS_OUT.getNameKR(), ID.LINKEDSCREEN.OtherFunc.IGAL_CTRL,
                             R.drawable.icon_ctrl_lightsout_normal, R.drawable.icon_ctrl_lightsout_pressed, R.drawable.icon_ctrl_lightsout_pressed, R.drawable.icon_ctrl_lightsout_pressed);
                 }
-                else if (naAllLightOffEnable[1] == WallpadDeviceSet.BATCH_TYPE_HDC_BATCHSWITCH) {
-                    mIconInfoTable.addIconInfo(ID.ICONS.MENUS.MAIN_LIGHTS_OUT.getID(), ID.ICONS.MENUS.MAIN_LIGHTS_OUT.getNameKR(), ID.LINKEDSCREEN.OtherFunc.IGAL_CTRL,
-                            R.drawable.icon_ctrl_lightsout_normal, R.drawable.icon_ctrl_lightsout_pressed, R.drawable.icon_ctrl_lightsout_pressed, R.drawable.icon_ctrl_lightsout_pressed);
-                }
                 else {
                     Log.w(TAG, "[setWallpadFunction] Not supported devicetype!!  naAllLightOffEnable[1] = " + naAllLightOffEnable[1]);
                 }

BIN
WallPadOutmodeRun/libs/WallPadAPI.jar


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

BIN
WallPadSecurity/libs/WallPadAPI.jar


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