banner & news ad update

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

@@ -28,6 +28,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
@@ -243,7 +244,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
     }
 
     @Override
-    public void pluginLoadData(Action1 action){
+    public void pluginLoadData(Action1 action) {
         CommonUtil.getInstance().refreshAds(SheepAd.FORM_NEWS, (ret, list) -> {
             if (ret) {
                 ads = list;
@@ -380,7 +381,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             if (item == null) {
                 return;
             }
-            if (item.getType() == -1) {
+            if (item.getType() == -1 || item.getType() == -2) {
                 adConverter.convert(holder, item);
             } else if (item.getType() == 2 && newsConverter != null) {
                 newsConverter.convert(holder, item);
@@ -435,6 +436,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
                 }
             }
             rootConvertView.setOnClickListener(view -> onClickItem(item));
+            LogUtil.logI("commonflag:  " + item.getTitle() + "  " + item.getType());
         }
     }
 
@@ -452,6 +454,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");
             ViewUtil.setImage(find_item_iv, item.getPictures());
             rootConvertView.setOnClickListener(view -> onClickItem(item));
+            LogUtil.logI("newsflag:  " + item.getTitle() + "  " + item.getType());
         }
     }
 
@@ -467,7 +470,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ViewUtil.setText(find_item_name, item.getTitle());
             ViewUtil.setImage(find_item_iv, item.getPictures());
             item.removeNullTag();
-
+            LogUtil.logI("adflag:  " + item.getTitle() + "  " + item.getType());
             rootConvertView.setOnClickListener(view -> AdHelper.goAdLink(getActivity(), item.getMemo(SheepAd.class)));
         }
     }

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

@@ -148,6 +148,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     public static WeakReference<View> listRef;
 
+    @BindView(R.id.banner_ad_flag)
+    View banner_ad_flag;
     @BindView(R.id.home_list_progress_block)
     View home_list_progress_block;
     @BindView(R.id.home_list_progress_bar)
@@ -789,7 +791,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
         List<SheepAd> list = DDProviderHelper.getInstance().listSheepAd(SheepAd.FORM_HOME_BAR);
         barListList.clear();
-        barListList.addAll(list);
+        if (list.size() > 0) {
+            barListList.add(list.get(0));
+        }
         ViewUtil.notifyDataSetChanged(bar_list_rv);
         //首页list
         List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
@@ -1267,20 +1271,37 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         //结束轮播
         banner.stopAutoPlay();
         banner.setVisibility(View.VISIBLE);
-        //设置图片加载器
-        banner.setImageLoader(new ImageLoader() {
+        banner.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+
+            }
+
             @Override
-            public void displayImage(Context context, Object o, ImageView imageView) {
-                try {
-                    if (activity != null && !activity.isDestroyed()) {
+            public void onPageSelected(int i) {
+                ViewUtil.setVisibility(banner_ad_flag, list.get(i).getUser_type() == 2);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
+        //设置图片加载器
+        banner
+                .setImageLoader(new ImageLoader() {
+                    @Override
+                    public void displayImage(Context context, Object o, ImageView imageView) {
+                        try {
+                            if (activity != null && !activity.isDestroyed()) {
 //                        GlideImageLoader.roundedCornersImage(imageView, ((SlideshowEty) o).getUrl(), G.getRealPix(10));
-                        Glide.with(context).load(o.toString()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(8)))).into(imageView);
+                                Glide.with(context).load(o.toString()).apply(new RequestOptions().centerCrop().transform(new RoundedCorners(G.getRealPix(8)))).into(imageView);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        })
+                })
                 .setDelayTime(4000)
                 .setBannerStyle(BannerConfig.CIRCLE_INDICATOR_TITLE_INSIDE)
                 //设置图片集合

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

@@ -38,6 +38,20 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@id/check_net_ll" />
 
+                <TextView
+                    android:id="@+id/banner_ad_flag"
+                    android:visibility="gone"
+                    android:text="广告"
+                    android:textSize="10sp"
+                    android:textColor="@color/white"
+                    android:layout_alignTop="@+id/banner"
+                    android:layout_alignRight="@+id/banner"
+                    android:layout_margin="12dp"
+                    android:background="#50000000"
+                    android:gravity="center"
+                    android:layout_width="30dp"
+                    android:layout_height="16dp" />
+
                 <LinearLayout
                     android:id="@+id/home_notice_ll"
                     android:layout_width="match_parent"