|
@@ -552,18 +552,21 @@ public class Homehub extends CustomActivity implements View.OnClickListener,
|
|
|
mHomehubUpdateLayout.setVisibility(View.GONE);
|
|
mHomehubUpdateLayout.setVisibility(View.GONE);
|
|
|
} else {
|
|
} else {
|
|
|
// 펌웨어, 소프트웨어 모두 업데이트가 있을 시 펌웨어 업데이트 먼저 진행.
|
|
// 펌웨어, 소프트웨어 모두 업데이트가 있을 시 펌웨어 업데이트 먼저 진행.
|
|
|
- if (!currentFirmwareVer.equals(recentFirmwareVer)) {
|
|
|
|
|
|
|
+ if (!"".equals(recentFirmwareVer) && !"".equals(currentFirmwareVer)
|
|
|
|
|
+ && !currentFirmwareVer.equals(recentFirmwareVer)) {
|
|
|
mHomehubUpdateText.setText(getString(R.string.layout_homehub_13, getString(R.string.layout_homehub_07),
|
|
mHomehubUpdateText.setText(getString(R.string.layout_homehub_13, getString(R.string.layout_homehub_07),
|
|
|
recentFirmwareVer));
|
|
recentFirmwareVer));
|
|
|
mHomehubUpdateButton.setTag(Constants.HOMEHUB_FIRMWARE_UPDATE);
|
|
mHomehubUpdateButton.setTag(Constants.HOMEHUB_FIRMWARE_UPDATE);
|
|
|
- } else if (!currentSoftwareVer.equals(recentSoftwareVer)) {
|
|
|
|
|
|
|
+ mHomehubUpdateLayout.setVisibility(View.VISIBLE);
|
|
|
|
|
+ } else if (!"".equals(recentSoftwareVer) && !"".equals(currentSoftwareVer)
|
|
|
|
|
+ && !currentSoftwareVer.equals(recentSoftwareVer)) {
|
|
|
mHomehubUpdateText.setText(getString(R.string.layout_homehub_13, getString(R.string.layout_homehub_09),
|
|
mHomehubUpdateText.setText(getString(R.string.layout_homehub_13, getString(R.string.layout_homehub_09),
|
|
|
recentSoftwareVer));
|
|
recentSoftwareVer));
|
|
|
mHomehubUpdateButton.setTag(Constants.HOMEHUB_SOFTWARE_UPDATE);
|
|
mHomehubUpdateButton.setTag(Constants.HOMEHUB_SOFTWARE_UPDATE);
|
|
|
|
|
+ mHomehubUpdateLayout.setVisibility(View.VISIBLE);
|
|
|
} else {
|
|
} else {
|
|
|
-
|
|
|
|
|
|
|
+ mHomehubUpdateLayout.setVisibility(View.GONE);
|
|
|
}
|
|
}
|
|
|
- mHomehubUpdateLayout.setVisibility(View.VISIBLE);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|