|
@@ -698,12 +698,15 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
String strType = InfoList.get(5);
|
|
String strType = InfoList.get(5);
|
|
|
|
|
|
if (Version.getGatewayUsage()) {
|
|
if (Version.getGatewayUsage()) {
|
|
- if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH.equals(strType)) {
|
|
|
|
|
|
+ if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_ALLLIGHT.equals(strType)) {
|
|
batchControllCurrent = 1;
|
|
batchControllCurrent = 1;
|
|
}
|
|
}
|
|
- else if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH.equals(strType)) {
|
|
|
|
|
|
+ else if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_SMART_SWITCH.equals(strType)) {
|
|
batchControllCurrent = 2;
|
|
batchControllCurrent = 2;
|
|
}
|
|
}
|
|
|
|
+ else if (Const.LIGHT_BATCH_CONTROL_TYPE_HDC_LCD_SMART_SWITCH.equals(strType)) {
|
|
|
|
+ batchControllCurrent = 3;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
if (Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH.equals(strType)) {
|
|
if (Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH.equals(strType)) {
|
|
@@ -720,6 +723,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
itemList.add(mActivity.getString(R.string.do_not_used));
|
|
itemList.add(mActivity.getString(R.string.do_not_used));
|
|
|
|
|
|
if (Version.getGatewayUsage()) {
|
|
if (Version.getGatewayUsage()) {
|
|
|
|
+ itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_allight));
|
|
itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_smart_switch));
|
|
itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_smart_switch));
|
|
itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_lcd_smart_switch));
|
|
itemList.add(mActivity.getString(R.string.controller_light_batch_item_common_hdc_lcd_smart_switch));
|
|
}
|
|
}
|
|
@@ -1739,7 +1743,9 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
else {
|
|
else {
|
|
String typeName = null;
|
|
String typeName = null;
|
|
|
|
|
|
- if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH))
|
|
|
|
|
|
+ if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_HDC_ALLLIGHT))
|
|
|
|
+ typeName = Const.LIGHT_BATCH_CONTROL_TYPE_HDC_ALLLIGHT;
|
|
|
|
+ else if (itemNameTempSplit[0].equals(Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_SMART_SWITCH))
|
|
typeName = 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;
|
|
typeName = Const.LIGHT_BATCH_CONTROL_TYPE_COMMON_BATCH_CONTROLLER;
|