|
@@ -283,6 +283,13 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
public int m_ToTalPage = 0;
|
|
public int m_ToTalPage = 0;
|
|
private int nDistributionPanelType = Version.DISTRIBUTION_MODEL.NON_USE;
|
|
private int nDistributionPanelType = Version.DISTRIBUTION_MODEL.NON_USE;
|
|
private boolean bBathSensorUse = false;
|
|
private boolean bBathSensorUse = false;
|
|
|
|
+ private boolean bRoomNameEditV2Usage = false;
|
|
|
|
+
|
|
|
|
+ private boolean isSubWallPad = false; //subwallPad 사용 여부 (TRUE : 사용 , FASLE : 사용안함)
|
|
|
|
+ boolean internetUse = false;
|
|
|
|
+ boolean mNewDanjiServer = false;
|
|
|
|
+ int nLightType = WallpadDeviceSet.REMOTECTRL_BASIC_LIGHT;
|
|
|
|
+ boolean easyModeUse = false;
|
|
|
|
|
|
private void initInfo() {
|
|
private void initInfo() {
|
|
try {
|
|
try {
|
|
@@ -297,10 +304,17 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
int noiseUse = wpddevset.Get_NoiseSensor_Use();
|
|
int noiseUse = wpddevset.Get_NoiseSensor_Use();
|
|
nDistributionPanelType = wpddevset.Get_DistributionPannelType_Info();
|
|
nDistributionPanelType = wpddevset.Get_DistributionPannelType_Info();
|
|
bBathSensorUse = wpddevset.Get_BathSensorUse();
|
|
bBathSensorUse = wpddevset.Get_BathSensorUse();
|
|
- Log.i(TAG, "[initInfo] bBathSensorUse [" + bBathSensorUse + "]");
|
|
|
|
|
|
+ bRoomNameEditV2Usage = wpddevset.Get_RoomNameEditUse();
|
|
|
|
+ isSubWallPad = wpddevset.GetSubWpdUse(); // 월패드 종류 (TRUE: Sub / FALSE: Main)
|
|
|
|
+ internetUse = wpddevset.Get_NonInternetSupportUse();
|
|
|
|
+ mNewDanjiServer = wpddevset.GetNewDanjiServer();
|
|
|
|
+ nLightType = wpddevset.Get_RemoteCtrl_LightType();
|
|
|
|
+ easyModeUse = wpddevset.Get_EasyModeUX_Support();
|
|
|
|
+
|
|
//String[] getData = null;
|
|
//String[] getData = null;
|
|
//getData = wpddevset.GetSettingData("site_code");
|
|
//getData = wpddevset.GetSettingData("site_code");
|
|
wpddevset.closeDB();
|
|
wpddevset.closeDB();
|
|
|
|
+ Log.i(TAG, "[initInfo] bBathSensorUse [" + bBathSensorUse + "], bRoomNameEditV2Usage [" + bRoomNameEditV2Usage + "]");
|
|
|
|
|
|
/*String SiteCode = "";
|
|
/*String SiteCode = "";
|
|
if(getData.length == 2)
|
|
if(getData.length == 2)
|
|
@@ -348,12 +362,18 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
SettingData.add(data);
|
|
SettingData.add(data);
|
|
setting_manual_str += "SLEEP_TIME:" + SettingData.size() + "/";
|
|
setting_manual_str += "SLEEP_TIME:" + SettingData.size() + "/";
|
|
|
|
|
|
- data = new SetKind( TYPE_CHECKBOX , ConfingSettingMainID.button.ALARM_SOUND_CHECKBOX_USE , ConfingSettingMainID.button.ALARM_SOUND_CHECKBOX_NOTUSE , TXT_ALARM_SOUND );
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "NOTI_SOUND:" + SettingData.size() + "/";
|
|
|
|
- data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.CAR_SOUND_CHECKBOX_USE , ConfingSettingMainID.button.CAR_SOUND_CHECKBOX_NOTUSE , TXT_CAR_SOUND);
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "CAR_ARRIVAL_SND:" + SettingData.size() + "/";
|
|
|
|
|
|
+ if(!isSubWallPad)
|
|
|
|
+ {
|
|
|
|
+ data = new SetKind( TYPE_CHECKBOX , ConfingSettingMainID.button.ALARM_SOUND_CHECKBOX_USE , ConfingSettingMainID.button.ALARM_SOUND_CHECKBOX_NOTUSE , TXT_ALARM_SOUND );
|
|
|
|
+ SettingData.add(data);
|
|
|
|
+ setting_manual_str += "NOTI_SOUND:" + SettingData.size() + "/";
|
|
|
|
+
|
|
|
|
+ data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.CAR_SOUND_CHECKBOX_USE , ConfingSettingMainID.button.CAR_SOUND_CHECKBOX_NOTUSE , TXT_CAR_SOUND);
|
|
|
|
+ SettingData.add(data);
|
|
|
|
+ setting_manual_str += "CAR_ARRIVAL_SND:" + SettingData.size() + "/";
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
if (MainActivity.bRemoteCallUse) {
|
|
if (MainActivity.bRemoteCallUse) {
|
|
data = new SetKind(TYPE_CHECKBOX, ConfingSettingMainID.button.CALL_SOUND_CHECKBOX_USE, ConfingSettingMainID.button.CALL_SOUND_CHECKBOX_NOTUSE, TXT_CALL_SOUND);
|
|
data = new SetKind(TYPE_CHECKBOX, ConfingSettingMainID.button.CALL_SOUND_CHECKBOX_USE, ConfingSettingMainID.button.CALL_SOUND_CHECKBOX_NOTUSE, TXT_CALL_SOUND);
|
|
@@ -394,59 +414,71 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
setting_manual_str += "NOISE_USE:" + SettingData.size() + "/";
|
|
setting_manual_str += "NOISE_USE:" + SettingData.size() + "/";
|
|
}
|
|
}
|
|
|
|
|
|
- data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.AS_CALL , 0 , TXT_AS_CALL );
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "AS_REGI:" + SettingData.size() + "/";
|
|
|
|
|
|
+ if(!isSubWallPad)
|
|
|
|
+ {
|
|
|
|
+ //data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.AS_CALL , 0 , TXT_AS_CALL );
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ }
|
|
|
|
+ //setting_manual_str += "AS_REGI:" + SettingData.size() + "/";
|
|
|
|
|
|
- if (Version.getModelType() != Version.MODEL_TYPE.IHN_750) {
|
|
|
|
|
|
+ if (Version.getModelType() != Version.MODEL_TYPE.IHN_750 && !bRoomNameEditV2Usage && !isSubWallPad) {
|
|
data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.NAME_SET , 0 , TXT_ROOM_NAME );
|
|
data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.NAME_SET , 0 , TXT_ROOM_NAME );
|
|
SettingData.add(data);
|
|
SettingData.add(data);
|
|
setting_manual_str += "ROOMNAME_SET:" + SettingData.size() + "/";
|
|
setting_manual_str += "ROOMNAME_SET:" + SettingData.size() + "/";
|
|
}
|
|
}
|
|
|
|
|
|
- WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
|
|
|
|
- boolean internetUse = wds.Get_NonInternetSupportUse();
|
|
|
|
- boolean mNewDanjiServer = wds.GetNewDanjiServer();
|
|
|
|
- wds.closeDB();
|
|
|
|
-
|
|
|
|
- if (!internetUse) {
|
|
|
|
- data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_USE , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_NOTUSE , TXT_RMOTE_CONTROL );
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "REMOTE_CTR:" + SettingData.size() + "/";
|
|
|
|
|
|
+ if (!internetUse && !isSubWallPad) {
|
|
|
|
+ //data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_USE , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_NOTUSE , TXT_RMOTE_CONTROL );
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "REMOTE_CTR:" + SettingData.size() + "/";
|
|
|
|
|
|
if (mNewDanjiServer) {
|
|
if (mNewDanjiServer) {
|
|
- data = new SetKind( TYPE_BUTTON_WEBPWD , ConfingSettingMainID.button.WEB_CTR_PWD , 0 , TXT_WEB_CTR_PWD );
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "WEB_CTR_PWD:" + SettingData.size() + "/";
|
|
|
|
|
|
+ //data = new SetKind( TYPE_BUTTON_WEBPWD , ConfingSettingMainID.button.WEB_CTR_PWD , 0 , TXT_WEB_CTR_PWD );
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "WEB_CTR_PWD:" + SettingData.size() + "/";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ if(!isSubWallPad)
|
|
|
|
+ {
|
|
|
|
+ //data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.AS_CALL , 0 , TXT_AS_CALL );
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "AS_REGI:" + SettingData.size() + "/";
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ if (!internetUse && !isSubWallPad) {
|
|
|
|
+ //data = new SetKind(TYPE_CHECKBOX, ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_USE, ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_NOTUSE, TXT_RMOTE_CONTROL);
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "REMOTE_CTR:" + SettingData.size() + "/";
|
|
|
|
+
|
|
|
|
+ //data = new SetKind(TYPE_BUTTON_WEBPWD, ConfingSettingMainID.button.WEB_CTR_PWD, 0, TXT_WEB_CTR_PWD);
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "WEB_CTR_PWD:" + SettingData.size() + "/";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
if ((Version.getModelType() == Version.MODEL_TYPE.IHN_D101 || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I || Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_LX2
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101K || Version.getModelType() == Version.MODEL_TYPE.IHN_D101K_I
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
|
|
|| Version.getModelType() == Version.MODEL_TYPE.IHN_D101_I_OCF)
|
|
&& (nDistributionPanelType == Version.DISTRIBUTION_MODEL.SMART_DIST))
|
|
&& (nDistributionPanelType == Version.DISTRIBUTION_MODEL.SMART_DIST))
|
|
{
|
|
{
|
|
- WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
|
|
|
|
- boolean internetUse = wds.Get_NonInternetSupportUse();
|
|
|
|
- int nLightType = WallpadDeviceSet.REMOTECTRL_BASIC_LIGHT;
|
|
|
|
- nLightType = wds.Get_RemoteCtrl_LightType();
|
|
|
|
- wds.closeDB();
|
|
|
|
|
|
|
|
- if (!internetUse) {
|
|
|
|
- data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_USE , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_NOTUSE , TXT_RMOTE_CONTROL);
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "REMOTE_CTR:" + SettingData.size() + "/";
|
|
|
|
|
|
|
|
- data = new SetKind(TYPE_BUTTON_WEBPWD , ConfingSettingMainID.button.WEB_CTR_PWD , 0 , TXT_WEB_CTR_PWD);
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "WEB_CTR_PWD:" + SettingData.size() + "/";
|
|
|
|
|
|
+ if (!internetUse) {
|
|
|
|
+// data = new SetKind(TYPE_CHECKBOX , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_USE , ConfingSettingMainID.button.REMOTE_CONTROL_CHECKBOX_NOTUSE , TXT_RMOTE_CONTROL);
|
|
|
|
+// SettingData.add(data);
|
|
|
|
+// setting_manual_str += "REMOTE_CTR:" + SettingData.size() + "/";
|
|
|
|
+//
|
|
|
|
+// data = new SetKind(TYPE_BUTTON_WEBPWD , ConfingSettingMainID.button.WEB_CTR_PWD , 0 , TXT_WEB_CTR_PWD);
|
|
|
|
+// SettingData.add(data);
|
|
|
|
+// setting_manual_str += "WEB_CTR_PWD:" + SettingData.size() + "/";
|
|
|
|
|
|
if (nLightType == WallpadDeviceSet.REMOTECTRL_USER_SELECT) {
|
|
if (nLightType == WallpadDeviceSet.REMOTECTRL_USER_SELECT) {
|
|
// 스마트조명 지원여부가 사용자선택인 경우
|
|
// 스마트조명 지원여부가 사용자선택인 경우
|
|
- data = new SetKind(TYPE_CHECKBOX_SMARTLIGHT , ConfingSettingMainID.button.REMOTE_CONTROL_LIGHT_CHECKBOX_SMART, ConfingSettingMainID.button.REMOTE_CONTROL_LIGHT_CHECKBOX_NORMAL, TXT_RMOTE_SMARTLIGHT_CONTROL);
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "REMOTE_CTR_SMARTLIGHT:" + SettingData.size() + "/";
|
|
|
|
|
|
+ //data = new SetKind(TYPE_CHECKBOX_SMARTLIGHT , ConfingSettingMainID.button.REMOTE_CONTROL_LIGHT_CHECKBOX_SMART, ConfingSettingMainID.button.REMOTE_CONTROL_LIGHT_CHECKBOX_NORMAL, TXT_RMOTE_SMARTLIGHT_CONTROL);
|
|
|
|
+ //SettingData.add(data);
|
|
|
|
+ //setting_manual_str += "REMOTE_CTR_SMARTLIGHT:" + SettingData.size() + "/";
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -456,10 +488,6 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
setting_manual_str += "SMARTLIGHT_APP:" + SettingData.size() + "/";
|
|
setting_manual_str += "SMARTLIGHT_APP:" + SettingData.size() + "/";
|
|
}
|
|
}
|
|
|
|
|
|
- WallpadDeviceSet wds = new WallpadDeviceSet(getContext());
|
|
|
|
- boolean easyModeUse = wds.Get_EasyModeUX_Support();
|
|
|
|
- wds.closeDB();
|
|
|
|
-
|
|
|
|
if (easyModeUse) {
|
|
if (easyModeUse) {
|
|
data = new SetKind(TYPE_CHECKBOX, ConfingSettingMainID.button.EASYMODE_CHECKBOX_USE, ConfingSettingMainID.button.EASYMODE_CHECKBOX_NOTUSE, TXT_EASYMODE);
|
|
data = new SetKind(TYPE_CHECKBOX, ConfingSettingMainID.button.EASYMODE_CHECKBOX_USE, ConfingSettingMainID.button.EASYMODE_CHECKBOX_NOTUSE, TXT_EASYMODE);
|
|
SettingData.add(data);
|
|
SettingData.add(data);
|
|
@@ -876,17 +904,17 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
}
|
|
}
|
|
|
|
|
|
//page 버튼 disable
|
|
//page 버튼 disable
|
|
- if (page == m_ToTalPage) {
|
|
|
|
- Btn_NextPage.setButtonEventOffEnable(R.drawable.add_notice_btn_down_disable);
|
|
|
|
- Btn_PrevPage.setButtonEventOffDisable();
|
|
|
|
- }
|
|
|
|
- else if (page == 1) {
|
|
|
|
- Btn_PrevPage.setButtonEventOffEnable(R.drawable.add_notice_btn_up_disable);
|
|
|
|
- Btn_NextPage.setButtonEventOffDisable();
|
|
|
|
- }
|
|
|
|
- else if (page > 1 && page < m_ToTalPage) {
|
|
|
|
- Btn_PrevPage.setButtonEventOffDisable();
|
|
|
|
- Btn_NextPage.setButtonEventOffDisable();
|
|
|
|
|
|
+ if (SettingData.size() > 6) {
|
|
|
|
+ if (page == m_ToTalPage) {
|
|
|
|
+ Btn_NextPage.setButtonEventOffEnable(R.drawable.add_notice_btn_down_disable);
|
|
|
|
+ Btn_PrevPage.setButtonEventOffDisable();
|
|
|
|
+ } else if (page == 1) {
|
|
|
|
+ Btn_PrevPage.setButtonEventOffEnable(R.drawable.add_notice_btn_up_disable);
|
|
|
|
+ Btn_NextPage.setButtonEventOffDisable();
|
|
|
|
+ } else if (page > 1 && page < m_ToTalPage) {
|
|
|
|
+ Btn_PrevPage.setButtonEventOffDisable();
|
|
|
|
+ Btn_NextPage.setButtonEventOffDisable();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} catch (RuntimeException re) {
|
|
} catch (RuntimeException re) {
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
@@ -1183,11 +1211,12 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
LogUtil.errorLogInfo("", TAG,ex);
|
|
LogUtil.errorLogInfo("", TAG,ex);
|
|
}
|
|
}
|
|
|
|
|
|
- SetKind data = new SetKind(TYPE_BUTTON , ConfingSettingMainID.button.AS_CALL , 0 , TXT_AS_CALL );
|
|
|
|
- SettingData.add(data);
|
|
|
|
- setting_manual_str += "AS_REGI:" + SettingData.size() + "/";
|
|
|
|
|
|
+// SetKind data = new SetKind(TYPE_BUTTON , ConfingSettingMainID.button.AS_CALL , 0 , TXT_AS_CALL );
|
|
|
|
+// SettingData.add(data);
|
|
|
|
+// setting_manual_str += "AS_REGI:" + SettingData.size() + "/";
|
|
|
|
|
|
- if (Version.getModelType() != Version.MODEL_TYPE.IHN_750 ) {
|
|
|
|
|
|
+ SetKind data;
|
|
|
|
+ if (Version.getModelType() != Version.MODEL_TYPE.IHN_750 && bRoomNameEditV2Usage && !isSubWallPad) {
|
|
data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.NAME_SET , 0 , TXT_ROOM_NAME );
|
|
data = new SetKind( TYPE_BUTTON , ConfingSettingMainID.button.NAME_SET , 0 , TXT_ROOM_NAME );
|
|
SettingData.add(data);
|
|
SettingData.add(data);
|
|
setting_manual_str += "ROOMNAME_SET:" + SettingData.size() + "/";
|
|
setting_manual_str += "ROOMNAME_SET:" + SettingData.size() + "/";
|
|
@@ -1760,7 +1789,7 @@ public class ConfigSettingMainScreen extends WpadScreen {
|
|
wd.SetWallPadMasterVolume(mVolumeLevel);
|
|
wd.SetWallPadMasterVolume(mVolumeLevel);
|
|
wd.closeDB();
|
|
wd.closeDB();
|
|
|
|
|
|
- Sound().PlayMent(SND.bell.FRONT);
|
|
|
|
|
|
+ //Sound().PlayMent(SND.bell.FRONT);
|
|
|
|
|
|
//Log.i(TAG, "Change : " + smartKeyRfDoorAPI.SetSensorConfig((byte)mVolumeLevel, (byte)(mVolumeLevel*2) ) );
|
|
//Log.i(TAG, "Change : " + smartKeyRfDoorAPI.SetSensorConfig((byte)mVolumeLevel, (byte)(mVolumeLevel*2) ) );
|
|
//Log.i(TAG, "Setting : " + smartKeyRfDoorAPI.SetSensorConfig((byte)0xFF, (byte)0xFF) );
|
|
//Log.i(TAG, "Setting : " + smartKeyRfDoorAPI.SetSensorConfig((byte)0xFF, (byte)0xFF) );
|