Skip to content

A
android_fiveworld
Commit 4e302152 authored by mengcuiguang2's avatar mengcuiguang2
Browse files
Options

Merge branch 'dev_new_inout' into dev_gro3

parents 45c062dd 1587c0ea
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 61 deletions
app/src/main/java/com/mints/fiveworld/manager/UmengManager.kt
View file @ 4e302152
...@@ -66,26 +66,26 @@ object UmengManager { ...@@ -66,26 +66,26 @@ object UmengManager {
* 友盟埋点 * 友盟埋点
*/ */
fun onEvent(name: String) { fun onEvent(name: String) {
if(BuildConfig.DEBUG){ // if(BuildConfig.DEBUG){
LogUtil.d(TAG, "name=${name} remark=${AdReportManager.EventType.valueOf(name).value}") // LogUtil.d(TAG, "name=${name} remark=${AdReportManager.EventType.valueOf(name).value}")
//
//
TrackManager.getInstance().tempaddCallImp( // TrackManager.getInstance().tempaddCallImp(
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
"", // "",
System.currentTimeMillis(), // System.currentTimeMillis(),
name, // name,
AdReportManager.EventType.valueOf(name).value // AdReportManager.EventType.valueOf(name).value
) // )
} // }
// 上送umeng // 上送umeng
MobclickAgent.onEvent(MintsApplication.getContext(), name) MobclickAgent.onEvent(MintsApplication.getContext(), name)
......
app/src/main/java/com/mints/fiveworld/manager/ad/CsjGroMoreManager.kt
View file @ 4e302152
...@@ -23,19 +23,19 @@ object CsjGroMoreManager { ...@@ -23,19 +23,19 @@ object CsjGroMoreManager {
//-------------------------广告位 start----------------------------- //-------------------------广告位 start-----------------------------
private const val OUT_COMMON_INTERSTITIAL_CODE = "" // 应用外 场景 插屏 private const val OUT_COMMON_INTERSTITIAL_CODE = "" // 应用外 场景 插屏
private const val OUT_COMMON_NEW_INTERSTITIAL_CODE = "946855683" // 应用外 场景 新插屏(半屏) private const val OUT_COMMON_NEW_INTERSTITIAL_CODE = "947383652" // 应用外 场景 新插屏(半屏)
private const val OUT_COMMON_FULL_CODE = "946855680" // 应用外 场景 新插屏(全屏) private const val OUT_COMMON_FULL_CODE = "947383645" // 应用外 场景 新插屏(全屏)
private const val OUT_COMMON_EXPRESS_CODE = "946855687" // 应用外 场景 信息流 private const val OUT_COMMON_EXPRESS_CODE = "947383660" // 应用外 场景 信息流
private const val OUT_LOCK_EXPRESS_CODE = "946855685" // 应用外 锁屏 信息流 private const val OUT_LOCK_EXPRESS_CODE = "947383657" // 应用外 锁屏 信息流
private const val OUT_TIMER_FULL_CODE = "946855678" // 应用外 定时 新插屏(全屏) private const val OUT_TIMER_FULL_CODE = "947383654" // 应用外 定时 新插屏(全屏)
private const val OUT_TIMER_INTERSTITIAL_CODE = "" // 应用外 定时 插屏 private const val OUT_TIMER_INTERSTITIAL_CODE = "" // 应用外 定时 插屏
private const val OUT_TIMER_NEW_INTERSTITIAL_CODE = "946855682" // 应用外 定时 新插屏(半屏) private const val OUT_TIMER_NEW_INTERSTITIAL_CODE = "947383655" // 应用外 定时 新插屏(半屏)
private const val IN_COMMON_FULL_CODE = "946855681" // 应用内 场景 新插屏(全屏) private const val IN_COMMON_FULL_CODE = "947383649" // 应用内 场景 新插屏(全屏)
private const val IN_COMMON_INTERSTITIAL_CODE = "" // 应用内 场景 插屏 private const val IN_COMMON_INTERSTITIAL_CODE = "" // 应用内 场景 插屏
private const val IN_COMMON_NEW_INTERSTITIAL_CODE = "946855684" // 应用内 场景 新插屏(半屏) private const val IN_COMMON_NEW_INTERSTITIAL_CODE = "947383661" // 应用内 场景 新插屏(半屏)
private const val IN_COMMON_EXPRESS_CODE = "946855688" // 应用内 场景 信息流 private const val IN_COMMON_EXPRESS_CODE = "947383658" // 应用内 场景 信息流
private const val IN_MONEY_SPLASH_CODE = "887587321" // 应用内 网赚 开屏 private const val IN_MONEY_SPLASH_CODE = "887645925" // 应用内 网赚 开屏
private const val IN_MONEY_SPLASH_AD_CODE = "" // 应用内 网赚 开屏 兜底（代码位） private const val IN_MONEY_SPLASH_AD_CODE = "" // 应用内 网赚 开屏 兜底（代码位）
//-------------------------广告位 end----------------------------- //-------------------------广告位 end-----------------------------
......
app/src/main/java/com/mints/fiveworld/manager/ad/TTGroMoreAdManagerHolder.java
View file @ 4e302152
...@@ -30,7 +30,7 @@ import java.util.Map; ...@@ -30,7 +30,7 @@ import java.util.Map;
*/ */
public class TTGroMoreAdManagerHolder { public class TTGroMoreAdManagerHolder {
public static final String TT_AD_APPID = "5224123"; public static final String TT_AD_APPID = "5244019";
public static final String TT_AD_NAME = Constant.MINTS_APP_NAME; public static final String TT_AD_NAME = Constant.MINTS_APP_NAME;
public static boolean sInit; public static boolean sInit;
......
app/src/main/java/com/mints/fiveworld/mvp/presenters/SplashPresenter.kt
View file @ 4e302152
...@@ -15,8 +15,6 @@ import com.mints.fiveworld.mvp.views.SplashView ...@@ -15,8 +15,6 @@ import com.mints.fiveworld.mvp.views.SplashView
import com.mints.fiveworld.utils.AccessibilityUtils import com.mints.fiveworld.utils.AccessibilityUtils
import com.mints.fiveworld.utils.DeviceUuidFactory import com.mints.fiveworld.utils.DeviceUuidFactory
import com.mints.fiveworld.utils.LogUtil import com.mints.fiveworld.utils.LogUtil
import com.mints.fiveworld.utils.rxutil.CommonRxTask
import com.mints.fiveworld.utils.rxutil.RxjavaUtil
import com.mints.library.net.neterror.BaseSubscriber import com.mints.library.net.neterror.BaseSubscriber
import com.mints.library.net.neterror.Throwable import com.mints.library.net.neterror.Throwable
import com.mints.library.utils.CommonUtils import com.mints.library.utils.CommonUtils
...@@ -24,8 +22,40 @@ import java.util.* ...@@ -24,8 +22,40 @@ import java.util.*
class SplashPresenter : BasePresenter<SplashView>() { class SplashPresenter : BasePresenter<SplashView>() {
fun blackOuterAd(senceType: String) {
LogUtil.d("SplashPresenter222","4、拉黑 blackOuterAd 请求-1")
val vo = HashMap<String, Any>()
vo["senceType"] = senceType
vo["uid"] = UserManager.getInstance().userID
vo["deviceId"] = DeviceUuidFactory().deviceUuid.toString()
AppHttpManager.getInstance(loanApplication)
.call(loanService.blackOuterAd(vo),
object : BaseSubscriber<BaseResponse<Any>>() {
override fun onCompleted() {}
override fun onError(e: Throwable) {
if (isLinkView) return
LogUtil.d("SplashPresenter222","4、拉黑 blackOuterAd onError-2")
view.getAppsCountFail()
}
override fun onNext(baseResponse: BaseResponse<Any>) {
if (isLinkView) return
LogUtil.d("SplashPresenter222","4、拉黑 blackOuterAd 返回onNext 200-2")
val code = baseResponse.status
when (code) {
200 -> {
view.getBlackSuc()
}
else -> view.getAppsCountFail()
}
}
})
}
fun getCloseNeedInitAppsCount() { fun getCloseNeedInitAppsCount() {
LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 请求-1") LogUtil.d("SplashPresenter222","1、获取策略接口 getCloseNeedInitAppsCount 请求-1")
val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
vo["os"] = "Android" vo["os"] = "Android"
...@@ -40,7 +70,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -40,7 +70,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
if (isLinkView) return if (isLinkView) return
LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount onError-2") LogUtil.d("SplashPresenter222","1、获取策略接口 getCloseNeedInitAppsCount onError-2")
view.getAppsCountFail() view.getAppsCountFail()
} }
...@@ -50,14 +80,14 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -50,14 +80,14 @@ class SplashPresenter : BasePresenter<SplashView>() {
val code = baseResponse.status val code = baseResponse.status
when (code) { when (code) {
200 -> { 200 -> {
LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext 200-2") LogUtil.d("SplashPresenter222","1、获取策略接口 getCloseNeedInitAppsCount 返回onNext 200-2")
if (!TextUtils.isEmpty(UserManager.getInstance().userID)) { if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext getAppsCountSuc 200-2.1") LogUtil.d("SplashPresenter222","1、获取策略接口 getCloseNeedInitAppsCount 返回onNext getAppsCountSuc 200-2.1")
view.getAppsCountSuc(baseResponse.data) view.getAppsCountSuc(baseResponse.data)
} else { } else {
LogUtil.d("SplashPresenter222","getCloseNeedInitAppsCount 返回onNext userLogin 200-2.1") LogUtil.d("SplashPresenter222","1、获取策略接口 getCloseNeedInitAppsCount 返回onNext userLogin 200-2.1")
userLogin(baseResponse.data) userLogin(baseResponse.data)
} }
...@@ -76,7 +106,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -76,7 +106,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
* 游客登录 * 游客登录
*/ */
fun userLogin(splashBean: SplashAppBean) { fun userLogin(splashBean: SplashAppBean) {
LogUtil.d("SplashPresenter222","userLogin 请求-1") LogUtil.d("SplashPresenter222","2、游客登录 userLogin 请求-1")
val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
vo["device"] = DeviceUuidFactory().deviceUuid.toString() vo["device"] = DeviceUuidFactory().deviceUuid.toString()
...@@ -89,13 +119,13 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -89,13 +119,13 @@ class SplashPresenter : BasePresenter<SplashView>() {
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
if (isLinkView) return if (isLinkView) return
view.getAppsCountFail() view.getAppsCountFail()
LogUtil.d("SplashPresenter222","userLogin onError-2") LogUtil.d("SplashPresenter222","2、游客登录 userLogin onError-2")
} }
override fun onNext(baseResponse: BaseResponse<UserBean>) { override fun onNext(baseResponse: BaseResponse<UserBean>) {
if (isLinkView) return if (isLinkView) return
LogUtil.d("SplashPresenter222","userLogin 返回onNext 200-2") LogUtil.d("SplashPresenter222","2、游客登录 userLogin 返回onNext 200-2")
val code = baseResponse.status val code = baseResponse.status
val message = baseResponse.message val message = baseResponse.message
...@@ -116,7 +146,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -116,7 +146,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
* 提交设备信息 * 提交设备信息
*/ */
private fun saveTerminalInfo(splashBean: SplashAppBean) { private fun saveTerminalInfo(splashBean: SplashAppBean) {
LogUtil.d("SplashPresenter222","saveTerminalInfo 请求-1") LogUtil.d("SplashPresenter222","3、设备信息 saveTerminalInfo 请求-1")
val deviceInfo: DeviceInfo = DeviceInfo.instance val deviceInfo: DeviceInfo = DeviceInfo.instance
val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
...@@ -156,7 +186,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -156,7 +186,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
if (isLinkView) return if (isLinkView) return
view.getAppsCountFail() view.getAppsCountFail()
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回 onError") LogUtil.d("SplashPresenter222","3、设备信息 saveTerminalInfo 返回 onError")
} }
...@@ -169,7 +199,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -169,7 +199,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
TrackManager.getInstance().riskCmtInfo() TrackManager.getInstance().riskCmtInfo()
} }
LogUtil.d("SplashPresenter222","saveTerminalInfo 返回onNext 200-2") LogUtil.d("SplashPresenter222","3、设备信息 saveTerminalInfo 返回onNext 200-2")
view.getAppsCountSuc(splashBean) view.getAppsCountSuc(splashBean)
...@@ -201,7 +231,7 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -201,7 +231,7 @@ class SplashPresenter : BasePresenter<SplashView>() {
} }
private fun installApp() { private fun installApp() {
LogUtil.d("SplashPresenter222","installApp 请求-1") LogUtil.d("SplashPresenter222","5、安装 installApp 请求-1")
val vo = HashMap<String, Any>() val vo = HashMap<String, Any>()
vo["device"] = DeviceUuidFactory().deviceUuid.toString() vo["device"] = DeviceUuidFactory().deviceUuid.toString()
...@@ -212,12 +242,12 @@ class SplashPresenter : BasePresenter<SplashView>() { ...@@ -212,12 +242,12 @@ class SplashPresenter : BasePresenter<SplashView>() {
} }
override fun onError(e: Throwable) { override fun onError(e: Throwable) {
LogUtil.d("SplashPresenter222","installApp onError-2") LogUtil.d("SplashPresenter222","5、安装 installApp onError-2")
} }
override fun onNext(baseResponse: BaseResponse<Any>) { override fun onNext(baseResponse: BaseResponse<Any>) {
LogUtil.d("SplashPresenter222","installApp 返回onNext -2") LogUtil.d("SplashPresenter222","5、安装 installApp 返回onNext -2")
} }
}) })
......
app/src/main/java/com/mints/fiveworld/mvp/views/SplashView.kt
View file @ 4e302152
...@@ -8,4 +8,6 @@ interface SplashView : BaseView { ...@@ -8,4 +8,6 @@ interface SplashView : BaseView {
fun getAppsCountSuc(data: SplashAppBean?) fun getAppsCountSuc(data: SplashAppBean?)
fun getAppsCountFail() fun getAppsCountFail()
fun getBlackSuc()
} }
app/src/main/java/com/mints/fiveworld/ui/activitys/SplashActivity.java
View file @ 4e302152
...@@ -56,7 +56,7 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -56,7 +56,7 @@ public class SplashActivity extends BaseActivity implements SplashView {
PowerDialog powerDialog; PowerDialog powerDialog;
private static final String TAG = "SplashGroMoreActivity"; private static final String TAG = "SplashActivity";
private GMSplashAd mTTSplashAd; private GMSplashAd mTTSplashAd;
private FrameLayout mSplashContainer; private FrameLayout mSplashContainer;
//是否强制跳转到主页面 //是否强制跳转到主页面
...@@ -106,6 +106,9 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -106,6 +106,9 @@ public class SplashActivity extends BaseActivity implements SplashView {
private void initData() { private void initData() {
try { try {
LogUtil.d("SplashPresenter222","initData initData initData");
mSplashContainer = findViewById(R.id.splash_container); mSplashContainer = findViewById(R.id.splash_container);
// // 若应用内广告关闭 则不展示开屏 // // 若应用内广告关闭 则不展示开屏
...@@ -465,6 +468,8 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -465,6 +468,8 @@ public class SplashActivity extends BaseActivity implements SplashView {
@Override @Override
public void getAppsCountSuc(SplashAppBean data) { public void getAppsCountSuc(SplashAppBean data) {
LogUtil.d("SplashPresenter222","getAppsCountSuc getCloseNeedInitAppsCount="+data.getCloseNeedInitAppsCount());
// 预加载广告 // 预加载广告
AdHelper.INSTANCE.preLoadAllAds(this); AdHelper.INSTANCE.preLoadAllAds(this);
...@@ -483,13 +488,8 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -483,13 +488,8 @@ public class SplashActivity extends BaseActivity implements SplashView {
UmengManager.INSTANCE.onEvent(AdReportManager.EventType.EVENT_TYPE_BLACK_FOR_VPN.name()); UmengManager.INSTANCE.onEvent(AdReportManager.EventType.EVENT_TYPE_BLACK_FOR_VPN.name());
AntiAuditManager.Companion.getInstance().setBlack(true); AntiAuditManager.Companion.getInstance().setBlack(true);
AntiAuditManager.Companion.getInstance().cmtBlackToServier(AntiAuditManager.SENCE_VPN); splashPresenter.blackOuterAd(AntiAuditManager.SENCE_VPN);
return;
// TrackManager.getInstance().getCommonHallBaseMsg();
// TrackManager.getInstance().firstApiWithUid();
// 预加载弹窗信息流
// mMainHandler.postDelayed(this::goToMainActivity, 500);
// return;
} }
// 反策略 // 反策略
...@@ -508,14 +508,11 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -508,14 +508,11 @@ public class SplashActivity extends BaseActivity implements SplashView {
if (isNoAd) { if (isNoAd) {
// 命中反策略拉黑 // 命中反策略拉黑
UmengManager.INSTANCE.onEvent(AdReportManager.EventType.EVENT_TYPE_BLACK_FOR_LIMIT.name()); UmengManager.INSTANCE.onEvent(AdReportManager.EventType.EVENT_TYPE_BLACK_FOR_LIMIT.name());
// 命中反策略
AntiAuditManager.Companion.getInstance().setBlack(true); AntiAuditManager.Companion.getInstance().setBlack(true);
AntiAuditManager.Companion.getInstance().cmtBlackToServier(AntiAuditManager.SENCE_FAZHI); splashPresenter.blackOuterAd(AntiAuditManager.SENCE_FAZHI);
}else{
initData();
} }
initData();
} }
}); });
} }
...@@ -595,4 +592,9 @@ public class SplashActivity extends BaseActivity implements SplashView { ...@@ -595,4 +592,9 @@ public class SplashActivity extends BaseActivity implements SplashView {
}); });
powerDialog.show(); powerDialog.show();
} }
@Override
public void getBlackSuc() {
initData();
}
} }
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