Selaa lähdekoodia

fixbug:搜索页面解析数据错误的情况

Sora 1 vuosi sitten
vanhempi
commit
1c1d6d9a44

+ 23 - 21
app/src/main/java/com/sheep/gamegroup/module/search/FgtSearch.java

@@ -133,28 +133,30 @@ public class FgtSearch extends BaseFragment implements ISearch {
                             if (base.has("roleCount")) {
                                 roleCount += base.getInt("roleCount");
                             }
-                            JSONArray array = base.getJSONArray("list");
-                            for (int i = 0; i < array.length(); i++) {
-                                JSONObject object = array.getJSONObject(i);
-                                SearchItem item = new SearchItem();
-                                item.type = object.getInt("type");
-                                item.data = object.getString("data");
-                                if (item.type == 1) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, Applications.class);
-                                } else if (item.type == 2) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, TaskSimple.class);
-                                } else if (item.type == 3) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, GiftBagApp.class);
-                                } else if (item.type == 4) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, Article.class);
-                                } else if (item.type == 5) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, ShopGoodsInfo.class);
-                                } else if (item.type == 6) {
-                                    item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, GameAvatar.class);
-                                } else {
-                                    continue;
+                            if (base.has("list")) {
+                                JSONArray array = base.getJSONArray("list");
+                                for (int i = 0; i < array.length(); i++) {
+                                    JSONObject object = array.getJSONObject(i);
+                                    SearchItem item = new SearchItem();
+                                    item.type = object.getInt("type");
+                                    item.data = object.getString("data");
+                                    if (item.type == 1) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, Applications.class);
+                                    } else if (item.type == 2) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, TaskSimple.class);
+                                    } else if (item.type == 3) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, GiftBagApp.class);
+                                    } else if (item.type == 4) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, Article.class);
+                                    } else if (item.type == 5) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, ShopGoodsInfo.class);
+                                    } else if (item.type == 6) {
+                                        item.object = com.alibaba.fastjson.JSONObject.parseObject(item.data, GameAvatar.class);
+                                    } else {
+                                        continue;
+                                    }
+                                    items.add(item);
                                 }
-                                items.add(item);
                             }
                             if (isRefresh) {
                                 listAdapter.setItems(items);

+ 4 - 3
app/src/main/java/com/sheep/gamegroup/view/adapter/GiftCenterAdapter.java

@@ -16,6 +16,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GiftBag;
 import com.sheep.gamegroup.model.entity.GiftBagApp;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.StringUtils;
@@ -105,9 +106,9 @@ public class GiftCenterAdapter extends AdbCommonRecycler<GiftBagApp> {
 
     public static void receiveGiftBag(final Activity activity, final GiftBagApp item, final Action1<Integer> action1) {
         if (UserInfoDataSource.getInstance().hasLogin(activity)) {
-//            if (!CommonUtil.getInstance().isInstallApp(item.getApp().getPackage_name(), item.getApp().getName())) {
-//                return;
-//            }
+            if (!CommonUtil.getInstance().isInstallApp(item.getApp().getPackage_name(), item.getApp().getName())) {
+                return;
+            }
             int gift_bag_id = item.getGift_bag().getId();
             GIFT_BAG_RECEIVE.onEvent("gift_bag_id", gift_bag_id);
             SheepApp.getInstance().getNetComponent().getApiService().receiveGiftBag(gift_bag_id)