Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/VLionSimple

朱显松
2 parents b260c4e0 d83e9718
Showing 11 changed files with 282 additions and 58 deletions
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/cn/vlion/simple/BannerActivity.java
app/src/main/java/cn/vlion/simple/NativeActivity.java
app/src/main/java/cn/vlion/simple/NativeFeedsDemoActivity.java
app/src/main/java/cn/vlion/simple/SplashActivity.java
app/src/main/java/cn/vlion/simple/SpotActivity.java
app/src/main/res/layout/activity_native.xml
app/src/main/res/layout/activity_native_feeds_demo.xml
app/src/main/res/values/strings.xml
build.gradle
@@ -24,6 +24,8 @@ dependencies {
     compile 'com.android.support:appcompat-v7:26.+'
     compile 'com.google.code.gson:gson:2.8.2'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.github.bumptech.glide:glide:4.3.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
     //引入广告SDK
     compile 'cn.vlion:vlion-ad:1.1.9'
 }
@@ -49,6 +49,11 @@
             android:configChanges="keyboardHidden|screenSize|orientation"
             android:screenOrientation="portrait" />
+        <activity
+            android:name="cn.vlion.simple.NativeFeedsDemoActivity"
+            android:configChanges="keyboardHidden|screenSize|orientation"
+            android:screenOrientation="portrait" />
+
         <!--使用瑞狮广告SDK需要配置以下信息-->
         <!--广告SDK配置 Start-->
         <receiver android:name="cn.vlion.ad.core.VLionReceiver">
