|
|
@@ -13,7 +13,6 @@ import java.util.List;
|
|
|
|
|
|
import kr.co.zumo.app.R;
|
|
|
import kr.co.zumo.app.lifeplus.helper.NavigationBar;
|
|
|
-import kr.co.zumo.app.lifeplus.model.LifeplusPreferences;
|
|
|
import kr.co.zumo.app.lifeplus.model.SuperModel;
|
|
|
import kr.co.zumo.app.lifeplus.push.PushMessageBroker;
|
|
|
import kr.co.zumo.app.lifeplus.supervisor.PushMessageManager;
|
|
|
@@ -132,13 +131,20 @@ public class AllMenuDriver implements PushMessageBroker.IPushMessageListener, ID
|
|
|
}
|
|
|
|
|
|
private void dispatchMessage() {
|
|
|
- if (hasMessages()) {
|
|
|
+ if (canDisplayMarker()) {
|
|
|
navigationBar.setNotiMarker(true, true);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private boolean hasMessages() {
|
|
|
- return pushMessageManager.hasMessages() && pushMessageManager.isUnread();
|
|
|
+ private boolean canDisplayMarker() {
|
|
|
+ return (null != pushMessageManager && pushMessageManager.hasMessages() && pushMessageManager.isUnread()) || (SuperModel.getInstance().getPreferences().isAppFirstOpened());
|
|
|
+ }
|
|
|
+
|
|
|
+ /***********************************
|
|
|
+ * public
|
|
|
+ ***********************************/
|
|
|
+ public void updateNoti() {
|
|
|
+ dispatchMessage();
|
|
|
}
|
|
|
|
|
|
/***********************************
|
|
|
@@ -157,11 +163,6 @@ public class AllMenuDriver implements PushMessageBroker.IPushMessageListener, ID
|
|
|
public void onDrawerOpenStart() {
|
|
|
setDefaultAnimationSetting();
|
|
|
showMenuAnimation();
|
|
|
-
|
|
|
- LifeplusPreferences preferences = SuperModel.getInstance().getPreferences();
|
|
|
- if (preferences.getAppFirstOpened()) {
|
|
|
- navigationBar.setNotiMarker(true, true);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
@Override
|