Merge branch 'dev_ad' of http://39.97.65.143:81/android/android_goodmoney into dev_ad

GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/VideoAdingManager.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.text.TextUtils;
 
+import com.mints.goodmoney.MintsApplication;
 import com.mints.goodmoney.common.AppConfig;
 import com.mints.goodmoney.common.Constant;
 import com.mints.goodmoney.manager.TrackManager;
@@ -15,6 +16,7 @@ import com.mints.goodmoney.mvp.model.WeightBean;
 import com.mints.goodmoney.service.AppInstallService;
 import com.mints.goodmoney.utils.AppUtil;
 import com.mints.goodmoney.utils.LogUtil;
+import com.mints.goodmoney.utils.ToastUtil;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;

GoodMoney/app/src/main/java/com/mints/goodmoney/manager/AppTryPlayManager.kt

@@ -40,11 +40,7 @@ object AppTryPlayManager {
                     cdaa!!.dismiss()
                 }
                 when (v.id) {
-                    R.id.dialog_btn_left -> {
-                        cdaa!!.dismiss()
-                    }
                     R.id.dialog_btn_right -> {
-                        cdaa!!.dismiss()
                         AppUtil.openUsageStats(weakReference.get() as Context)
                     }
                 }

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/TaskCpdHistoryAdapter.kt

@@ -32,7 +32,7 @@ class TaskCpdHistoryAdapter(val dataList: List<TzTaskBean>, val context: Context
         val data = dataList[position]
 
         val holder = viewHolder as BaseViewHolder
-        GlideUtils.loadImageViewLoding(context, data.icon, holder.ivAvatar, R.mipmap.ic_launcher_main, R.mipmap.ic_launcher_main)
+        GlideUtils.loadImageViewLoding(context, data.icon, holder.ivAvatar, R.mipmap.ic_cpd, R.mipmap.ic_cpd)
         holder.tvTitle.text = data.title
         holder.tvCoin.text = "+" + data.coin + "金币"
         holder.itemTvtext.text = "打开应用体验" + needUseTime + "秒，返回领取"

GoodMoney/app/src/main/res/layout/item_task_recy_cpd_history.xml

@@ -15,7 +15,7 @@
         android:layout_alignParentStart="true"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
-        android:src="@mipmap/ic_launcher_main" />
+        android:src="@mipmap/ic_cpd" />
 
     <TextView
         android:id="@+id/item_tv_title"