@@ -33,41 +33,38 @@ public class BannerActivity extends AppCompatActivity {
         //431 image
         bannerView = BannerManager.getInstance().getBannerView(this, tagId, new BannerViewListener() {
             @Override
-            public void onRequestSuccess(String id, int viewWidth, int viewHeight) {
-                Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
+            public void onRequestSuccess(String adId, int viewWidth, int viewHeight) {
+                Log.e(TAG, "onRequestSuccess: " + "adId:" + adId + "," + viewWidth + "," + viewHeight);
                 bannerContainer.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
                 bannerContainer.getLayoutParams().height = ScreenUtil.getScreenWidth(BannerActivity.this) * viewHeight / viewWidth;
             }
             @Override
-            public void onRequestFailed(String id, int code, String errorMsg) {
-                Log.e(TAG, "onRequestFailed" + code + " : " + errorMsg);
+            public void onRequestFailed(String adId, int code, String errorMsg) {
+                Log.e(TAG, "onRequestFailed: " + "adId:" + adId + "," + code + " : " + errorMsg);
             }
             @Override
-            public void onShowSuccess(String id) {
-                Log.e(TAG, "onShowSuccess");
+            public void onShowSuccess(String adId) {
+                Log.e(TAG, "onShowSuccess: " + "adId:" + adId);
             }
             @Override
-            public void onSwitchBanner(String id) {
-                Log.e(TAG, "onSwitchBanner");
+            public void onSwitchBanner(String adId) {
+                Log.e(TAG, "onSwitchBanner: " + "adId:" + adId);
             }
             @Override
-            public void onShowFailed(String id, int code, String msg) {
-                Log.e(TAG, "onShowFailed: " + code + "," + msg);
+            public void onShowFailed(String adId, int code, String msg) {
+                Log.e(TAG, "onShowFailed: " + "adId:" + adId + "," + code + "," + msg);
             }
             @Override
-            public void onBannerClicked(String id) {
-                Log.e(TAG, "onBannerClicked");
+            public void onBannerClicked(String adId) {
+                Log.e(TAG, "onBannerClicked: " + "adId:" + adId);
             }
         });
-        //设置自动更新时间
-        bannerView.setAutoRefreshTime(10_000);
-        //设置自动更新开关
-        bannerView.setAutoRefreshAd(true);
+
         bannerContainer.addView(bannerView);
     }
@@ -42,13 +42,13 @@ public class NativeActivity extends AppCompatActivity {
         NativeManager.getInstance().requestAppWall(this, adId_AppWall, new NativeListener<NativeAppWallData>() {
             @Override
             public void onRequestSuccess(NativeAppWallData data) {
-                Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Log.e("DemoView", "数据获取成功 :" + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
                 Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
-            public void onRequestFailed(String id, int code, String message) {
-                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + ", adId:" + adId);
                 Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
@@ -58,6 +58,7 @@ public class NativeActivity extends AppCompatActivity {
         NativeManager.getInstance().requestCarousel(this, adId_Carousel, new NativeListener<NativeCarouselData>() {
             @Override
             public void onRequestSuccess(NativeCarouselData data) {
+                Log.e("DemoView", "数据获取成功 :" + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
                 String ldp = data.getNativead().getLdp();
                 String download = data.getNativead().getAppDownloadurl();
                 Intent intent = new Intent(NativeActivity.this, VLionWebViewActivity.class);
@@ -67,8 +68,8 @@ public class NativeActivity extends AppCompatActivity {
             }
             @Override
-            public void onRequestFailed(String id, int code, String message) {
-                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + ", adId:" + adId);
                 Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
@@ -78,13 +79,13 @@ public class NativeActivity extends AppCompatActivity {
         NativeManager.getInstance().requestFeeds(this, adId_Feeds, new NativeListener<NativeFeedsData>() {
             @Override
             public void onRequestSuccess(NativeFeedsData data) {
-                Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Log.e("DemoView", "数据获取成功 :" + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
                 Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
-            public void onRequestFailed(String id, int code, String message) {
-                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + ", adId:" + adId);
                 Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
@@ -94,13 +95,13 @@ public class NativeActivity extends AppCompatActivity {
         NativeManager.getInstance().requestNews(this, adId_News, new NativeListener<NativeNewsData>() {
             @Override
             public void onRequestSuccess(NativeNewsData data) {
-                Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Log.e("DemoView", "数据获取成功 :" + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
                 Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
-            public void onRequestFailed(String id, int code, String message) {
-                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + ", adId:" + adId);
                 Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
@@ -110,15 +111,19 @@ public class NativeActivity extends AppCompatActivity {
         NativeManager.getInstance().requestWaterfall(this, adId_Waterfall, new NativeListener<NativeWaterfallData>() {
             @Override
             public void onRequestSuccess(NativeWaterfallData data) {
-                Log.e("DemoView", "数据获取成功 " + new Gson().toJson(data));
+                Log.e("DemoView", "数据获取成功 :" + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
                 Toast.makeText(NativeActivity.this, "数据获取成功 " + new Gson().toJson(data), Toast.LENGTH_SHORT).show();
             }
             @Override
-            public void onRequestFailed(String id, int code, String message) {
-                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message);
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + ", adId:" + adId);
                 Toast.makeText(NativeActivity.this, "数据加载失败 : code = " + code + " , message = " + message, Toast.LENGTH_SHORT).show();
             }
         });
     }
+
+    public void showFeedsDemo(View view) {
+        startActivity(new Intent(this, NativeFeedsDemoActivity.class));
+    }
 }
+package cn.vlion.simple;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.google.gson.Gson;
+
+import java.util.List;
+
+import cn.vlion.ad.core.Config;
+import cn.vlion.ad.moudle.natives.NativeAdStatusChangeListener;
+import cn.vlion.ad.moudle.natives.NativeListener;
+import cn.vlion.ad.moudle.natives.NativeManager;
+import cn.vlion.ad.moudle.natives.model.NativeAdStateData;
+import cn.vlion.ad.moudle.natives.model.NativeFeeds;
+import cn.vlion.ad.moudle.natives.model.NativeFeedsData;
+import cn.vlion.simple.util.ScreenUtil;
+
+/**
+ * Created by gujun on 2017/11/15.
+ */
+
+public class NativeFeedsDemoActivity extends AppCompatActivity {
+
+    private static final String adId_Feeds = "440";
+    private static final String TAG = "NativeFeedsDemoActivity";
+
+    private ImageView icon, image;
+    private TextView title, desc, rating;
+    private Button click;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_native_feeds_demo);
+        init();
+        loadFeeds();
+    }
+
+    private void init() {
+        icon = findViewById(R.id.icon);
+        image = findViewById(R.id.image);
+        title = findViewById(R.id.title);
+        desc = findViewById(R.id.desc);
+        rating = findViewById(R.id.rating);
+        click = findViewById(R.id.click);
+    }
+
+    public void loadFeeds() {
+        NativeManager.getInstance().requestFeeds(this, adId_Feeds, new NativeListener<NativeFeedsData>() {
+            @Override
+            public void onRequestSuccess(NativeFeedsData data) {
+                Log.e("DemoView", "数据获取成功 " + "adId:" + data.getTagid() + "," + new Gson().toJson(data));
+                addData(data);
+            }
+
+            @Override
+            public void onRequestFailed(String adId, int code, String message) {
+                Log.e("DemoView", "数据加载失败 : code = " + code + " , message = " + message + "," + "adId:" + adId);
+            }
+        });
+    }
+
+    private void addData(final NativeFeedsData data) {
+        if (data == null || data.getNativead() == null) return;
+
+        List<NativeFeeds.IconBean> icons = data.getNativead().getIcon();
+        String iconUrl = icons == null || icons.size() <= 0 ? "" : icons.get(0).getUrl();
+        if (!TextUtils.isEmpty(iconUrl))
+            Glide.with(this).load(iconUrl).into(icon);
+
+        List<NativeFeeds.ImgBean> images = data.getNativead().getImg();
+        String imageUrl = images == null || images.size() <= 0 ? "" : images.get(0).getUrl();
+        if (!TextUtils.isEmpty(imageUrl))
+            Glide.with(this).load(imageUrl).into(image);
+        int imageHeight = Integer.valueOf(images.get(0).getH());
+        int imageWidth = Integer.valueOf(images.get(0).getW());
+        int imageRealWidth = ScreenUtil.getScreenWidth(this) - dp2px(this, 20);
+        image.getLayoutParams().width = imageRealWidth;
+        image.getLayoutParams().height = imageRealWidth * imageHeight / imageWidth;
+
+        title.setText(data.getNativead().getTitle());
+        desc.setText(data.getNativead().getDesc());
+        rating.setText(data.getNativead().getRating() == null ? "0分" : data.getNativead().getRating() + "分");
+        click.setText(data.getNativead().getButton() == null ? "ad click" : data.getNativead().getButton());
+        click.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //点击的调用
+                boolean clickSuccess = NativeManager.getInstance().onClick(NativeFeedsDemoActivity.this, data, statusChangeListener);
+                Log.e(TAG, "onClick: " + clickSuccess);
+            }
+        });
+
+        //曝光的调用
+        NativeManager.getInstance().onExposure(data);
+    }
+
+    public static int dp2px(Context context, float dpVal) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                dpVal, context.getResources().getDisplayMetrics());
+    }
+
+    private NativeAdStatusChangeListener statusChangeListener = new NativeAdStatusChangeListener() {
+        @Override
+        public void onAdStatusChange(NativeAdStateData stateData) {
+            switch (stateData.getDownloadType()) {
+                case Config.NATIVE_AD_CLICK_TYPE_DOWNLOAD_PENDING:
+                    Log.e(TAG, "onAdStatusChange: adId:" + stateData.getAdId() + "，等待下载" + stateData.getDownloadProgress());
+                    break;
+                case Config.NATIVE_AD_CLICK_TYPE_DOWNLOAD_RUNNING:
+                    Log.e(TAG, "onAdStatusChange: adId:" + stateData.getAdId() + "，正在下载" + stateData.getDownloadProgress());
+                    break;
+                case Config.NATIVE_AD_CLICK_TYPE_DOWNLOAD_FAILED:
+                    Log.e(TAG, "onAdStatusChange: adId:" + stateData.getAdId() + "，下载失败" + stateData.getDownloadProgress());
+                    break;
+                case Config.NATIVE_AD_CLICK_TYPE_DOWNLOAD_SUCCESS:
+                    Log.e(TAG, "onAdStatusChange: adId:" + stateData.getAdId() + "，成功" + stateData.getDownloadProgress());
+                    break;
+                case Config.NATIVE_AD_CLICK_TYPE_DOWNLOAD_PAUSED:
+                    Log.e(TAG, "onAdStatusChange: adId:" + stateData.getAdId() + "，暂停" + stateData.getDownloadProgress());
+                    break;
+            }
+        }
+    };
+}
@@ -77,42 +77,42 @@ public class SplashActivity extends AppCompatActivity {
         SplashManager.getInstance().showSplash(this, "432", new SplashViewListener() {
             @Override
-            public void onRequestSuccess(String id,int viewWidth, int viewHeight) {
-                Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
+            public void onRequestSuccess(String adId, int viewWidth, int viewHeight) {
+                Log.e(TAG, "onRequestSuccess: " + "adId:" + adId + "," + viewWidth + "," + viewHeight);
                 splashAdContainer.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
                 splashAdContainer.getLayoutParams().height = ScreenUtil.getScreenWidth(SplashActivity.this) * viewHeight / viewWidth;
             }
             @Override
-            public void onRequestFailed(String id,int code, String errorMsg) {
-                Log.e(TAG, "onRequestFailed: " + code + "," + errorMsg);
+            public void onRequestFailed(String adId, int code, String errorMsg) {
+                Log.e(TAG, "onRequestFailed: " + "adId:" + adId + "," + code + "," + errorMsg);
             }
             @Override
-            public void onShowSuccess(String id) {
-                Log.e(TAG, "onShowSuccess: ");
+            public void onShowSuccess(String adId) {
+                Log.e(TAG, "onShowSuccess: " + "adId:" + adId);
                 defaultLayout.setVisibility(View.GONE);
                 adLayout.setVisibility(View.VISIBLE);
             }
             @Override
-            public void onShowFailed(String id,int code, String msg) {
-                Log.e(TAG, "onShowFailed: " + code + "," + msg);
+            public void onShowFailed(String adId, int code, String msg) {
+                Log.e(TAG, "onShowFailed: " + "adId:" + adId + "," + code + "," + msg);
             }
             @Override
-            public void onSplashClicked(String id) {
-                Log.e(TAG, "onSplashClicked: ");
+            public void onSplashClicked(String adId) {
+                Log.e(TAG, "onSplashClicked: " + "adId:" + adId);
             }
             @Override
-            public void onSplashClosed(String id) {
-                Log.e(TAG, "onSplashClosed: ");
+            public void onSplashClosed(String adId) {
+                Log.e(TAG, "onSplashClosed: " + "adId:" + adId);
             }
             @Override
-            public void onSwitchSplash(String id) {
-                Log.e(TAG, "onSwitchSplash: ");
+            public void onSwitchSplash(String adId) {
+                Log.e(TAG, "onSwitchSplash: " + "adId:" + adId);
             }
         });
     }
@@ -44,44 +44,44 @@ public class SpotActivity extends AppCompatActivity {
         SpotManager.getInstance().showSpot(this, tagId, new SpotViewListener() {
             @Override
-            public void onRequestSuccess(String id,int viewWidth, int viewHeight, int closeViewHeight) {
-                Log.e(TAG, "onRequestSuccess: " + viewWidth + "," + viewHeight);
+            public void onRequestSuccess(String adId, int viewWidth, int viewHeight, int closeViewHeight) {
+                Log.e(TAG, "onRequestSuccess: " + "adId:" + adId + "," + viewWidth + "," + viewHeight);
                 spotAdContainer.getLayoutParams().width = 720;
                 spotAdContainer.getLayoutParams().height = 720 * viewHeight / viewWidth + closeViewHeight;
             }
             @Override
-            public void onRequestFailed(String id,int code, String errorMsg) {
-                Log.e(TAG, "onRequestFailed: " + code + "," + errorMsg);
+            public void onRequestFailed(String adId, int code, String errorMsg) {
+                Log.e(TAG, "onRequestFailed: " + "adId:" + adId + "," + code + "," + errorMsg);
                 Toast.makeText(SpotActivity.this, "onRequestFailed: " + code + "," + errorMsg, Toast.LENGTH_SHORT).show();
             }
             @Override
-            public void onShowSuccess(String id) {
-                Log.e(TAG, "onShowSuccess: ");
+            public void onShowSuccess(String adId) {
+                Log.e(TAG, "onShowSuccess: " + "adId:" + adId);
                 adLayout.setVisibility(View.VISIBLE);
             }
             @Override
-            public void onShowFailed(String id,int code, String msg) {
-                Log.e(TAG, "onShowFailed: " + code + "," + msg);
+            public void onShowFailed(String adId, int code, String msg) {
+                Log.e(TAG, "onShowFailed: " + "adId:" + adId + "," + code + "," + msg);
             }
             @Override
-            public void onSpotClicked(String id) {
-                Log.e(TAG, "onSplashClicked: ");
+            public void onSpotClicked(String adId) {
+                Log.e(TAG, "onSplashClicked: " + "adId:" + adId);
                 adLayout.setVisibility(View.GONE);
             }
             @Override
-            public void onSpotClosed(String id) {
-                Log.e(TAG, "onSplashClosed: ");
+            public void onSpotClosed(String adId) {
+                Log.e(TAG, "onSplashClosed: " + "adId:" + adId);
                 adLayout.setVisibility(View.GONE);
             }
             @Override
-            public void onSwitchSpot(String id) {
-                Log.e(TAG, "onSwitchSpot: ");
+            public void onSwitchSpot(String adId) {
+                Log.e(TAG, "onSwitchSpot: " + "adId:" + adId);
             }
         });
     }
@@ -51,4 +51,13 @@
         android:layout_marginTop="16dp"
         android:onClick="loadWaterfall"
         android:text="@string/loadWaterfall" />
+
+    <Button
+        android:id="@+id/feedsDemo"
+        style="@style/buttonTheme"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="@string/showFeedsDemo"
+        android:layout_marginTop="16dp"
+        android:onClick="showFeedsDemo"/>
 </LinearLayout>
 \ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="10dp">
+
+    <RelativeLayout
+        android:id="@+id/topLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginRight="10dp"
+            android:scaleType="centerCrop" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/icon"
+            android:singleLine="true"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/rating"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/title"
+            android:layout_marginTop="5dp"
+            android:layout_toRightOf="@+id/icon"
+            android:textColor="@android:color/darker_gray" />
+
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_below="@+id/topLayout"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/image"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/desc"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/click"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="ad click" />
+
+    </LinearLayout>
+
+</RelativeLayout>
 \ No newline at end of file
@@ -5,4 +5,5 @@
     <string name="loadFeeds">信息流数据</string>
     <string name="loadNews">新闻放送数据</string>
     <string name="loadWaterfall">瀑布流数据</string>
+    <string name="showFeedsDemo">展示信息流demo</string>
 </resources>
@@ -15,6 +15,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        mavenCentral()
+        maven { url 'https://maven.google.com' }
     }
 }