Skip to content

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

添加分享代码位，按载体区分

parent 192d16bd
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 78 deletions
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/vedio/CsjVedioAdManager.java
View file @ 14d42a9b
......@@ -90,7 +90,11 @@ public class CsjVedioAdManager extends BaseVedioAd {
codeId = TtCsjAdManager.TT_AD_VEDIO_MAIN;
break;
case Constant.CARRIER_OFFLINE_DOUBLE:// 离线收益翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_OFFINELINE;
break;
case Constant.CARRIER_SIGNIN_HOMEPAGE_CARD:// 签到翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_SIGN;
break;
case Constant.CARRIER_WALK_BUBBLE:// 汽泡
codeId = TtCsjAdManager.TT_AD_VEDIO_MOREDIALOG;
break;
......@@ -104,6 +108,9 @@ public class CsjVedioAdManager extends BaseVedioAd {
case Constant.CARRIER_CHALLENGE_CARD:// 刮刮乐
codeId = TtCsjAdManager.TT_AD_VEDIO_ERASE;
break;
case Constant.CARRIER_BLESSINGBAG_DOUBLE:// 福袋
codeId = TtCsjAdManager.TT_AD_VEDIO_BLESSINGBAG;
break;
default:// 在线收益翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_MOREDIALOG;
break;
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/vedio/YlhVedioAdManager.java
View file @ 14d42a9b
......@@ -3,12 +3,14 @@ package com.mints.goodmoney.ad.vedio;
import android.app.Activity;
import android.os.SystemClock;
import com.mints.goodmoney.MintsApplication;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.manager.TrackManager;
import com.mints.goodmoney.manager.YlhAdManager;
import com.mints.goodmoney.mvp.presenters.YlhVedioAdPresenter;
import com.mints.goodmoney.mvp.views.VedioAdManagerView;
import com.mints.goodmoney.utils.LogUtil;
import com.mints.goodmoney.utils.ToastUtil;
import com.qq.e.ads.rewardvideo.RewardVideoAD;
import com.qq.e.ads.rewardvideo.RewardVideoADListener;
import com.qq.e.comm.util.AdError;
......@@ -98,7 +100,11 @@ public class YlhVedioAdManager extends BaseVedioAd implements VedioAdManagerView
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_MAIN_POSTID();
break;
case Constant.CARRIER_OFFLINE_DOUBLE:// 离线收益翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_OFFINELINE_POSTID();
break;
case Constant.CARRIER_SIGNIN_HOMEPAGE_CARD:// 签到翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_SIGN_POSTID();
break;
case Constant.CARRIER_WALK_BUBBLE:// 汽泡
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_MOREDIALOG_POSTID();
break;
......@@ -112,11 +118,14 @@ public class YlhVedioAdManager extends BaseVedioAd implements VedioAdManagerView
case Constant.CARRIER_CHALLENGE_CARD:// 刮刮乐
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_ERASE_POSTID();
break;
case Constant.CARRIER_BLESSINGBAG_DOUBLE:// 福袋
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_BLESSINGBAG_POSTID();
break;
default:// 在线收益翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_MOREDIALOG_POSTID();
break;
}
// ToastUtil.showLong(MintsApplication.getContext(), "ylh vedio:" + ylhPostId);
ToastUtil.show(MintsApplication.getContext(), "ylh vedio:" + ylhPostId);
if (rewardVideoAD != null) {
rewardVideoAD = null;
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/common/AppConfig.java
View file @ 14d42a9b
......@@ -33,6 +33,11 @@ public class AppConfig {
*/
public static String user_channel_ad = "";
/**
* 用户注册渠道
*/
public static String user_register_channel = "";
/**
* 趣步赚成功标记
*/
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java
View file @ 14d42a9b
package com.mints.goodmoney.manager;
import android.content.Context;
import android.text.TextUtils;
import com.bytedance.sdk.openadsdk.TTAdConfig;
import com.bytedance.sdk.openadsdk.TTAdConstant;
import com.bytedance.sdk.openadsdk.TTAdSdk;
import com.mints.goodmoney.BuildConfig;
import com.mints.goodmoney.MintsApplication;
import com.mints.goodmoney.common.AppConfig;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.mvp.model.AdcodeBean;
import com.mints.goodmoney.mvp.model.UserMsgBean;
......@@ -29,7 +31,10 @@ public class TtCsjAdManager {
public static String TT_AD_VEDIO_MAIN = "945562036";// 我的界面视频
public static String TT_AD_VEDIO_ERASE = "945562037";// 刮刮乐
public static String TT_AD_VEDIO_TURNABLE = "945562039";// 大转盘
public static String TT_AD_VEDIO_MOREDIALOG = "945562040";// 签到、气泡、离线弹框
public static String TT_AD_VEDIO_MOREDIALOG = "945562040";// 气泡
public static String TT_AD_VEDIO_SIGN = "945562040";// 签到
public static String TT_AD_VEDIO_OFFINELINE = "945562040";// 离线弹框
public static String TT_AD_VEDIO_BLESSINGBAG = "945562040";// 福袋
public static String TT_AD_VEDIO_GAME = "945562067";// 猎豹
public static String TT_AD_VEDIO_JULEYUN = "945675529";// 聚乐云
/*信息流*/
......@@ -101,19 +106,24 @@ public class TtCsjAdManager {
if (idBean != null) {
// 后台返回 用户注册渠道
// 信息流
TT_AD_NATIVEEXPRESS_AWARD = idBean.getCsj().getCsjv1();
TT_AD_NATIVEEXPRESS_WALK = idBean.getCsj().getCsjv2();
TT_AD_NATIVEEXPRESS_WATER = idBean.getCsj().getCsjv2();
TT_AD_NATIVEEXPRESS_MORNINGCLOCK = idBean.getCsj().getCsjv2();
TT_AD_NATIVEEXPRESS_EAT = idBean.getCsj().getCsjv2();
TT_AD_NATIVEEXPRESS_AWARD = idBean.getCsjv1();
TT_AD_NATIVEEXPRESS_WALK = idBean.getCsjv2();
TT_AD_NATIVEEXPRESS_WATER = idBean.getCsjv2();
TT_AD_NATIVEEXPRESS_MORNINGCLOCK = idBean.getCsjv2();
TT_AD_NATIVEEXPRESS_EAT = idBean.getCsjv2();
// 激励视频
TT_AD_VEDIO_DRINK = idBean.getCsj().getCsjv3();
TT_AD_VEDIO_MAIN = idBean.getCsj().getCsjv3();
TT_AD_VEDIO_ERASE = idBean.getCsj().getCsjv3();
TT_AD_VEDIO_TURNABLE = idBean.getCsj().getCsjv3();
TT_AD_VEDIO_MOREDIALOG = idBean.getCsj().getCsjv3();
TT_AD_VEDIO_DRINK = idBean.getCsjv3();
TT_AD_VEDIO_MAIN = idBean.getCsjv3();
TT_AD_VEDIO_ERASE = idBean.getCsjv3();
TT_AD_VEDIO_TURNABLE = idBean.getCsjv3();
TT_AD_VEDIO_MOREDIALOG = idBean.getCsjv3();
TT_AD_VEDIO_OFFINELINE = idBean.getCsjv3();
TT_AD_VEDIO_BLESSINGBAG = idBean.getCsjv3();
TT_AD_VEDIO_SIGN = idBean.getCsjv3();
// banner
TT_AD_BANNER_MY = idBean.getCsj().getCsjv4();
TT_AD_BANNER_MY = idBean.getCsjv4();
loadShareChannel(idBean);
return;
}
......@@ -121,6 +131,7 @@ public class TtCsjAdManager {
loadLocalChannel();
}
/**
* 加载本地渠道
*/
......@@ -139,9 +150,13 @@ public class TtCsjAdManager {
TT_AD_VEDIO_ERASE = "945666029";
TT_AD_VEDIO_TURNABLE = "945666029";
TT_AD_VEDIO_MOREDIALOG = "945666029";
TT_AD_VEDIO_OFFINELINE = "945666029";
TT_AD_VEDIO_SIGN = "945666029";
TT_AD_VEDIO_BLESSINGBAG = "945666029";
// banner
TT_AD_BANNER_MY = "945666042";
loadShareChannel(null);
return;
}
......@@ -159,7 +174,31 @@ public class TtCsjAdManager {
TT_AD_VEDIO_ERASE = "945562037";
TT_AD_VEDIO_TURNABLE = "945562039";
TT_AD_VEDIO_MOREDIALOG = "945562040";
TT_AD_VEDIO_OFFINELINE = "945562040";
TT_AD_VEDIO_SIGN = "945562040";
TT_AD_VEDIO_BLESSINGBAG = "945562040";
// banner
TT_AD_BANNER_MY = "945661050";
loadShareChannel(null);
}
/**
* 分享用户代码位
*
* @param idBean
*/
private static void loadShareChannel(AdcodeBean idBean) {
if (idBean != null) {
if (!TextUtils.isEmpty(AppConfig.user_register_channel) &&
AppConfig.user_register_channel.contains("share")) {
TT_AD_VEDIO_OFFINELINE = idBean.getSharecsjv2();
TT_AD_VEDIO_BLESSINGBAG = idBean.getSharecsjv1();
TT_AD_VEDIO_SIGN = idBean.getSharecsjv3();
}
} else {
TT_AD_VEDIO_OFFINELINE = "945730111";
TT_AD_VEDIO_BLESSINGBAG = "945730117";
TT_AD_VEDIO_SIGN = "945730109";
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/YlhAdManager.kt
View file @ 14d42a9b
package com.mints.goodmoney.manager
import android.content.Context
import android.text.TextUtils
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.common.AppConfig
import com.mints.goodmoney.mvp.model.AdcodeBean
import com.mints.library.utils.CommonUtils
import com.qq.e.comm.managers.GDTADManager
......@@ -24,7 +26,10 @@ object YlhAdManager {
var YLH_AD_VEDIO_MAIN_POSTID = "8081940760988417" //我的界面视频
var YLH_AD_VEDIO_ERASE_POSTID = "9061142700180449" //挑战刮刮乐
var YLH_AD_VEDIO_TURNABLE_POSTID = "5051746700185561" //大转盘
var YLH_AD_VEDIO_MOREDIALOG_POSTID = "9001346780383626" //签到、气泡、离线弹框
var YLH_AD_VEDIO_MOREDIALOG_POSTID = "9001346780383626" //气泡
var YLH_AD_VEDIO_SIGN_POSTID = "9001346780383626" //签到
var YLH_AD_VEDIO_OFFINELINE_POSTID = "9001346780383626" //离线弹框
var YLH_AD_VEDIO_BLESSINGBAG_POSTID = "9001346780383626" //福袋
var YLH_AD_VEDIO_GAME_POSTID = "9051646750686770" //猎豹游戏
var YLH_AD_VEDIO_JULEYUN_POSTID = "1011746770898338" //聚乐云
......@@ -51,14 +56,18 @@ object YlhAdManager {
if (idBean != null) {
// 后台返回 用户注册渠道
// 开屏
YLH_AD_SPLASH_POSTID = idBean.ylh.ylhv1
YLH_AD_SPLASH_POSTID = idBean.ylhv1
// 激励视频
YLH_AD_VEDIO_DRINK_POSTID = idBean.ylh.ylhv2
YLH_AD_VEDIO_MAIN_POSTID = idBean.ylh.ylhv2
YLH_AD_VEDIO_ERASE_POSTID = idBean.ylh.ylhv2
YLH_AD_VEDIO_TURNABLE_POSTID = idBean.ylh.ylhv2
YLH_AD_VEDIO_MOREDIALOG_POSTID = idBean.ylh.ylhv2
YLH_AD_VEDIO_DRINK_POSTID = idBean.ylhv2
YLH_AD_VEDIO_MAIN_POSTID = idBean.ylhv2
YLH_AD_VEDIO_ERASE_POSTID = idBean.ylhv2
YLH_AD_VEDIO_TURNABLE_POSTID = idBean.ylhv2
YLH_AD_VEDIO_MOREDIALOG_POSTID = idBean.ylhv2
YLH_AD_VEDIO_BLESSINGBAG_POSTID = idBean.ylhv2
YLH_AD_VEDIO_SIGN_POSTID = idBean.ylhv2
YLH_AD_VEDIO_OFFINELINE_POSTID = idBean.ylhv2
loadShareChannel(idBean)
return
}
......@@ -67,6 +76,7 @@ object YlhAdManager {
loadLocalChannel()
}
private fun loadLocalChannel() {
val channel = CommonUtils.getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
if (channel.contains(ChannelManager.CHANNEL_TOUTIAO)) {
......@@ -79,6 +89,10 @@ object YlhAdManager {
YLH_AD_VEDIO_ERASE_POSTID = "7091944614237712"
YLH_AD_VEDIO_TURNABLE_POSTID = "7091944614237712"
YLH_AD_VEDIO_MOREDIALOG_POSTID = "7091944614237712"
YLH_AD_VEDIO_SIGN_POSTID = "7091944614237712"
YLH_AD_VEDIO_BLESSINGBAG_POSTID = "7091944614237712"
YLH_AD_VEDIO_OFFINELINE_POSTID = "7091944614237712"
loadShareChannel(null)
return
}
......@@ -92,6 +106,33 @@ object YlhAdManager {
YLH_AD_VEDIO_ERASE_POSTID = "9061142700180449"
YLH_AD_VEDIO_TURNABLE_POSTID = "5051746700185561"
YLH_AD_VEDIO_MOREDIALOG_POSTID = "9001346780383626"
YLH_AD_VEDIO_SIGN_POSTID = "9001346780383626"
YLH_AD_VEDIO_BLESSINGBAG_POSTID = "9001346780383626"
YLH_AD_VEDIO_OFFINELINE_POSTID = "9001346780383626"
loadShareChannel(null)
}
/**
* 分享用户代码位
*
* @param idBean
*/
private fun loadShareChannel(idBean: AdcodeBean?) {
if (idBean != null) {
if (!TextUtils.isEmpty(AppConfig.user_register_channel) &&
AppConfig.user_register_channel.contains("share")) {
YLH_AD_VEDIO_BLESSINGBAG_POSTID = idBean.shareylhv1
YLH_AD_VEDIO_SIGN_POSTID = idBean.shareylhv3
YLH_AD_VEDIO_OFFINELINE_POSTID = idBean.shareylhv2
}
} else {
if (!TextUtils.isEmpty(AppConfig.user_register_channel) &&
AppConfig.user_register_channel.contains("share")) {
YLH_AD_VEDIO_BLESSINGBAG_POSTID = "1081758148138388"
YLH_AD_VEDIO_SIGN_POSTID = "2091354158635490"
YLH_AD_VEDIO_OFFINELINE_POSTID = "2031954198632389"
}
}
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/AdcodeBean.java
View file @ 14d42a9b
......@@ -7,56 +7,72 @@ import java.io.Serializable;
*/
public class AdcodeBean implements Serializable {
private CsjBean csj;
private YlhBean ylh;
private String csjv1;//奖励弹框信息流
private String csjv2;//喝水等 通用信息流
private String csjv3;//激励视频
private String csjv4;//Banner
private String ylhv1;//开屏
private String ylhv2;//激励
private String shareylhv1;
private String shareylhv2;
private String shareylhv3;
private String sharecsjv1;
private String sharecsjv2;
private String sharecsjv3;
private String key;
public CsjBean getCsj() {
return csj;
public String getCsjv1() {
return csjv1;
}
public YlhBean getYlh() {
return ylh;
public String getCsjv2() {
return csjv2;
}
public String getKey() {
return key;
public String getCsjv3() {
return csjv3;
}
public String getCsjv4() {
return csjv4;
}
public class CsjBean implements Serializable {
private String csjv1;//奖励弹框信息流
private String csjv2;//喝水等 通用信息流
private String csjv3;//激励视频
private String csjv4;//Banner
public String getYlhv1() {
return ylhv1;
}
public String getCsjv1() {
return csjv1;
}
public String getYlhv2() {
return ylhv2;
}
public String getCsjv2() {
return csjv2;
}
public String getShareylhv1() {
return shareylhv1;
}
public String getCsjv3() {
return csjv3;
}
public String getShareylhv2() {
return shareylhv2;
}
public String getCsjv4() {
return csjv4;
}
public String getShareylhv3() {
return shareylhv3;
}
public class YlhBean implements Serializable {
private String ylhv1;//开屏
private String ylhv2;//激励
public String getSharecsjv1() {
return sharecsjv1;
}
public String getYlhv1() {
return ylhv1;
}
public String getSharecsjv2() {
return sharecsjv2;
}
public String getYlhv2() {
return ylhv2;
}
public String getSharecsjv3() {
return sharecsjv3;
}
public String getKey() {
return key;
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/model/UserTaskMsgBean.java
View file @ 14d42a9b
......@@ -10,9 +10,10 @@ public class UserTaskMsgBean implements Serializable {
private VedioRulesBean vedioRules;
private BlessingBigMsgBean blessingBigMsg;
private UserRiskAppsBean userRiskApps;
private AdcodeBean adcode=null;
private AdcodeBean adcode_v1=null;
private String ip;
private String channel;
public BlessingBigMsgBean getBlessingBigMsgBean() {
return blessingBigMsg;
......@@ -82,6 +83,10 @@ public class UserTaskMsgBean implements Serializable {
}
public AdcodeBean getAdcode() {
return adcode;
return adcode_v1;
}
public String getChannel() {
return channel;
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/net/LoanService.java
View file @ 14d42a9b
......@@ -523,29 +523,29 @@ public interface LoanService {
builder.readTimeout(20, TimeUnit.SECONDS);
builder.writeTimeout(20, TimeUnit.SECONDS);
if (BuildConfig.DEBUG) {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
builder.interceptors().add(logging);
}
// if (BuildConfig.DEBUG) {
// HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
// if (TextUtils.isEmpty(message)) return;
// String s = message.substring(0, 1);
// String request = message.substring(0, 4);
// if ("{".equals(s) || "[".equals(s)) {
// Logger.json(message);
// } else if (request.contains("-->") || request.contains("<--")) {
// Logger.d("Method" + message);
// } else {
// Logger.d("params:" + message);
// }
// });
// HttpLoggingInterceptor logging = new HttpLoggingInterceptor();
// logging.setLevel(HttpLoggingInterceptor.Level.BODY);
// builder.interceptors().add(logging);
// }
if (BuildConfig.DEBUG) {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(message -> {
if (TextUtils.isEmpty(message)) return;
String s = message.substring(0, 1);
String request = message.substring(0, 4);
if ("{".equals(s) || "[".equals(s)) {
Logger.json(message);
} else if (request.contains("-->") || request.contains("<--")) {
Logger.d("Method" + message);
} else {
Logger.d("params:" + message);
}
});
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
builder.interceptors().add(logging);
}
OkHttpInterceptor okHttpInterceptor = new OkHttpInterceptor(AESUtils.getDefaultKey());
builder.interceptors().add(okHttpInterceptor);
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/KylVedioActivity.kt
View file @ 14d42a9b
......@@ -81,7 +81,7 @@ class KylVedioActivity : BaseActivity(), View.OnClickListener, KylVedioView {
override fun onBackPressed() {
if (Jzvd.backPress()) {
return;
return
}
super.onBackPressed()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt
View file @ 14d42a9b
......@@ -209,6 +209,7 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
AppConfig.app_black_name = data.userRiskApps.userRiskAppName
AppConfig.app_black_pkg = data.userRiskApps.userRiskAppPkg
AppConfig.flVideoFlag = data.vedioRules.isFlVideoFlag
AppConfig.user_register_channel = data.channel
if (data.adcode != null) {
AppConfig.user_channel_ad = data.adcode.key
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ 14d42a9b
......@@ -54,8 +54,6 @@ import net.grandcentrix.tray.AppPreferences
import java.math.BigDecimal
import java.util.*
private val TAG = MyFragment::class.java.simpleName
/**
* 描述：我
* 作者：孟崔广
......@@ -64,6 +62,8 @@ private val TAG = MyFragment::class.java.simpleName
@SuppressLint("SetTextI18n")
class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshListener, View.OnClickListener, AdapterView.OnItemClickListener {
private val TAG = MyFragment::class.java.simpleName
private val ps by lazy { AppPreferences(context) }
private val myPresenter by lazy { MyPresenter() }
private val userManager by lazy { UserManager.getInstance() }
......@@ -245,6 +245,7 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
AppConfig.app_black_name = data.userRiskApps.userRiskAppName
AppConfig.app_black_pkg = data.userRiskApps.userRiskAppPkg
AppConfig.flVideoFlag = data.vedioRules.isFlVideoFlag
AppConfig.user_register_channel = data.channel
if (data.adcode != null) {
AppConfig.user_channel_ad = data.adcode.key
}
......
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