Explorar o código

[ManagerSetting]
1. App Ver. 갱신
- 2021.12.13.01
2. 현산향 일괄소등 제어기 대응 기능 추가
- '스마트스위치 and 일괄소등' 기기 항목에 '현산향일광소등제어기' 추가 및 대응기능 추가
- '현산향일괄소등제어기' 시험기능 추가
3. 최신 WallPadAPI 적용
- API Ver.: 2021.12.13.01

[WallPadAPI]
1. App Ver. 갱신
- 2021.12.13.01
2. 현산향 일괄소등 제어기 대응 기능 추가
- 일괄소등 기본설정을 '현산향일괄소등제어기'로 설정

Changwoo Nam %!s(int64=4) %!d(string=hai) anos
pai
achega
504ba67aa5

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

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

@@ -90,6 +90,7 @@ 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설정";

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

@@ -743,10 +743,7 @@ 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);
                     }
                 }
             }
@@ -1217,22 +1214,21 @@ 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:

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

@@ -633,6 +633,9 @@ 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;
+                            }
                         }
                     }
                 }
@@ -647,15 +650,11 @@ 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;
 
@@ -1543,33 +1542,28 @@ 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;
                     }
 
@@ -1578,25 +1572,12 @@ 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);
                     }

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

@@ -124,6 +124,14 @@ 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;
 
@@ -136,7 +144,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
     WallPadDevAPI deviceAPI = null;
 
     //제어기기 타입 타입
-    private int AllLightSwitchType = 0; //일괄소등
+    private int AllLightSwitchType = ALLLIGHT_SW_TYPE.NONE; //일괄소등
     private int LightSwitchType = 0; //조명
     private int DoorCamType = 0; //현관카메라
 
@@ -536,107 +544,91 @@ 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 = 1;
-                            }
-                            catch(Exception e)
-                            {
+                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_SMARTSWITCH_POL;
+                            } 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 = 2;
-                            }
-                            catch(Exception e)
-                            {
+                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_BATCHSWITCH;
+                            } 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 = 4;
-                            }
-                            catch(Exception e)
-                            {
+                                AllLightSwitchType = ALLLIGHT_SW_TYPE.HDC_SMARTSWITCH_EVT;
+                            } 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 = 1;
+                                AllLightSwitchType = ALLLIGHT_SW_TYPE.COMMON_SMARTSWITCH_POL;
+                            } catch (Exception e) {
+                                Log.e(TAG, "[Device_ApiLoad] - " + e.toString());
+                                e.printStackTrace();
+                                return;
                             }
-                            catch(Exception e)
-                            {
+                        }
+                        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) {
                                 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);
                     }
                 }
             }
@@ -1629,7 +1621,7 @@ public class SettingDebuggingFragment extends Fragment implements SwitchButton.S
 
             case Const.CONTROLLER_TYPE_LIGHT_BATCH_CONTROLL:
             {
-                switch(AllLightSwitchType)
+                switch (AllLightSwitchType)
                 {
                     case 1:
                         try
@@ -1662,7 +1654,18 @@ 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:

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

@@ -288,6 +288,7 @@
     <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>
 <!--
    현산향 조명 타입 구분자
 -->