admin
2020-10-13 69edda8e18b747039488d8e68aec51ba6a966073
广点通广告更新到最新包
5个文件已删除
13个文件已修改
1个文件已添加
279 ■■■■■ 已修改文件
BuWanVideo/AndroidManifest.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/build.gradle 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/libs/GDTSDK.unionNormal.4.176.1046.aar 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/res/layout/sr_gdt_ad_view.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/entity/VideoInfo.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/entity/ZhiBoContent.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/ui/category/bean/UniqueBean.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/ui/common/LiveGirlAdapter.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/ui/main/CategoryFragment.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/ui/video/FunshionPlayerFragment.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/ui/video/SearchResultAdapter.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/src/com/weikou/beibeivideo/util/ExitDialog.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/build.gradle 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/libs/GDTSDK.unionNoPlugin.4.270.1140.aar 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/libs/GDTSDK.unionNormal.4.232.1102.aar 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/src/com/weikou/wpc/mugua/GDTNative.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/src/com/weikou/wpc/mugua/GdtInterstitialAd.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GuangDianTongSDK/src/com/weikou/wpc/mugua/MOGOBanner.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BuWanVideo/AndroidManifest.xml
@@ -402,10 +402,6 @@
            android:name="com.qq.e.ads.PortraitADActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:screenOrientation="portrait" />
        <activity
            android:name="com.qq.e.ads.LandscapeADActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:screenOrientation="landscape" />
        <!-- 请开发者注意字母的大小写,ADActivity,而不是AdActivity -->
        <activity
