Skip to content

A
android_goodmoney
Commit b4476efa authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

优化穿山甲获取ip为空问题

parent de7f256a
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 45 deletions
GoodMoney/app/build.gradle
View file @ b4476efa
......@@ -9,8 +9,8 @@ android {
applicationId "com.mints.goodmoney"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 20
versionName "1.1.9"
versionCode 21
versionName "1.2.0"
flavorDimensions "default"
// dex突破65535的限制
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/CsjVideoAdManager.java
View file @ b4476efa
......@@ -67,7 +67,7 @@ public class CsjVideoAdManager extends BaseVideoAd {
if (mttRewardVideoAd != null) {
mttRewardVideoAd.setRewardAdInteractionListener(null);
}
ps=null;
ps = null;
activity = null;
}
......@@ -278,9 +278,10 @@ public class CsjVideoAdManager extends BaseVideoAd {
vo.put("adtype", Constant.ADTYPE_VEDIO);
vo.put("tid", tid);
vo.put("adsource", Constant.AD_SOURCE_CSJ);
if (ps != null) {
vo.put("ip", ps.getString(Constant.CSJ_VEDIO_APPIP, ""));
if (ps == null) {
ps = new AppPreferences(activity);
}
vo.put("ip", ps.getString(Constant.CSJ_VEDIO_APPIP, ""));
switch (carrierType) {
case Constant.CARRIER_VERSUS_VIDEO:// 每日任务-视频
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/KsVideoAdManager.kt
View file @ b4476efa
......@@ -55,9 +55,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
val scene = KsScene.Builder(KsManager.KS_AD_VEDIO_POSTID).build()
KsAdSDK.getLoadManager().loadRewardVideoAd(scene, object : KsLoadManager.RewardVideoAdListener {
override fun onError(p0: Int, p1: String?) {
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adFail()
}
vedioAdStatusListener?.adFail()
}
override fun onRewardVideoAdLoad(p0: MutableList<KsRewardVideoAd>?) {
......@@ -79,9 +77,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_FOUR, "", "")
isClickScreen = false
}
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adDownload()
}
vedioAdStatusListener?.adDownload()
}
override fun onPageDismiss() {
......@@ -91,9 +87,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_THREE, "", "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adSuccess()
}
vedioAdStatusListener?.adSuccess()
}
override fun onVideoPlayError(p0: Int, p1: Int) {
......@@ -101,9 +95,7 @@ class KsVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_KS, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adFail()
}
vedioAdStatusListener?.adFail()
}
override fun onVideoPlayEnd() {
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/MhVideoAdManager.kt
View file @ b4476efa
......@@ -85,9 +85,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_FOUR, "", "")
isClickScreen = false
}
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adDownload()
}
vedioAdStatusListener?.adDownload()
}
override fun onVideoComplete() {
......@@ -101,9 +99,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_THREE, "", "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adSuccess()
}
vedioAdStatusListener?.adSuccess()
}
override fun onADError(p0: Int) {
......@@ -111,9 +107,7 @@ class MhVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adFail()
}
vedioAdStatusListener?.adFail()
}
})
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/ShVideoAdManager.kt
View file @ b4476efa
......@@ -106,9 +106,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_ONE, (adError.code).toString(), "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adFail()
}
vedioAdStatusListener?.adFail()
}
override fun onAdShow(@Nullable ad: CoralAD?): Boolean {
......@@ -130,9 +128,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_FOUR, "", "")
isClickScreen = false
}
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adDownload()
}
vedioAdStatusListener?.adDownload()
return super.onAdClicked(ad)
}
......@@ -171,9 +167,7 @@ class ShVideoAdManager private constructor(activity: Activity) :
LogUtil.d(TAG, "onVideoClosed")
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SH, Constant.EVENT_TYPE_THREE, "", "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adSuccess()
}
vedioAdStatusListener?.adSuccess()
return super.onVideoClosed(coralAD, s)
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/WnVideoAdManager.kt
View file @ b4476efa
......@@ -66,9 +66,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_ONE, (code).toString(), message)
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adFail()
}
vedioAdStatusListener?.adFail()
}
override fun onLoad(ad: WNRewardVideoAd) {
......@@ -89,9 +87,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_FOUR, "", "")
isClickScreen = false
}
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adDownload()
}
vedioAdStatusListener?.adDownload()
}
override fun onAdClose() {
......@@ -99,9 +95,7 @@ class WnVideoAdManager private constructor(activity: Activity) :
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_THREE, "", "")
if (vedioAdStatusListener != null) {
vedioAdStatusListener?.adSuccess()
}
vedioAdStatusListener?.adSuccess()
}
override fun onVideoComplete() {
......
GoodMoney/app/src/main/res/layout/progress_horizontal.xml
View file @ b4476efa
......@@ -21,5 +21,4 @@
android:layout_height="wrap_content"
android:background="@null"
android:indeterminateOnly="false"
android:max="100"
android:progressDrawable="@drawable/progress_bar_horizontal" />
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