Explorar el Código

收货地址接口数据兼容

zengjiebin hace 7 años
padre
commit
e8a88e60e7

+ 16 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/IDBean.java

@@ -0,0 +1,16 @@
+package com.sheep.gamegroup.model.entity;
+
+/**
+ * Created by realicing on 2018/12/28.
+ * realicing@sina.com
+ */
+public interface IDBean {
+    static boolean isNull(IDBean idBean) {
+        return idBean == null || idBean.getId() == 0;
+    }
+    static boolean isErro(IDBean idBean) {
+        return idBean == null || idBean.getId() <= 0;
+    }
+
+    int getId();
+}

+ 11 - 1
app/src/main/java/com/sheep/gamegroup/module/user/model/UserAddressInfo.java

@@ -1,12 +1,14 @@
 package com.sheep.gamegroup.module.user.model;
 
+import com.sheep.gamegroup.model.entity.IDBean;
+
 import java.util.List;
 
 /**
  * Created by realicing on 2018/12/28.
  * realicing@sina.com
  */
-public class UserAddressInfo {
+public class UserAddressInfo implements IDBean {
     private List<Area> area;
     private UserAddress userAddress;
 
@@ -25,4 +27,12 @@ public class UserAddressInfo {
     public void setUserAddress(UserAddress userAddress) {
         this.userAddress = userAddress;
     }
+
+    @Override
+    public int getId() {
+        if(userAddress != null){
+            return userAddress.getId();
+        }
+        return 0;
+    }
 }

+ 12 - 6
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -35,6 +35,7 @@ import com.sheep.gamegroup.model.entity.DiscoveryVideo;
 import com.sheep.gamegroup.model.entity.GameListTag;
 import com.sheep.gamegroup.model.entity.GameListType;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.IDBean;
 import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.Mission;
 import com.sheep.gamegroup.model.entity.NewbieTask;
@@ -56,6 +57,7 @@ import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.module.user.activity.ActVip;
+import com.sheep.gamegroup.module.user.model.UserAddressInfo;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsResp;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
@@ -1592,12 +1594,16 @@ public class Jump2View {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        String content = activity.getString(R.string.yf_shop_ask_tip, mission.getExtra());
-                        ViewUtil.showYfShopAsk(activity, "前\t往", content, dialog -> {
-                            Jump2View.getInstance().goActUserAddrInfo(activity);
-                            USER_INFO_ADDR.onEvent();
-                        });
-
+                        UserAddressInfo userAddressInfo = baseMessage.getData(UserAddressInfo.class);
+                        if(IDBean.isNull(userAddressInfo)) {
+                            onError(baseMessage);
+                        } else {
+                            String content = activity.getString(R.string.yf_shop_ask_tip, mission.getExtra());
+                            ViewUtil.showYfShopAsk(activity, "前\t往", content, dialog -> {
+                                Jump2View.getInstance().goActUserAddrInfo(activity);
+                                USER_INFO_ADDR.onEvent();
+                            });
+                        }
                     }
 
                     @Override