删除鸿途信达广告

app/build.gradle

@@ -461,7 +461,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.0.1'
 
     //鸿途信达 广告sdk
-    implementation(name: 'ad-htxd-201901071720', ext: 'aar')
+//    implementation(name: 'ad-htxd-201901071720', ext: 'aar')
 
     //切换皮肤框架 https://github.com/ximsfei/Android-skin-support
 

app/src/main/java/com/sheep/gamegroup/module/ad_htxd/model/ArticleAd.java

@@ -1,88 +0,0 @@
-package com.sheep.gamegroup.module.ad_htxd.model;
-
-import com.hoc.hoclib.adlib.HNativeListener;
-import com.hoc.hoclib.adlib.NativeADDataInfo;
-import com.hoc.hoclib.adlib.PNative;
-import com.sheep.gamegroup.model.entity.Article;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.TestUtil;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import rx.functions.Action1;
-
-import static com.sheep.gamegroup.util.UMConfigUtils.Event.HTXD_AD;
-
-/**
- * Created by realicing on 2019/1/7.
- * realicing@sina.com
- * 鸿途信达 广告
- */
-public class ArticleAd extends Article {
-
-    public static final String FEED = "1D0JLRMA102V277730B60000552042FE";
-    public static final int INDEX = 4;//放在position为4的位置，即第5个
-    public static final boolean showAd = false;//TestUtil.isSheep();//是否显示广告
-
-    private NativeADDataInfo nativeADDataInfo;
-    private PNative pNative;
-
-    public static int ID = -99;
-    public ArticleAd(NativeADDataInfo nativeADDataInfo, PNative pNative) {
-        this.nativeADDataInfo = nativeADDataInfo;
-        this.pNative = pNative;
-        setType(2);//资讯
-        setId(ID--);
-        setTitle(nativeADDataInfo.getTitle());
-        setCreated_at((int) (System.currentTimeMillis() / 1000L));
-        setPictures(nativeADDataInfo.getMainImg());
-    }
-
-    public NativeADDataInfo getNativeADDataInfo() {
-        return nativeADDataInfo;
-    }
-
-    public PNative getpNative() {
-        return pNative;
-    }
-
-    //初始化广告
-    public static void fetchNativeData(ListUtil.CallBack<ArticleAd, Boolean> adAction1, Action1<Boolean> callBack) {
-        final PNative pNative = new PNative(SheepApp.getInstance());
-        pNative.setHTNativeListener(new HNativeListener() {
-            @Override
-            public void onNativeAdIsReady(NativeADDataInfo nativeAdData) {
-                ArticleAd articleAd = new ArticleAd(nativeAdData, pNative);
-                boolean success = adAction1.call(articleAd);
-                LogUtil.println("ArticleAd", "fetchNativeData", "onNativeAdIsReady", success);
-                pNative.handleImp();
-                callBack.call(success);
-            }
-
-            @Override
-            public void onLoadNativeAdFail() {
-                LogUtil.println("ArticleAd", "fetchNativeData", "onLoadNativeAdFail");
-                callBack.call(false);
-            }
-        })
-                .setADId(FEED)
-                .fetch();
-    }
-
-    //检查是否是广告
-    public static boolean checkAd(Article item) {
-        if(item instanceof ArticleAd){
-            return true;
-        }
-        return false;
-    }
-    //检查是否是广告 并点击
-    public static boolean checkAdAndClick(Article item) {
-        if(item instanceof ArticleAd){
-            HTXD_AD.onEvent("title", ((ArticleAd) item).getNativeADDataInfo().getTitle());
-            ((ArticleAd) item).getpNative().handleClickToWeb();
-            return true;
-        }
-        return false;
-    }
-}

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -52,7 +52,6 @@ import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.module.find.activity.ActMediaChoose;
 import com.sheep.gamegroup.module.game.activity.ActDownloadManager;
 import com.sheep.gamegroup.module.game.activity.ActGameCenterType;
