Skip to content

A
android_vediosocial
Commit 23eaec41 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

修改投放看广告上传cpm接口逻辑

parent 3d97dc8e
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 47 deletions
video/app/build.gradle
View file @ 23eaec41
......@@ -15,8 +15,8 @@ android {
applicationId "com.duben.loveplayletd"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 805
versionName "8.0.5"
versionCode 806
versionName "8.0.6"
flavorDimensions "default"
// dex突破65535的限制
......
video/app/src/main/java/com/duben/library/utils/GlideUtils.kt
View file @ 23eaec41
......@@ -228,7 +228,7 @@ object GlideUtils {
}
fun loadThumbImageView(context: Context, path: String?, mImageView: ImageView) {
Glide.with(context).load("$path?x-oss-process=image/resize,p_20")
Glide.with(context).load("$path?x-oss-process")
.apply(
RequestOptions().placeholder(R.mipmap.ic_my_avat)
.error(R.mipmap.ic_my_avat)
......@@ -242,7 +242,7 @@ object GlideUtils {
mImageView: ImageView,
defaultImage: Int = R.mipmap.ic_my_avat
) {
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20").apply(
Glide.with(mContext).load("$path?x-oss-process").apply(
RequestOptions()
.placeholder(defaultImage)
.error(defaultImage)
......@@ -256,7 +256,7 @@ object GlideUtils {
mImageView: ImageView,
defaultImage: Int = R.mipmap.ic_my_avat
) {
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20").apply(
Glide.with(mContext).load("$path?x-oss-process").apply(
RequestOptions()
.transform(CenterCrop(), RoundedCorners(BubbleUtils.dp2px(10)))
.placeholder(defaultImage)
......@@ -270,7 +270,7 @@ object GlideUtils {
imageView: ImageView,
corners: Float = 10f,
) {
Glide.with(mContext).load("$path?x-oss-process=image/resize,p_20")
Glide.with(mContext).load("$path?x-oss-process")
.apply(
RequestOptions().transform(
CenterCrop(),
......
video/app/src/main/java/com/duben/loveplayletd/ad/banner/BannerManager.kt
View file @ 23eaec41
......@@ -14,6 +14,7 @@ import com.duben.loveplayletd.utils.LogUtil
import com.duben.loveplayletd.utils.UIUtils
import java.lang.ref.WeakReference
import com.duben.loveplayletd.BuildConfig
/**
* banner
*/
......@@ -77,10 +78,14 @@ object BannerManager {
override fun onAdShow(view: View?, type: Int) {
if (bannerAd != null && bannerAd!!.mediationManager != null && bannerAd!!.mediationManager.showEcpm != null
&& bannerAd!!.mediationManager.showEcpm.ecpm != null) {
&& bannerAd!!.mediationManager.showEcpm.ecpm != null
) {
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE3
vo["cpmFen"] = bannerAd!!.mediationManager.showEcpm.ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_BANNER_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = bannerAd!!.mediationManager.showEcpm.ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/draw/DrawExpressManager.kt
View file @ 23eaec41
......@@ -16,6 +16,7 @@ import com.duben.loveplayletd.BuildConfig
import com.duben.loveplayletd.MintsApplication
import com.duben.loveplayletd.R
import com.duben.loveplayletd.ad.AdManager
import com.duben.loveplayletd.ad.banner.BannerManager
import com.duben.loveplayletd.ad.express.ExpressAdCallback
import com.duben.loveplayletd.common.Constant
import com.duben.loveplayletd.manager.TrackManager
......@@ -154,7 +155,10 @@ class DrawExpressManager {
val ecpm = it.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE4
vo["cpmFen"] = ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_DRAW_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
if (it.mediationManager.isExpress) {
......
video/app/src/main/java/com/duben/loveplayletd/ad/draw/HomeDrawExpressManager.kt
View file @ 23eaec41
......@@ -147,7 +147,10 @@ class HomeDrawExpressManager {
val ecpm = it.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE4
vo["cpmFen"] = ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_DRAW_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
if (it.mediationManager.isExpress) {
......
video/app/src/main/java/com/duben/loveplayletd/ad/express/ExpressManager.kt
View file @ 23eaec41
......@@ -223,7 +223,10 @@ class ExpressManager {
val ecpm = it.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE1
vo["cpmFen"] = ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_EXPRESS_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/express/MainExpressManager.kt
View file @ 23eaec41
......@@ -153,7 +153,10 @@ class MainExpressManager {
val ecpm = it.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE1
vo["cpmFen"] = ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_EXPRESS_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/express/MyExpressManager.kt
View file @ 23eaec41
......@@ -223,7 +223,10 @@ class MyExpressManager {
val ecpm = it.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE1
vo["cpmFen"] = ecpm
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_EXPRESS_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/splash/SplashManager.kt
View file @ 23eaec41
......@@ -129,8 +129,11 @@ object SplashManager {
mTTSplashAd?.let {
if (it.mediationManager != null && it.mediationManager.showEcpm != null&& it.mediationManager.showEcpm.ecpm != null) {
val vo = HashMap<String, Any>()
vo["cpmFen"] = it.mediationManager.showEcpm.ecpm
vo["adType"] = Constant.GRO_MORE_ADTYPE0
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_EXPRESS_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = it.mediationManager.showEcpm.ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/video/InMoneyVideo.java
View file @ 23eaec41
......@@ -196,6 +196,9 @@ public class InMoneyVideo {
HashMap<String, Object> vo = new HashMap<>();
vo.put("adType", Constant.GRO_MORE_ADTYPE2);
vo.put("ecpm", nowEcpm);
vo.put("adid", "");
vo.put("adcode", BuildConfig.GROMORE_VIDEO_CODE);
vo.put("adSource", Constant.CSJ_GRORE);
TrackManager.getInstance().cmtEcpm(vo);
}
}
......
video/app/src/main/java/com/duben/loveplayletd/ad/video/InMoneyVideoNoPre.java
View file @ 23eaec41
......@@ -135,6 +135,9 @@ public class InMoneyVideoNoPre {
HashMap<String, Object> vo = new HashMap<>();
vo.put("adType", Constant.GRO_MORE_ADTYPE2);
vo.put("ecpm", nowEcpm);
vo.put("adid", "");
vo.put("adcode", BuildConfig.GROMORE_VIDEO_CODE);
vo.put("adSource", Constant.CSJ_GRORE);
TrackManager.getInstance().cmtEcpm(vo);
}
}
......
video/app/src/main/java/com/duben/loveplayletd/common/Constant.kt
View file @ 23eaec41
......@@ -27,6 +27,7 @@ object Constant {
const val MINTS_PKG_NAME = "com.duben.loveplayletd"
const val ACTION_EXIT_APP = "package.exit"
const val LUCKY_FLAG = "LUCKY_FLAG"
const val CSJ_GRORE = "csjGromore"
const val LUCKY_MY_FIRST = "LUCKY_MY_FIRST"
const val MAIN_FIRST_RECOMMEND = "MAIN_FIRST_RECOMMEND"
const val VEDIO_MAIN_COUNT = "VEDIO_MAIN_COUNT"
......
video/app/src/main/java/com/duben/loveplayletd/net/LoanService.java
View file @ 23eaec41
......@@ -344,7 +344,7 @@ public interface LoanService {
*
* @return
*/
@POST("api/vedioV1/reportOpenAdEcpm")
@POST("roseApi/ad/reportUnlockVedioAd")
Observable<BaseResponse<Object>> cmtEcpm(@Body Map<String, Object> vo);
/**
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/CsjDetailActivity.kt
View file @ 23eaec41
......@@ -22,6 +22,7 @@ import com.duben.library.utils.nodoubleclick.AntiShake
import com.duben.loveplayletd.BuildConfig
import com.duben.loveplayletd.R
import com.duben.loveplayletd.common.Constant
import com.duben.loveplayletd.manager.TrackManager
import com.duben.loveplayletd.mvp.model.VedioBean
import com.duben.loveplayletd.ui.activitys.base.BaseActivity
import com.duben.loveplayletd.ui.widgets.UnlockDialog
......@@ -194,6 +195,17 @@ class CsjDetailActivity : BaseActivity(), View.OnClickListener {
setRewardAdInteractionListener(object :
TTRewardVideoAd.RewardAdInteractionListener {
override fun onAdShow() {
if (ad.mediationManager != null && ad.mediationManager.showEcpm != null && ad.mediationManager.showEcpm.ecpm != null) {
val ecpm = ad.mediationManager.showEcpm.ecpm
val vo = HashMap<String, Any>()
vo["adType"] = Constant.GRO_MORE_ADTYPE2
vo["adid"] = ""
vo["adcode"] = BuildConfig.GROMORE_VIDEO_CODE
vo["adSource"] = Constant.CSJ_GRORE
vo["ecpm"] = ecpm
TrackManager.getInstance().cmtEcpm(vo)
}
// Toast.makeText(
// this@CsjDetailActivity,
// "自定义广告展示",
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/MainActivity.kt
View file @ 23eaec41
......@@ -196,21 +196,6 @@ class MainActivity : BaseActivity(), View.OnClickListener, MainActView {
tab_rl_msg.visibility = View.VISIBLE
if (!isLoadFlag) {
if (UserHelper.instance.isBpkg()) {
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_TWO
if (squareFragment == null) {
squareFragment = SquareFragment()
}
if (!squareFragment!!.isAdded) {
// 提交事务
supportFragmentManager.beginTransaction()
.add(R.id.content_layout, squareFragment!!).commitAllowingStateLoss()
// 记录当前Fragment
currentFragment = squareFragment
}
tab_iv_square.isSelected = true
tab_tv_square.isSelected = true
} else {
AppConfig.fragmentClickFlag = Constant.FRAGMENT_CLICK_ONE
if (videoFragment == null) {
videoFragment = FirstFragment()
......@@ -225,7 +210,6 @@ class MainActivity : BaseActivity(), View.OnClickListener, MainActView {
tab_iv_video.isSelected = true
tab_tv_video.isSelected = true
}
}
} else {
tab_rl_square.visibility = View.GONE
tab_rl_invite.visibility = View.GONE
......
video/app/src/main/java/com/duben/loveplayletd/ui/fragment/SquareFragment.kt
View file @ 23eaec41
......@@ -346,11 +346,16 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
if (data.planSex == 1) {
// 男
ll_user_root.visibility = View.GONE
} else if(data.planSex == 2){
} else if (data.planSex == 2) {
// 女
if (AppConfig.basicUserProfileFlag || UserManager.getInstance().userHasBasic()) {
ll_user_root.visibility = View.GONE
}else{
// if (data.idcardStatus == 0) {
// Handler(Looper.getMainLooper()).postDelayed({
// UserHelper.instance.showRealAuthDialog()
// }, 500)
// }
} else {
ll_user_root.visibility = View.VISIBLE
}
}
......@@ -378,12 +383,12 @@ class SquareFragment : LazyLoadBaseFragment(), SquareView, View.OnClickListener
requestPermissions()
}
R.id.ll_user_root -> {
val intent= Intent(requireContext(), BasicUserProfileActivity::class.java)
val intent = Intent(requireContext(), BasicUserProfileActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
startActivity(intent)
}
R.id.iv_user_quit -> {
ll_user_root.visibility=View.GONE
ll_user_root.visibility = View.GONE
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment