|
|
@@ -26,23 +26,27 @@ public class BucketListActivity extends ActivityBaseScreen {
|
|
|
// 상황에 따라서 id 를 변경해준다.
|
|
|
|
|
|
BucketDeliveryBean bucketDeliveryBean = ActivityDeliveryHelper.getInstance().getPackaging(BucketDeliveryBean.class);
|
|
|
-
|
|
|
- DeliveryHelper helper = getHelper(DeliveryHelper.class);
|
|
|
|
|
|
- BucketWithTagBean bean = bucketDeliveryBean.getBucketWithTagBean();
|
|
|
- BestBucketBean bestBucketBean = bucketDeliveryBean.getBestBucketBean();
|
|
|
+ int id = 0;
|
|
|
|
|
|
- if (null != bean) {
|
|
|
- helper.setPackaging(bean);
|
|
|
- }
|
|
|
- else {
|
|
|
- helper.setPackaging(bestBucketBean);
|
|
|
- }
|
|
|
+ if(bucketDeliveryBean != null) {
|
|
|
+ DeliveryHelper helper = getHelper(DeliveryHelper.class);
|
|
|
+
|
|
|
+ BucketWithTagBean bean = bucketDeliveryBean.getBucketWithTagBean();
|
|
|
+ BestBucketBean bestBucketBean = bucketDeliveryBean.getBestBucketBean();
|
|
|
+
|
|
|
+ if (null != bean) {
|
|
|
+ helper.setPackaging(bean);
|
|
|
+ } else {
|
|
|
+ helper.setPackaging(bestBucketBean);
|
|
|
+ }
|
|
|
+
|
|
|
+ id = bucketDeliveryBean.getScreenId();
|
|
|
|
|
|
- int id = bucketDeliveryBean.getScreenId();
|
|
|
|
|
|
- if (id == ScreenID.BUCKET_DETAIL && null != bean && null != bean.getTagList() && bean.getTagList().size() > 0) {
|
|
|
- id = ScreenID.BUCKET_DETAIL_WITH_TAG;
|
|
|
+ if (id == ScreenID.BUCKET_DETAIL && null != bean && null != bean.getTagList() && bean.getTagList().size() > 0) {
|
|
|
+ id = ScreenID.BUCKET_DETAIL_WITH_TAG;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (id == 0 || id == ScreenID.NONE) {
|