|
|
@@ -454,7 +454,15 @@ public abstract class Presenter<M extends Model, V extends IView> implements ILi
|
|
|
|
|
|
protected void go(@ScreenID.ID @IntRange(from = 0, to = 1000) int id, @ScreenID.Direction int direction) {
|
|
|
// id hooking for system check
|
|
|
- if (SystemPopupModelHelper.getInstance().check(id)) {
|
|
|
+ if (ScreenID.UTILITY_ACTIVITY == id) {
|
|
|
+ // UTILITY_ACTIVITY 는 실제 screenId 로 체크해줌.
|
|
|
+ UtilityActivityBean utilityActivityBean = model.getDeliveryPackaging(UtilityActivityBean.class);
|
|
|
+ if (SystemPopupModelHelper.getInstance().check(utilityActivityBean.getScreenId())) {
|
|
|
+ model.setDeliveryPackaging(SystemPopupModelHelper.getInstance().getMatchedBean());
|
|
|
+ id = ScreenID.SYSTEM_CHECK;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else if (SystemPopupModelHelper.getInstance().check(id)) {
|
|
|
model.setDeliveryPackaging(SystemPopupModelHelper.getInstance().getMatchedBean());
|
|
|
id = ScreenID.SYSTEM_CHECK;
|
|
|
}
|