BuWanVideo/build.gradle
@@ -81,8 +81,8 @@
    }
    defaultConfig {
        applicationId "com.doudou.ysvideo"
        versionCode 96
        versionName "3.7.8"
        versionCode 97
        versionName "3.7.9"
        multiDexEnabled = true
        minSdkVersion 17
        targetSdkVersion 27
BuWanVideo/libs/GDTSDK.unionNormal.4.176.1046.aar
Binary files differ
BuWanVideo/res/layout/sr_gdt_ad_view.xml
@@ -7,6 +7,7 @@
            android:id="@+id/ad_info_container"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:visibility="gone"
            android:background="@color/colorAccent">
            <!-- 原生广告的小图 -->
BuWanVideo/src/com/weikou/beibeivideo/entity/VideoInfo.java
@@ -1,9 +1,7 @@
package com.weikou.beibeivideo.entity;
import com.google.gson.annotations.Expose;
import com.qq.e.ads.nativ.NativeADDataRef;
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.ads.nativ.NativeMediaADData;
import java.io.Serializable;
import java.util.List;
@@ -65,7 +63,6 @@
    @Expose
    private boolean canSave;// true-可以 false-不行
    private NativeADDataRef adInfo;// 原生广告信息
    private NativeExpressADView adView;// 原生广告信息
    @Expose
    private List<VideoResource> resourceList;
@@ -154,14 +151,6 @@
    public void setCommentCount(String commentCount) {
        this.commentCount = commentCount;
    }
    public NativeADDataRef getAdInfo() {
        return adInfo;
    }
    public void setAdInfo(NativeADDataRef adInfo) {
        this.adInfo = adInfo;
    }
    public static long getSerialversionuid() {
BuWanVideo/src/com/weikou/beibeivideo/entity/ZhiBoContent.java
@@ -1,7 +1,6 @@
package com.weikou.beibeivideo.entity;
import com.google.gson.annotations.Expose;
import com.qq.e.ads.nativ.NativeADDataRef;
public class ZhiBoContent {
    @Expose
@@ -25,17 +24,7 @@
    @Expose
    private String roomId;// 房间ID
    private NativeADDataRef adInfo;// 聚效原生广告信息
    private int watchCount;
    public NativeADDataRef getAdInfo() {
        return adInfo;
    }
    public void setAdInfo(NativeADDataRef adInfo) {
        this.adInfo = adInfo;
    }
    public String getHeadPic() {
        return headPic;
BuWanVideo/src/com/weikou/beibeivideo/ui/category/bean/UniqueBean.java
@@ -1,7 +1,6 @@
package com.weikou.beibeivideo.ui.category.bean;
import com.google.gson.annotations.Expose;
import com.qq.e.ads.nativ.NativeADDataRef;
import com.qq.e.ads.nativ.NativeExpressADView;
/**
BuWanVideo/src/com/weikou/beibeivideo/ui/common/LiveGirlAdapter.java
@@ -116,12 +116,9 @@
            holder = (Holder) view.getTag();
        }
        if (info != null) {
            if (info.getAdInfo() != null) {
                info.getAdInfo().onExposured(view);
                holder.fl_ad_show.setVisibility(View.VISIBLE);
            } else {
                holder.fl_ad_show.setVisibility(View.GONE);
            }
            view.findViewById(R.id.ll_live_girl_show).setVisibility(
                    View.VISIBLE);
            try {
@@ -141,35 +138,9 @@
                        @Override
                        public void onClick(final View v) {
                            if (mInfo.getAdInfo() == null) {
                                myClick(mInfo);
                            } else {
                                if (mInfo.getAdInfo().isAPP() && BeibeiConstant.AD_CLICK_DOWNLOAD) {
                                    DialogInterface.OnClickListener dialogOnclicListener = new DialogInterface.OnClickListener() {
                                        @Override
                                        public void onClick(DialogInterface dialog,
                                                            int which) {
                                            switch (which) {
                                                case Dialog.BUTTON_POSITIVE:
                                                    mInfo.getAdInfo().onClicked(v);
                                                    dialog.dismiss();
                                                    break;
                                                case Dialog.BUTTON_NEGATIVE:
                                                    dialog.dismiss();
                                                    break;
                                            }
                                        }
                                    };
                                    AdPromptDialog.Builder builder = new AdPromptDialog.Builder(
                                            v.getContext()); // 先得到构造器
                                    builder.setPositiveButton("确认", dialogOnclicListener);
                                    builder.setNegativeButton("取消", dialogOnclicListener);
                                    builder.create().show();
                                } else {
                                    mInfo.getAdInfo().onClicked(v);
                                }
                            }
                            myClick(mInfo);
                        }
                    });
        } else {
@@ -177,9 +148,6 @@
                    View.GONE);
        }
        if (info1 != null) {
            if (info1.getAdInfo() != null) {
                info1.getAdInfo().onExposured(view);
            }
            view.findViewById(R.id.ll_live_girl_show2).setVisibility(
                    View.VISIBLE);
            try {
@@ -197,36 +165,7 @@
                        @Override
                        public void onClick(final View v) {
                            if (mInfo1.getAdInfo() == null) {
                                myClick(mInfo1);
                            } else {
                                if (mInfo1.getAdInfo().isAPP() && BeibeiConstant.AD_CLICK_DOWNLOAD) {
                                    //先new出一个监听器,设置好监听
                                    DialogInterface.OnClickListener dialogOnclicListener = new DialogInterface.OnClickListener() {
                                        @Override
                                        public void onClick(DialogInterface dialog,
                                                            int which) {
                                            switch (which) {
                                                case Dialog.BUTTON_POSITIVE:
                                                    mInfo1.getAdInfo().onClicked(v);
                                                    dialog.dismiss();
                                                    break;
                                                case Dialog.BUTTON_NEGATIVE:
                                                    dialog.dismiss();
                                                    break;
                                            }
                                        }
                                    };
                                    AdPromptDialog.Builder builder = new AdPromptDialog.Builder(
                                            v.getContext()); // 先得到构造器
                                    builder.setPositiveButton("确认", dialogOnclicListener);
                                    builder.setNegativeButton("取消", dialogOnclicListener);
                                    builder.create().show();
                                } else {
                                    mInfo1.getAdInfo().onClicked(v);
                                }
                            }
                        }
                    });
        } else {
BuWanVideo/src/com/weikou/beibeivideo/ui/main/CategoryFragment.java
@@ -19,24 +19,20 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.lcjian.library.RetainViewFragment;
import com.lcjian.library.content.ConnectivityChangeHelper;
import com.lcjian.library.content.ConnectivityChangeHelper.OnConnectivityChangeListener;
import com.lcjian.library.util.cache.DiskLruCache;
import com.lcjian.library.util.common.StorageUtils;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.qq.e.ads.banner.ADSize;
import com.qq.e.ads.banner.AbstractBannerADListener;
import com.qq.e.ads.banner.BannerView;
import com.qq.e.comm.util.AdError;
import com.weikou.beibeivideo.BasicTextHttpResponseHandler;
import com.weikou.beibeivideo.BeibeiVideoAPI;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.VideoType;
import com.weikou.beibeivideo.ui.MyRetainViewFragment;
import com.weikou.beibeivideo.ui.category.CategoryAdapter;
import com.weikou.beibeivideo.ui.recommend.SearchActivity;
import com.weikou.beibeivideo.util.BeibeiConstant;
import com.weikou.beibeivideo.R;
import org.apache.http.Header;
import org.json.JSONObject;
@@ -162,40 +158,8 @@
                getCategories();
            }
        }, 200);
        bannerAd();
    }
    BannerView banner;
    private void bannerAd() {
        if (fl_ad == null) {
            return;
        }
        if (this.banner != null) {
            fl_ad.removeView(banner);
            banner.destroy();
        }
        banner = new BannerView(getActivity(), ADSize.BANNER,
                BeibeiConstant.GDT_ID, BeibeiConstant.GDT_CATEGORY_BANNER);
        //设置广告轮播时间,为0或30~120之间的数字,单位为s,0标识不自动轮播
        banner.setRefresh(30);
        banner.setShowClose(true);
        banner.setADListener(new AbstractBannerADListener() {
            @Override
            public void onNoAD(AdError error) {
                Log.i("AD_DEMO", "BannerNoAD,eCode=" + error.getErrorCode());
            }
            @Override
            public void onADReceiv() {
                Log.i("AD_DEMO", "ONBannerReceive");
            }
        });
        /* 发起广告请求,收到广告数据后会展示数据     */
        banner.loadAD();
        fl_ad.addView(banner);
    }
    @Override
    public void onResume() {
BuWanVideo/src/com/weikou/beibeivideo/ui/video/FunshionPlayerFragment.java
@@ -254,8 +254,11 @@
    protected ImageView mImagePoster;
    protected LinearLayout mNative3imgAdContainer;
    private NativeUnifiedADData gdtAd = null;
    //自渲染view
    private void initGDTSelfRenderView(FSFeedAD fsADView, NativeUnifiedADData ad) {
        gdtAd = ad;
        View mContainer = getLayoutInflater().inflate(R.layout.sr_gdt_ad_view, null);
        mDownloadButton = mContainer.findViewById(R.id.btn_download);
        mMediaView = mContainer.findViewById(R.id.gdt_media_view);
@@ -306,7 +309,8 @@
        List<View> clickableViews = new ArrayList<>();
        List<View> customClickableViews = new ArrayList<>();
        // 所有广告类型,注册mDownloadButton的点击事件
        clickableViews.add(mDownloadButton);
        clickableViews.add(mContainer);
        clickableViews.add(mMediaView);
        if (ad.getAdPatternType() == AdPatternType.NATIVE_2IMAGE_2TEXT ||
                ad.getAdPatternType() == AdPatternType.NATIVE_1IMAGE_2TEXT) {
            // 双图双文、单图双文:注册mImagePoster的点击事件
@@ -390,6 +394,7 @@
                @Override
                public void onVideoCompleted() {
                    Log.d(TAG, "onVideoCompleted: ");
                    adShowFinish();
                }
                @Override
@@ -399,6 +404,7 @@
            });
            ad.startVideo();
        } else if (ad.getAdPatternType() == AdPatternType.NATIVE_2IMAGE_2TEXT ||
                ad.getAdPatternType() == AdPatternType.NATIVE_1IMAGE_2TEXT) {
            // 双图双文、单图双文:注册mImagePoster的点击事件
@@ -764,6 +770,10 @@
        if (mFunshionIVideoPlayer != null)
            mFunshionIVideoPlayer.onActivityResume();
        EventBus.getDefault().register(this);
        if (gdtAd != null) {
            gdtAd.resumeVideo();
            gdtAd.startVideo();
        }
    }
    @Override
BuWanVideo/src/com/weikou/beibeivideo/ui/video/SearchResultAdapter.java
@@ -20,6 +20,7 @@
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.entity.video.VideoContent;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity;
import com.weikou.beibeivideo.ui.media.VideoDetailActivity2;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
import java.util.List;
@@ -285,7 +286,7 @@
    private void myClick(VideoInfo info, final View v, int p) {
        Intent intent = new Intent(v.getContext(), VideoDetailActivity.class);
        Intent intent = new Intent(v.getContext(), VideoDetailActivity2.class);
        intent.putExtra("video_info", info);
        if (p > 0)
            intent.putExtra("playing_position", p);
BuWanVideo/src/com/weikou/beibeivideo/util/BeibeiConstant.java
@@ -4,7 +4,7 @@
public class BeibeiConstant {
    public final static boolean IS_TEST = false;
    public final static boolean IS_TEST = true;
    //首页推荐第一个广告
    public final static boolean AD_SETTING_RECOMMEND_FIRST = true;
BuWanVideo/src/com/weikou/beibeivideo/util/ExitDialog.java
@@ -7,17 +7,10 @@
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.Toast;
import com.lcjian.library.util.SystemCommon;
import com.qq.e.ads.cfg.VideoOption;
import com.qq.e.ads.nativ.ADSize;
import com.qq.e.ads.nativ.NativeADDataRef;
import com.qq.e.ads.nativ.NativeExpressAD;
import com.qq.e.ads.nativ.NativeExpressADView;
import com.qq.e.comm.util.AdError;
import com.weikou.beibeivideo.R;
import com.weikou.beibeivideo.entity.ad.AdTypeVO;
import com.weikou.beibeivideo.entity.ad.ExpressAdContainer;
import com.weikou.beibeivideo.util.ad.AdUtil;
import com.weikou.beibeivideo.util.ad.ExpressAdManager;
@@ -137,8 +130,6 @@
            });
            return dialog;
        }
        NativeADDataRef adDataRef;
        private NativeExpressAD nativeExpressAD;
GuangDianTongSDK/build.gradle
@@ -3,7 +3,7 @@
dependencies {
    api fileTree(include: '*.jar', dir: 'libs')
    api 'com.android.support:support-v4:27.1.1'
    api files('libs/GDTSDK.unionNormal.4.232.1102.aar')
    api files('libs/GDTSDK.unionNoPlugin.4.270.1140.aar')
}
android {
GuangDianTongSDK/libs/GDTSDK.unionNoPlugin.4.270.1140.aar
Binary files differ
GuangDianTongSDK/libs/GDTSDK.unionNormal.4.232.1102.aar
Binary files differ
GuangDianTongSDK/src/com/weikou/wpc/mugua/GDTNative.java
File was deleted
GuangDianTongSDK/src/com/weikou/wpc/mugua/GdtInterstitialAd.java
File was deleted
GuangDianTongSDK/src/com/weikou/wpc/mugua/MOGOBanner.java
File was deleted