Merge branch 'master' of gitlab.huolea.com:wangxuewei/zxhc

zxhcsdk/src/main/java/com/ym/zxhcsdk/ads/RewardVideoMediaPlayer.java

@@ -53,7 +53,7 @@ public class RewardVideoMediaPlayer {
             this.mHcAdBean = mHcAdBean;
             isPrepared = false;
             getMediaPlayer().reset();
-            getMediaPlayer().setDataSource("https://zx-cdn.zhangxinhulian.com/file/2020/5/8447fa5488ee19a54d2adbe8d127693045540211.mp4");
+            getMediaPlayer().setDataSource(mHcAdBean.getVideo_url());
             getMediaPlayer().prepareAsync();
             getMediaPlayer().setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
                 @Override

zxhcsdk/src/main/java/com/ym/zxhcsdk/ads/RewardvideoPortraitADActivity.java

@@ -51,27 +51,27 @@ public class RewardvideoPortraitADActivity extends Activity implements SurfaceHo
         TopClose = findViewById(R.id.reward_ad_close);
         ivPreview = findViewById(R.id.id_iv_preview);
 
-        //设置底部信息
-//        bottomTitle.setText(zxRewardAdBean.getVideo_title());
-//        bottomDesc.setText(zxRewardAdBean.getVideo_desc());
-//        bottomBtnTv.setText(zxRewardAdBean.getVideo_iconbuttontext());
-//
-//        HttpClientUtils.LoadImg(zxRewardAdBean.getVideo_icon_url(), new HttpClientUtils.OnRequestImgCallBack() {
-//            @Override
-//            public void onSuccess(Bitmap bitmap) {
-//                runOnUiThread(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        bottomIcon.setImageBitmap(bitmap);
-//                    }
-//                });
-//            }
-//
-//            @Override
-//            public void onError(String errorMsg) {
-//
-//            }
-//        });
+//        设置底部信息
+        bottomTitle.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_title());
+        bottomDesc.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_desc());
+        bottomBtnTv.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_iconbuttontext());
+
+        HttpClientUtils.LoadImg(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_icon_url(), new HttpClientUtils.OnRequestImgCallBack() {
+            @Override
+            public void onSuccess(Bitmap bitmap) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        bottomIcon.setImageBitmap(bitmap);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String errorMsg) {
+
+            }
+        });
 
 
 

zxhcsdk/src/main/java/com/ym/zxhcsdk/view/ZXHCRewardVideoAD.java

@@ -49,20 +49,26 @@ public class ZXHCRewardVideoAD implements Serializable {
                 adBean.setClickReport(false);
                 adBean.setClickDpLinkSucReport(false);
                 adBean.setClickDpLinkfailReport(false);
-                RewardVideoMediaPlayer.getInstance().setHcAdBean(adBean);//将广告资源加载到MediaPlayer
-                context.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (mlistener!=null){
-                            mlistener.OnAdLoaded();
+                if (null==adBean.getVideo_url()||adBean.getVideo_url().equals("")){
+                    context.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (mlistener!=null){
+                                mlistener.OnLoadError("没有视频资源");
+                            }
                         }
-                    }
-                });
-
-
-/*                if (adBean.getSrcUrls().size() > 0) {
-
-                }*/
+                    });
+                }else {
+                    RewardVideoMediaPlayer.getInstance().setHcAdBean(adBean);//将广告资源加载到MediaPlayer
+                    context.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (mlistener!=null){
+                                mlistener.OnAdLoaded();
+                            }
+                        }
+                    });
+                }
             }
 
             @Override