|
|
@@ -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:
|