|
@@ -577,7 +577,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
|
if (Const.CONTROLLER_SETTING_DO_USED.equals(InfoList.get(3))) {
|
|
|
String strType = InfoList.get(5);
|
|
|
|
|
|
- if (Const.VENTILATION_TYPE_COMMON.equals(strType)) {
|
|
|
+ if (Const.VENTILATION_TYPE_OLD_COMMON.equals(strType)) {
|
|
|
ventilationCurrent = 1;
|
|
|
}
|
|
|
else if (Const.VENTILATION_TYPE_LH.equals(strType)) {
|
|
@@ -586,15 +586,27 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
|
else if (Const.VENTILATION_TYPE_HOOD.equals(strType)) {
|
|
|
ventilationCurrent = 3;
|
|
|
}
|
|
|
+ //2022.10.11 이전에는 기본이 존재함
|
|
|
+ //현재는 현재 사용하는 프로토콜
|
|
|
+ else if (Const.VENTILATION_TYPE_COMMON.equals(strType)) {
|
|
|
+ ventilationCurrent = 4;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ //2022.10.11 이전에는 기본이 존재함
|
|
|
+ // 현재는 현재 사용하는 프로토콜
|
|
|
+ ventilationCurrent = 1;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
List<String> itemList = new ArrayList<String>();
|
|
|
itemList.add(mActivity.getString(R.string.do_not_used));
|
|
|
- itemList.add(mActivity.getString(R.string.contoller_ventilation_item_common));
|
|
|
+ itemList.add(mActivity.getString(R.string.contoller_ventilation_item_old_common));
|
|
|
itemList.add(mActivity.getString(R.string.contoller_ventilation_item_lh));
|
|
|
itemList.add(mActivity.getString(R.string.contoller_ventilation_item_hood));
|
|
|
+ itemList.add(mActivity.getString(R.string.contoller_ventilation_item_common));
|
|
|
|
|
|
String controllerName = mActivity.getString(R.string.contoller_ventilation);
|
|
|
controllerVO = new ControllerVO(type
|
|
@@ -1614,12 +1626,14 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
|
else {
|
|
|
String typeName = null;
|
|
|
|
|
|
- if (itemName.equals(Const.VENTILATION_TYPE_COMMON))
|
|
|
- typeName = Const.VENTILATION_TYPE_COMMON;
|
|
|
+ if (itemName.equals(Const.VENTILATION_TYPE_OLD_COMMON))
|
|
|
+ typeName = Const.VENTILATION_TYPE_OLD_COMMON;
|
|
|
else if (itemName.equals(Const.VENTILATION_TYPE_LH))
|
|
|
typeName = Const.VENTILATION_TYPE_LH;
|
|
|
else if (itemName.equals(Const.VENTILATION_TYPE_HOOD))
|
|
|
typeName = Const.VENTILATION_TYPE_HOOD;
|
|
|
+ else if (itemName.equals(Const.VENTILATION_TYPE_COMMON))
|
|
|
+ typeName = Const.VENTILATION_TYPE_COMMON;
|
|
|
|
|
|
value += "("
|
|
|
+ Const.CONTROLLER_SETTING_DO_USED
|