@@ -2236,9 +2235,6 @@ public class Jump2View {
 
     //打开一个发现
     public void goFindItem(Context context, Article item) {
-        if (ArticleAd.showAd && ArticleAd.checkAdAndClick(item)) {//检查点击的是否是 广告
-            return;
-        }
         switch (item.getType()) {//类型 1：游戏 2：咨询 3：转跳 4：任务 5：栏目
             case 1:
                 Jump2View.getInstance().goEntity(item);

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

@@ -21,7 +21,6 @@ import com.sheep.gamegroup.model.entity.Article;
 import com.sheep.gamegroup.model.entity.ArticleTag;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Lp;
-import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DownloadUtil;
@@ -41,7 +40,6 @@ import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -59,7 +57,6 @@ import static android.content.Intent.ACTION_PACKAGE_REMOVED;
 public class FgtFindChild extends BaseListFragment5<Article> {
 
     private int type;
-    private boolean showAd;
 
     @Override
     public void initView() {
@@ -69,7 +66,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
 
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new CommonRecycler(showAd ? allList : list);
+        return new CommonRecycler(list);
     }
 
     @Override
@@ -87,33 +84,6 @@ public class FgtFindChild extends BaseListFragment5<Article> {
         return Article.class;
     }
 
-    private List<Article> allList = new ArrayList<>();//显示广告时使用allList，否则使用list
-
-    @Override
-    protected void loadList(List<Article> addList) {
-        if (showAd) {
-            ListUtil.addAll(allList, addList);
-//            if (1 == page) {
-                int index = (page - 1) * (per_page + 1) + ArticleAd.INDEX;
-                Article item = ListUtil.getItem(allList, index);
-                if (!(item instanceof ArticleAd)) {//倒数第几个不是广告的情况下才添加
-                    ArticleAd.fetchNativeData(articleAd -> ListUtil.insertIndex(allList, articleAd, index), ok -> {
-                        if (ok) {
-                            notifyDataSetChanged();
-                        }
-                    });
-                }
-//            }
-        }
-        super.loadList(addList);
-    }
-
-    @Override
-    public void clear() {
-        if (showAd)
-            allList.clear();
-        super.clear();
-    }
 
     public static FgtFindChild newInstance(ArticleTag articleTag) {
         FgtFindChild fgt = new FgtFindChild();
@@ -269,7 +239,6 @@ public class FgtFindChild extends BaseListFragment5<Article> {
             ArticleTag articleTag = DataUtil.getObject(bundle, ArticleTag.class);
             if (articleTag != null) {
                 type = articleTag.getId();
-                showAd = ArticleAd.showAd;//修改回之前的所有栏目都展示 && TextUtils.equals(articleTag.getName(), "资讯");//只有资讯才显示
             }
         }
         EventBus.getDefault().register(this);
@@ -336,7 +305,7 @@ public class FgtFindChild extends BaseListFragment5<Article> {
 
         @Override
         public int getItemViewType(int position) {
-            Article article = (showAd ? allList : list).get(position);
+            Article article = list.get(position);
             return article.getType();
         }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -18,7 +18,6 @@ import com.baidu.location.LocationClientOption;
 import com.bumptech.glide.Glide;
 import com.danikula.videocache.HttpProxyCacheServer;
 import com.didi.virtualapk.PluginManager;
-import com.hoc.hoclib.PManager;
 import com.kfzs.cfyl.share_library.util.ContextHolder;
 import com.liulishuo.okdownload.OkDownload;
 import com.liulishuo.okdownload.core.dispatcher.DownloadDispatcher;
@@ -26,11 +25,9 @@ import com.sheep.gamegroup.di.components.DaggerNetComponent;
 import com.sheep.gamegroup.di.components.NetComponent;
 import com.sheep.gamegroup.di.modules.NetModule;
 import com.sheep.gamegroup.module.ad_htxd.model.ArticleAd;
-import com.sheep.gamegroup.module.home.api.MainAction;
 import com.sheep.gamegroup.module.login.LoginAct;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.usage.AppUsageManager;
-import com.sheep.gamegroup.util.ActionUtil;
 import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CertificationUtil;
 import com.sheep.gamegroup.util.ChannelContent;
@@ -47,7 +44,6 @@ import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TextToSpeechUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.GameCertificationActivity;
 import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
@@ -326,11 +322,6 @@ public class SheepApp extends MultiDexApplication {
 //        CacheFactory.setCacheManager(ExoPlayerCacheManager.class);//exo缓存模式，支持m3u8，只支持exo
 //        CacheFactory.setCacheManager(ProxyCacheManager.class);//代理缓存模式，支持所有模式，不支持m3u8等
 
-        //鸿途信达 广告 需要添加 两行代码顺序不能变
-        if (ArticleAd.showAd) {
-            PManager.getInstance().setChannel(this, 18122801);
-            PManager.getInstance().onCreate(this);
-        }
         //初始化换肤框架
         SkinUtil.init();
         //注册微信支付
@@ -631,10 +622,6 @@ public class SheepApp extends MultiDexApplication {
         super.attachBaseContext(base);
         MultiDex.install(this);
         PluginManager.getInstance(base).init();//插件化框架
-        //鸿途信达 广告 需要添加
-        if (ArticleAd.showAd) {
-            PManager.getInstance().attachBaseContext(base);
-        }
     }
 
     //应用退出的回调(模拟器才会回调)