Bladeren bron

[ManagerSetting]
1. 전동커튼 옵션 변경
- 사용함/사용안함 -> 종류(전동커튼/롤스크린)

jglee 2 jaren geleden
bovenliggende
commit
dea2c57c24

+ 81 - 8
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/SettingControllerFragment.java

@@ -1215,18 +1215,51 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
 
             case Const.CONTROLLER_TYPE_SHADING:
             {
-                int Count = Const.CONTROLLER_ONOFF_COUNT;
-                int Current = Const.CONTROLLER_SETTING_DO_NOT_USED_INDEX;
-                if (mMainDatabaseManager.isUsedSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING) == true)
-                    Current = Const.CONTROLLER_SETTING_DO_USED_INDEX;
+                int ctrlOptKindCount = Const.CONTROLLER_ONOFF_COUNT;
+                int ctrlOptKindCurrent = Const.CONTROLLER_SETTING_DO_NOT_USED_INDEX;
+
+                //2443과 다름
+                //2443 -> 사용/사용안함
+                //6410 -> 사용안함 / 전동커튼 / 롤스크린
+                List<String> InfoList = mMainDatabaseManager.getSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING);
+                if ((InfoList != null) && (InfoList.size() > 5)) {
+                    if (Const.CONTROLLER_SETTING_DO_USED.equals(InfoList.get(3))) {
+                        String strType = InfoList.get(5);
+                        if (Const.CONTROLLER_SHADING_CTRL_OPTION_CURTAIN.equals(strType)) {
+                            ctrlOptKindCurrent = 1;
+                        }
+                        else if (Const.CONTROLLER_SHADING_CTRL_OPTION_SCREEN.equals(strType)) {
+                            ctrlOptKindCurrent = 2;
+                        }
+                    }
+                }
+
+                Log.d(TAG, "[addControllerVO] ctrlOptKindCurrent [" + ctrlOptKindCurrent + "]");
+
+                List<String> itemList = new ArrayList<String>();
+                itemList.add(mActivity.getString(R.string.do_not_used)); // 전동커튼
+                itemList.add(mActivity.getString(R.string.contoller_shading_ctrl_option_curtain)); // 전동커튼
+                itemList.add(mActivity.getString(R.string.contoller_shading_ctrl_option_screen));  // 롤스크린
 
                 String controllerName = mActivity.getString(R.string.contoller_shading);
                 controllerVO = new ControllerVO(type
                         , controllerName
-                        , Count
-                        , Current
-                        , null
+                        , ctrlOptKindCount
+                        , ctrlOptKindCurrent
+                        , itemList
                 );
+
+                
+//                if (mMainDatabaseManager.isUsedSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING) == true)
+//                    Current = Const.CONTROLLER_SETTING_DO_USED_INDEX;
+
+//                String controllerName = mActivity.getString(R.string.contoller_shading);
+//                controllerVO = new ControllerVO(type
+//                        , controllerName
+//                        , Count
+//                        , Current
+//                        , null
+//                );
             }
             break;
 
@@ -2059,7 +2092,47 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
 
             case Const.CONTROLLER_TYPE_SHADING:
             {
-                mMainDatabaseManager.updateSetUsedToSubDeviceOnOff(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING, position);
+
+                final String controllerName = mMainDatabaseManager.getSubDevID(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING);
+                if (controllerName != null) {
+                    value = controllerName;
+                    String typeName = null;
+                    if (itemName.equals(Const.CONTROLLER_SHADING_CTRL_OPTION_CURTAIN))
+                        typeName = Const.CONTROLLER_SHADING_CTRL_OPTION_CURTAIN;
+                    else if (itemName.equals(Const.CONTROLLER_SHADING_CTRL_OPTION_SCREEN))
+                        typeName = Const.CONTROLLER_SHADING_CTRL_OPTION_SCREEN;
+
+                    value += "("
+                            + Const.CONTROLLER_SETTING_DO_USED
+                            + ")"
+                            + Const.CONTROLLER_SETTING_TYPE
+                            + "("
+                            + typeName
+                            + ")"
+                    ;
+
+                    List<String> InfoList = mMainDatabaseManager.getSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING);
+                    if ((InfoList != null) && (InfoList.size() > 1)) {
+                        String deviceNo = InfoList.get(0);
+                        String circuitNo = InfoList.get(1);
+
+                        value = deviceNo
+                                + "("
+
+                                + circuitNo
+                                + ":"
+
+                                + value
+
+                                + ")"
+                        ;
+
+                        mMainDatabaseManager.setSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING, 0, value);
+                    }
+                }
+
+
+//                mMainDatabaseManager.updateSetUsedToSubDeviceOnOff(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_SHADING, position);
             }
             break;
 

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

@@ -316,6 +316,9 @@
     <string name="contoller_kitchen_em_ctrl_option_batch">일괄제어</string>
     <string name="contoller_kitchen_em_ctrl_option_in_order">순차제어</string>
     <string name="contoller_kitchen_em_ctrl_option_in_order_and_reset">순차제어초기화</string>
+
+    <string name="contoller_shading_ctrl_option_curtain">전동커튼</string>
+    <string name="contoller_shading_ctrl_option_screen">롤스크린</string>