Merge remote-tracking branch 'origin/master'

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

@@ -2,7 +2,6 @@ package com.ym.zxhcsdk.ads;
 
 import android.app.Activity;
 import android.media.MediaPlayer;
-import android.media.TimedText;
 import android.util.Log;
 import com.ym.zxhcsdk.HcAdBean;
 import com.ym.zxhcsdk.listener.RewardVideoAdShowListener;
@@ -117,6 +116,9 @@ public class RewardVideoMediaPlayer {
             if (null != mShowListener) {
                 mShowListener.OnAdShow();
             }
+            if (null != updateViewListener) {
+                updateViewListener.OnShowListener();
+            }
             getMediaPlayer().start();
         } else {//资源加载未完成
             isShowVideo = true;

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

@@ -13,7 +13,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-
 import com.ym.zxhcsdk.HttpClientUtils;
 import com.ym.zxhcsdk.R;
 import com.ym.zxhcsdk.listener.RewardVideoAdUpdateViewListener;
@@ -30,6 +29,7 @@ public class RewardvideoPortraitADActivity extends Activity implements SurfaceHo
     private TextView bottomBtnTv;
     private TextView TopTimeTv;
     private ImageView TopClose;
+    private ImageView ivPreview;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,13 +48,13 @@ public class RewardvideoPortraitADActivity extends Activity implements SurfaceHo
         bottomBtnTv = findViewById(R.id.reward_video_ad_btn);
         TopTimeTv = findViewById(R.id.reward_ad_time);
         TopClose = findViewById(R.id.reward_ad_close);
-
+        ivPreview = findViewById(R.id.id_iv_preview);
 
 //        设置底部信息
         bottomTitle.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_title());
         bottomDesc.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_desc());
         bottomBtnTv.setText(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_iconbuttontext());
-
+        //设置底部logo
         HttpClientUtils.LoadImg(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_icon_url(), new HttpClientUtils.OnRequestImgCallBack() {
             @Override
             public void onSuccess(Bitmap bitmap) {
@@ -71,8 +71,23 @@ public class RewardvideoPortraitADActivity extends Activity implements SurfaceHo
 
             }
         });
+        //设置预览图
+        HttpClientUtils.LoadImg(RewardVideoMediaPlayer.getInstance().getHcAdBean().getVideo_cover_image(), new HttpClientUtils.OnRequestImgCallBack() {
+            @Override
+            public void onSuccess(Bitmap bitmap) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ivPreview.setImageBitmap(bitmap);
+                    }
+                });
+            }
 
+            @Override
+            public void onError(String errorMsg) {
 
+            }
+        });
 
 
 
@@ -108,6 +123,11 @@ public class RewardvideoPortraitADActivity extends Activity implements SurfaceHo
         RewardVideoMediaPlayer.getInstance().startVideo();
     }
 
+    @Override
+    public void OnShowListener() {
+        ivPreview.setVisibility(View.GONE);
+    }
+
     /**
      * 播放激励视频完成回调
      */

zxhcsdk/src/main/java/com/ym/zxhcsdk/listener/RewardVideoAdUpdateViewListener.java

@@ -2,6 +2,11 @@ package com.ym.zxhcsdk.listener;
 
 public interface RewardVideoAdUpdateViewListener {
 
+    /// <summary>
+    /// 广告加载成功，可在此回调后进行广告展示
+    /// </summary>
+    void OnShowListener();
+
     /// <summary>
     /// 广告加载成功，可在此回调后进行广告展示
     /// </summary>

zxhcsdk/src/main/res/drawable/btn_bg.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-
     <solid android:color="#00a1a3a6" />
     <padding
-        android:top="10dp"
-        android:bottom="10dp"
-        android:left="20dp"
-        android:right="20dp"
-        />
+        android:top="8dp"
+        android:bottom="8dp"
+        android:left="15dp"
+        android:right="15dp" />
     <stroke
-        android:width="2dp"
+        android:width="1dp"
         android:color="#f2eada" />
     <corners android:radius="25dp"/>
 </shape>
\ No newline at end of file

zxhcsdk/src/main/res/layout/activity_rewardvideo_portrait_a_d.xml

@@ -108,14 +108,18 @@
         <TextView
             android:id="@+id/reward_video_ad_btn"
             android:layout_width="wrap_content"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:layout_marginRight="10dp"
             android:textColor="#000000"
-            android:textSize="20dp"
-            android:background="@drawable/btn_bg"
-            android:gravity="center"
-            android:text="" />
+            android:textSize="16sp"
+            android:background="@drawable/btn_bg"/>
 
     </LinearLayout>
 
+    <!--预览图-->
+    <ImageView
+        android:id="@+id/id_iv_preview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY"/>
 </RelativeLayout>
\ No newline at end of file