search & article bug fixed

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -86,18 +86,18 @@ public class FgtGameCenter extends BaseFragment {
         backBtn.setVisibility((getActivity() instanceof ActMain) ? View.GONE : View.VISIBLE);
         TitleFragmentListAdapter mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
         mAdapter.add(new FgtPlayGame(), "玩转游戏");
-        mAdapter.add(new com.sheep.gamegroup.view.fragment.FgtGiftCenter(), "礼包中心");
-//        if (EmulatorDetectUtil.isEmulator()) {
-//            mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
-//        } else {
-//            mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
-//        }
-//        mAdapter.add(FgtFindChild.newInstance(new ArticleTag(-1, 1)), "游戏资讯");
-//        if (EmulatorDetectUtil.isEmulator()) {
-//            gameMallFgt = FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
-//        } else {
-//            gameMallFgt = FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
-//        }
+//        mAdapter.add(new com.sheep.gamegroup.view.fragment.FgtGiftCenter(), "礼包中心");
+        if (EmulatorDetectUtil.isEmulator()) {
+            mAdapter.add(FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
+        } else {
+            mAdapter.add(FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_HOME))), "福利中心");
+        }
+        mAdapter.add(FgtFindChild.newInstance(new ArticleTag(-1, 1)), "游戏资讯");
+        if (EmulatorDetectUtil.isEmulator()) {
+            gameMallFgt = FgtWeb.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
+        } else {
+            gameMallFgt = FgtWebX5.newInstance(new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME)));
+        }
 //        mAdapter.add(gameMallFgt, "游戏商城");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);

app/src/main/java/com/sheep/gamegroup/module/search/FgtSearch.java

@@ -142,12 +142,17 @@ public class FgtSearch extends BaseFragment implements ISearch {
                         } catch (JSONException e) {
                             e.printStackTrace();
                             G.showToast("数据解析出错");
+                        }finally {
+                            listView.loadMoreComplete();
+                            listView.refreshComplete();
                         }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast("查询出错：" + baseMessage.getMsg() + " " + baseMessage.getErrorMsg());
+                        listView.loadMoreComplete();
+                        listView.refreshComplete();
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtFindChild.java

@@ -344,11 +344,6 @@ public class FgtFindChild extends BaseListFragment5<Article> {
         @Override
         public void convert(final ViewHolder holder, final Article item) {
             View rootConvertView = holder.itemView;
-            View padding = rootConvertView.findViewById(R.id.padding);
-            if (padding == null) {
-                return;
-            }
-            padding.setVisibility(holder.getAdapterPosition() == 1 ? View.GONE : View.VISIBLE);
             TextView find_item_name = (TextView) rootConvertView.findViewById(R.id.find_item_name);
             TextView find_item_time = (TextView) rootConvertView.findViewById(R.id.find_item_time);
             ImageView find_item_iv = (ImageView) rootConvertView.findViewById(R.id.find_item_iv);
@@ -359,21 +354,21 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ViewUtil.setVisibility(find_item_placement, item.getIs_placement() == 1);
 
             if (item.isGame()) {
-                find_item_download.setVisibility(View.VISIBLE);
+                ViewUtil.setVisibility(find_item_download, View.VISIBLE);
                 Applications findApp = item.getApplication();
                 updateView(findApp, find_item_download);
             } else {
-                find_item_download.setVisibility(View.GONE);
+                ViewUtil.setVisibility(find_item_download, View.GONE);
             }
             ViewUtil.setText(find_item_name, item.getTitle());
             ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");
             ViewUtil.setImage(find_item_iv, item.getPictures());
             ViewUtil.setText(find_item_des, item.getDes());
             item.removeNullTag();
-            if (ListUtil.isEmpty(item.getTages())) {
-                find_item_tags.setVisibility(View.GONE);
+            if (ListUtil.isEmpty(item.getTages()) || find_item_tags == null) {
+                ViewUtil.setVisibility(find_item_tags, View.GONE);
             } else {
-                find_item_tags.setVisibility(View.VISIBLE);
+                ViewUtil.setVisibility(find_item_tags, View.VISIBLE);
                 TagAdapter adapter = new TagAdapter<ArticleTag>(item.getTages()) {
                     @Override
                     public View getView(FlowLayout parent, int position, ArticleTag item) {

app/src/main/res/layout/find_item.xml

@@ -5,15 +5,11 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <View
-        android:id="@+id/padding"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/content_padding_10" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginBottom="@dimen/content_padding"
         android:layout_marginStart="@dimen/content_padding"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:orientation="vertical"