Skip to content

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

1.1.2 更换变现猫、oaidsdk、添加代码位等

parent 73c26632
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 119 deletions
GoodMoney/app/build.gradle
View file @ 0f3db08e
......@@ -9,8 +9,8 @@ android {
applicationId "com.mints.goodmoney"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 12
versionName "1.1.1"
versionCode 13
versionName "1.1.2"
flavorDimensions "default"
// dex突破65535的限制
......@@ -191,12 +191,12 @@ dependencies {
// 三方接入
// leakcanary
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
// 极光推送
implementation 'cn.jiguang.sdk:jpush:3.6.6'
implementation 'cn.jiguang.sdk:jcore:2.3.8'
// 移动安全联盟
implementation(name: 'msa_mdid_1.0.13', ext: 'aar')
implementation(name: 'oaid_sdk_1.0.23', ext: 'aar')
// 穿山甲广告
implementation(name: 'open_ad_sdk', ext: 'aar')
// 广点通广告 腾讯
......@@ -244,7 +244,7 @@ dependencies {
implementation 'androidx.core:core:1.0.0'
implementation 'androidx.fragment:fragment:1.0.0'
// 变现猫
implementation(name: 'bxmsdk-release-3.0.0-csj3300', ext: 'aar')
implementation(name: 'bxmsdk-release-3.3.1', ext: 'aar')
// 闪电盒子
implementation(name: 'wannuosili_ad_2.2.0', ext: 'aar')
// 瑞狮新闻
......@@ -260,7 +260,6 @@ dependencies {
implementation(name: 'scenead-2.2', ext: 'aar')
implementation 'com.just.agentweb:agentweb:4.1.2'
// 喜马拉雅 已集成
// 微转阅读
implementation (name:'articlesdk-v1.0.6.202012121917-x',ext:'aar')
......
GoodMoney/app/proguard-rules.pro
View file @ 0f3db08e
......@@ -474,8 +474,8 @@
public protected *;
}
-keep class com.bxm.sdk.ad.**{ *;}
-keep class com.bianxianmao.sdk.**{*;}
-keep class com.wgs.sdk.**{ *;}
-keep class com.dhcw.sdk.**{*;}
-keep class android.support.v4.app.NotificationCompat**{
public *;
......@@ -639,4 +639,21 @@
# webView处理，项目中没有使用到webView忽略即可,webview与JS交互内部类不能混淆
-keepclassmembers class com.show.you.WebVerfiedActivity$MyHandler {*;}
-keepattributes *JavascriptInterface*
# ======================= 微转分享 END ================
\ No newline at end of file
# ======================= 微转分享 END ================
# ===================== OAID START ================
-keep class XI.CA.XI.**{*;}
-keep class XI.K0.XI.**{*;}
-keep class XI.XI.K0.**{*;}
-keep class XI.vs.K0.**{*;}
-keep class XI.xo.XI.XI.**{*;}
-keep class com.asus.msa.SupplementaryDID.**{*;}
-keep class com.asus.msa.sdid.**{*;}
-keep class com.bun.lib.**{*;}
-keep class com.bun.miitmdid.**{*;}
-keep class com.huawei.hms.ads.identifier.**{*;}
-keep class com.samsung.android.deviceidservice.**{*;}
-keep class org.json.**{*;}
-keep public class com.netease.nis.sdkwrapper.Utils {public <methods>;}
# ======================= OAID END ================
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/MintsApplication.java
View file @ 0f3db08e
......@@ -10,11 +10,11 @@ import android.webkit.WebView;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.multidex.MultiDexApplication;
import com.bun.miitmdid.core.JLibrary;
import com.downloader.PRDownloader;
import com.downloader.PRDownloaderConfig;
import com.hjq.toast.ToastUtils;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.manager.BxmManager;
import com.mints.goodmoney.manager.ChannelManager;
import com.mints.goodmoney.manager.LiebaoManager;
import com.mints.goodmoney.manager.MhManager;
......@@ -104,13 +104,6 @@ public class MintsApplication extends MultiDexApplication {
// 9.0之后不可多进程使用一个目录下的WebView，写在SDK初始化之前
androidPWebView();
// 移动安全联盟
try {
JLibrary.InitEntry(base);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/banner/BannerManager.kt
View file @ 0f3db08e
......@@ -8,7 +8,6 @@ import com.bytedance.sdk.openadsdk.TTNativeExpressAd
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.manager.TtCsjAdManager
import com.mints.goodmoney.utils.LogUtil
import com.mints.goodmoney.utils.ToastUtil
/**
* banner管理
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/vedio/CsjVedioAdManager.java
View file @ 0f3db08e
......@@ -112,6 +112,12 @@ public class CsjVedioAdManager extends BaseVedioAd {
case Constant.CARRIER_BLESSINGBAG_DOUBLE:// 福袋
codeId = TtCsjAdManager.TT_AD_VEDIO_BLESSINGBAG;
break;
case Constant.CARRIER_HOMEVEDIO_DOUBLE:// 首页视频翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_HOMEVEDIO;
break;
case Constant.CARRIER_SMALLHOMEVEDIO_DOUBLE:// 短视频翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_SMALLHOMEVEDIO;
break;
default:// 在线收益翻倍
codeId = TtCsjAdManager.TT_AD_VEDIO_MOREDIALOG;
break;
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/vedio/YlhVedioAdManager.java
View file @ 0f3db08e
......@@ -122,6 +122,12 @@ public class YlhVedioAdManager extends BaseVedioAd implements VedioAdManagerView
case Constant.CARRIER_BLESSINGBAG_DOUBLE:// 福袋
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_BLESSINGBAG_POSTID();
break;
case Constant.CARRIER_HOMEVEDIO_DOUBLE:// 首页视频翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_HOMEVEDIO_POSTID();
break;
case Constant.CARRIER_SMALLHOMEVEDIO_DOUBLE:// 短视频翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID();
break;
default:// 在线收益翻倍
ylhPostId = YlhAdManager.INSTANCE.getYLH_AD_VEDIO_MOREDIALOG_POSTID();
break;
......
GoodMoney/app/src/main/java/com/mints/goodmoney/common/Constant.kt
View file @ 0f3db08e
......@@ -115,8 +115,8 @@ object Constant {
const val CARRIER_CHALLENGE_SHAREFRIEND_DOUBLE = "CHALLENGE_SHAREFRIEND_DOUBLE" //邀请好友翻倍
const val CARRIER_HOMEVEDIO = "HOMEVEDIO" //首页红包
const val CARRIER_HOMEVEDIO_DOUBLE = "HOMEVEDIO_DOUBLE" //首页红包翻倍
const val CARRIER_SMALLHOMEVEDIO = "SMALLHOMEVEDIO" //首页红包
const val CARRIER_SMALLHOMEVEDIO_DOUBLE = "SMALLHOMEVEDIO_DOUBLE" //首页红包翻倍
const val CARRIER_SMALLHOMEVEDIO = "SMALLHOMEVEDIO" //短视频红包
const val CARRIER_SMALLHOMEVEDIO_DOUBLE = "SMALLHOMEVEDIO_DOUBLE" //短视频红包翻倍
const val CARRIER_MORNING_CLOCK = "MORNING_CLOCK" //早上打卡
const val CARRIER_DRAWCASH = "DRAWCASH" //提现
const val CARRIER_BLACK = "BLACK" //黑名单
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/BxmManager.kt
View file @ 0f3db08e
......@@ -2,12 +2,17 @@ package com.mints.goodmoney.manager
import android.app.Activity
import android.app.Application
import android.content.Intent
import android.view.ViewGroup
import com.bianxianmao.sdk.BDAdvanceButtonAd
import com.bianxianmao.sdk.manager.BDAdvanceConfig
import com.bianxianmao.sdk.manager.BDManager
import com.dhcw.sdk.BDAdvanceButtonAd
import com.dhcw.sdk.BDAdvanceButtonListener
import com.dhcw.sdk.BDAppNativeOnClickListener
import com.dhcw.sdk.manager.BDAdvanceConfig
import com.dhcw.sdk.manager.BDManager
import com.mints.goodmoney.BuildConfig
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.ui.activitys.WxLoginActivity
/**
* 描述：变现猫
......@@ -40,15 +45,62 @@ object BxmManager {
if (activity == null) return
try {
if (bdAdvanceButtonAd == null) {
bdAdvanceButtonAd = BDAdvanceButtonAd(activity, viewGroup, BUTTON_AD_SPOT_ID)
if (bdAdvanceButtonAd != null) {
bdAdvanceButtonAd!!.setBdAdvanceButtonListener(null)
bdAdvanceButtonAd!!.setBdAppNativeOnClickListener(null)
bdAdvanceButtonAd = null
}
bdAdvanceButtonAd = BDAdvanceButtonAd(activity, viewGroup, BUTTON_AD_SPOT_ID)
bdAdvanceButtonAd?.setBdAdvanceButtonListener(object : BDAdvanceButtonListener {
override fun onActivityClosed() {
// Toast.makeText(activity, "活动页关闭 ", Toast.LENGTH_LONG).show()
}
override fun onAdShow() {
// Toast.makeText(activity, "广告展示 ", Toast.LENGTH_LONG).show()
}
override fun onAdFailed() {
// Toast.makeText(activity, "广告加载失败 ", Toast.LENGTH_LONG).show()
}
override fun onAdClicked() {
// Toast.makeText(activity, "广告点击 ", Toast.LENGTH_LONG).show()
}
})
bdAdvanceButtonAd?.setBdAppNativeOnClickListener(object : BDAppNativeOnClickListener {
override fun onActivityClosed() {
// Toast.makeText(activity, "float onActivityClosed ", Toast.LENGTH_SHORT).show()
}
override fun onClick(type: Int, adid: String) {
// Toast.makeText(activity, "float onClick:$type", Toast.LENGTH_SHORT).show()
//type=1 加载视频 type=2 播放视频
if (type == 1) {
//bdAdvanceFloatIconAd 绑定激励视频回调
BxmPlayVideo.getInstance().load(bdAdvanceButtonAd)
} else if (type == 2) {
BxmPlayVideo.getInstance().play(activity)
}
}
})
bdAdvanceButtonAd?.loadAd()
} catch (e: Exception) {
e.printStackTrace()
}
}
/**
* 登录后绑定用户信息
*/
fun bindUserData() {
try {
BDManager.getStance().bindUserData(MintsApplication.getContext(), APP_ID, "cuid=${UserManager.getInstance().userID}")
} catch (e: Exception) {
e.printStackTrace()
}
}
fun onDestory() {
bdAdvanceButtonAd = null
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/BxmPlayVideo.java 0 → 100755
View file @ 0f3db08e
package com.mints.goodmoney.manager;
import android.app.Activity;
import com.bytedance.sdk.openadsdk.AdSlot;
import com.bytedance.sdk.openadsdk.TTAdConstant;
import com.bytedance.sdk.openadsdk.TTAdNative;
import com.bytedance.sdk.openadsdk.TTRewardVideoAd;
import com.dhcw.sdk.BDAdvanceBaseAppNative;
public class BxmPlayVideo {
static BxmPlayVideo instance = new BxmPlayVideo();
public static BxmPlayVideo getInstance() {
return instance;
}
//一、加载穿山甲激励视频
//BDAdvanceBaseAppNative 绑定激励视频回调
public void load(final BDAdvanceBaseAppNative appNative) {
try {
TTNativeExpressManager ttNativeExpressManager = null;
TTAdNative adNative = null;
if (ttNativeExpressManager == null) {
ttNativeExpressManager = new TTNativeExpressManager();
adNative = ttNativeExpressManager.initTTAd(false);
}
//模版渲染请求AdSlot
AdSlot adSlot = new AdSlot.Builder()
.setCodeId(TtCsjAdManager.TT_AD_VEDIO_BIANXIANMAO)
.setSupportDeepLink(true)
.setAdCount(1)
.setExpressViewAcceptedSize(500, 500)//个性化模板广告需要设置期望个性化模板广告的大小,单位dp,激励视频场景，只要设置的值大于0即可。仅模板广告需要设置此参数
.setImageAcceptedSize(1080, 1920)
.setOrientation(TTAdConstant.VERTICAL)
.setMediaExtra("media_extra")
.setUserID(UserManager.getInstance().getUserID())
.build();
//加载激励视频广告
adNative.loadRewardVideoAd(adSlot, new TTAdNative.RewardVideoAdListener() {
@Override
public void onError(int i, String s) {
appNative.onError(i);
}
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ttRewardVideoAd) {
if (ttRewardVideoAd == null) {
appNative.onError(0);
} else {
bindRewardListener(ttRewardVideoAd, appNative);
appNative.onADLoad();
}
}
@Override
public void onRewardVideoCached() {
}
});
} catch (Throwable e) {
appNative.onError(0);
}
}
//二、绑定穿山甲激励视频回调
//BDAdvanceBaseAppNative 绑定激励视频回调
TTRewardVideoAd mttRewardVideoAd;
private void bindRewardListener(TTRewardVideoAd ttRewardVideoAd, final BDAdvanceBaseAppNative appNative) {
mttRewardVideoAd = ttRewardVideoAd;
mttRewardVideoAd.setRewardAdInteractionListener(new TTRewardVideoAd.RewardAdInteractionListener() {
@Override
public void onAdShow() {
appNative.onADShow();
}
@Override
public void onAdVideoBarClick() {
appNative.onADClick();
}
@Override
public void onAdClose() {
appNative.onADClose();
}
@Override
public void onVideoComplete() {
appNative.onVideoComplete();
}
@Override
public void onVideoError() {
appNative.onError(0);
}
@Override
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
appNative.onReward();
}
@Override
public void onSkippedVideo() {
appNative.onSkipped();
}
});
}
//三、播放穿山甲激励视频
public void play(Activity activity) {
if (mttRewardVideoAd != null) {
mttRewardVideoAd.showRewardVideoAd(activity);
}
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/MiitHelper.java
View file @ 0f3db08e
......@@ -5,16 +5,9 @@ import android.util.Log;
import androidx.annotation.NonNull;
import com.bun.miitmdid.core.ErrorCode;
import com.bun.miitmdid.core.MdidSdk;
import com.bun.miitmdid.core.MdidSdkHelper;
import com.bun.supplier.IIdentifierListener;
import com.bun.supplier.IdSupplier;
import com.mints.goodmoney.MintsApplication;
/**
* Created by zheng on 2019/8/22.
*/
import com.bun.miitmdid.interfaces.IIdentifierListener;
import com.bun.miitmdid.interfaces.IdSupplier;
public class MiitHelper implements IIdentifierListener {
......@@ -56,17 +49,6 @@ public class MiitHelper implements IIdentifierListener {
return MdidSdkHelper.InitSdk(cxt, true, this);
}
/*
* 直接java调用，如果这样调用，在android 9以前没有题，在android 9以后会抛找不到so方法的异常
* 解决办法是和JLibrary.InitEntry(cxt)，分开调用，比如在A类中调用JLibrary.InitEntry(cxt)，在B类中调用MdidSdk的方法
* A和B不能存在直接和间接依赖关系，否则也会报错
*
* */
private int DirectCall(Context cxt) {
MdidSdk sdk = new MdidSdk();
return sdk.InitSdk(cxt, this);
}
@Override
public void OnSupport(boolean isSupport, IdSupplier _supplier) {
if (_supplier == null) {
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/OaidManager.kt deleted 100755 → 0
View file @ 73c26632
package com.mints.goodmoney.manager
import android.content.Context
import com.bun.miitmdid.core.MdidSdkHelper
import com.bun.supplier.IIdentifierListener
import com.bun.supplier.IdSupplier
/**
* 移动安全联盟 oaid
*/
class OaidManager(val _listener: AppIdsUpdater?) : IIdentifierListener {
fun InitSdk(cxt: Context) {
CallFromReflect(cxt)
}
/*
* 通过反射调用，解决android 9以后的类加载升级，导至找不到so中的方法
*
* */
private fun CallFromReflect(cxt: Context): Int {
return MdidSdkHelper.InitSdk(cxt, true, this)
}
override fun OnSupport(isSupport: Boolean, _supplier: IdSupplier) {
if (_supplier == null) {
return
}
/* String oaid=_supplier.getOaid();
String vaid=_supplier.getVAID();
String aaid=_supplier.getAAID();
String udid=_supplier.getUDID();
StringBuilder builder=new StringBuilder();
builder.append("support: ").append(isSupport?"true":"false").append("\n");
builder.append("UDID: ").append(udid).append("\n");
builder.append("OAID: ").append(oaid).append("\n");
builder.append("VAID: ").append(vaid).append("\n");
builder.append("AAID: ").append(aaid).append("\n");
String idstext=builder.toString();*/
val oaid = _supplier.oaid
_listener?.OnIdsAvalid(oaid)
}
interface AppIdsUpdater {
fun OnIdsAvalid(ids: String)
}
}
\ No newline at end of file
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/TtCsjAdManager.java
View file @ 0f3db08e
......@@ -37,6 +37,9 @@ public class TtCsjAdManager {
public static String TT_AD_VEDIO_BLESSINGBAG = "945730117";// 福袋
public static String TT_AD_VEDIO_GAME = "945562067";// 猎豹
public static String TT_AD_VEDIO_JULEYUN = "945675529";// 聚乐云
public static String TT_AD_VEDIO_BIANXIANMAO = "945743459";// 变现猫
public static String TT_AD_VEDIO_HOMEVEDIO = "945744137";// 首页视频翻倍
public static String TT_AD_VEDIO_SMALLHOMEVEDIO = "945744186";// 短视频翻倍
/*信息流*/
public static String TT_AD_NATIVEEXPRESS_XMLY = "945700753";//喜马拉雅信息流
public static String TT_AD_NATIVEEXPRESS_AWARD = "945562047";//信息流弹窗
......@@ -120,6 +123,8 @@ public class TtCsjAdManager {
TT_AD_VEDIO_OFFINELINE = idBean.getCsjv3();
TT_AD_VEDIO_BLESSINGBAG = idBean.getCsjv3();
TT_AD_VEDIO_SIGN = idBean.getCsjv3();
TT_AD_VEDIO_HOMEVEDIO = idBean.getCsjv3();
TT_AD_VEDIO_SMALLHOMEVEDIO = idBean.getCsjv3();
// banner
TT_AD_BANNER_MY = idBean.getCsjv4();
return;
......@@ -151,6 +156,8 @@ public class TtCsjAdManager {
TT_AD_VEDIO_OFFINELINE = "945666029";
TT_AD_VEDIO_SIGN = "945666029";
TT_AD_VEDIO_BLESSINGBAG = "945666029";
TT_AD_VEDIO_HOMEVEDIO = "945666029";
TT_AD_VEDIO_SMALLHOMEVEDIO = "945666029";
// banner
TT_AD_BANNER_MY = "945666042";
......@@ -174,6 +181,8 @@ public class TtCsjAdManager {
TT_AD_VEDIO_OFFINELINE = "945730111";
TT_AD_VEDIO_BLESSINGBAG = "945730117";
TT_AD_VEDIO_SIGN = "945730109";
TT_AD_VEDIO_HOMEVEDIO = "945744137";
TT_AD_VEDIO_SMALLHOMEVEDIO = "945744186";
// banner
TT_AD_BANNER_MY = "945661050";
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/UserManager.java
View file @ 0f3db08e
......@@ -406,6 +406,4 @@ public class UserManager {
ps.removeByKey(WX_HEADER);
_inst = null;
}
}
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/YlhAdManager.kt
View file @ 0f3db08e
......@@ -32,6 +32,8 @@ object YlhAdManager {
var YLH_AD_VEDIO_BLESSINGBAG_POSTID = "1081758148138388" //福袋
var YLH_AD_VEDIO_GAME_POSTID = "9051646750686770" //猎豹游戏
var YLH_AD_VEDIO_JULEYUN_POSTID = "1011746770898338" //聚乐云
var YLH_AD_VEDIO_HOMEVEDIO_POSTID= "4051451341464487" // 首页视频翻倍
var YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID= "9051152341362610" // 短视频翻倍
/*信息流*/
var YLH_AD_NATIVEEXPRESS_JULEYUN = "8041941770890627" //聚乐云
......@@ -66,6 +68,8 @@ object YlhAdManager {
YLH_AD_VEDIO_BLESSINGBAG_POSTID = idBean.ylhv2
YLH_AD_VEDIO_SIGN_POSTID = idBean.ylhv2
YLH_AD_VEDIO_OFFINELINE_POSTID = idBean.ylhv2
YLH_AD_VEDIO_HOMEVEDIO_POSTID = idBean.ylhv2
YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID = idBean.ylhv2
return
}
......@@ -91,6 +95,8 @@ object YlhAdManager {
YLH_AD_VEDIO_SIGN_POSTID = "1031552263176415"
YLH_AD_VEDIO_BLESSINGBAG_POSTID = "1031552263176415"
YLH_AD_VEDIO_OFFINELINE_POSTID = "1031552263176415"
YLH_AD_VEDIO_HOMEVEDIO_POSTID = "1031552263176415"
YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID = "1031552263176415"
return
}
......@@ -107,6 +113,8 @@ object YlhAdManager {
YLH_AD_VEDIO_BLESSINGBAG_POSTID = "1081758148138388"
YLH_AD_VEDIO_SIGN_POSTID = "2091354158635490"
YLH_AD_VEDIO_OFFINELINE_POSTID = "2031954198632389"
YLH_AD_VEDIO_HOMEVEDIO_POSTID = "4051451341464487"
YLH_AD_VEDIO_SMALLHOMEVEDIO_POSTID = "9051152341362610"
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/mvp/presenters/HomePresenter.kt
View file @ 0f3db08e
......@@ -4,10 +4,7 @@ import android.text.TextUtils
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.common.DeviceInfo
import com.mints.goodmoney.manager.AppHttpManager
import com.mints.goodmoney.manager.SceneManager
import com.mints.goodmoney.manager.ShumeiManager
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.manager.*
import com.mints.goodmoney.mvp.model.BaseResponse
import com.mints.goodmoney.mvp.model.MainVedioMsgBean
import com.mints.goodmoney.mvp.model.UserBean
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AccountMergeActivity.kt
View file @ 0f3db08e
......@@ -6,6 +6,7 @@ import android.view.View
import androidx.core.content.ContextCompat
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.manager.BxmManager
import com.mints.goodmoney.manager.RsNewsManager
import com.mints.goodmoney.manager.SceneManager
import com.mints.goodmoney.mvp.model.AccountMsgBean
......@@ -147,6 +148,7 @@ class AccountMergeActivity : BaseActivity(), View.OnClickListener, AccountMergeV
SceneManager.signIn(this)
RsNewsManager.init(baseApplication)
BxmManager.bindUserData()
readyGoThenKill(MainActivity::class.java)
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MobileLoginActivity.kt
View file @ 0f3db08e
......@@ -4,10 +4,7 @@ import android.Manifest
import android.text.TextUtils
import android.view.View
import com.mints.goodmoney.R
import com.mints.goodmoney.manager.RsNewsManager
import com.mints.goodmoney.manager.SceneManager
import com.mints.goodmoney.manager.UserManager
import com.mints.goodmoney.manager.YwhzManager
import com.mints.goodmoney.manager.*
import com.mints.goodmoney.mvp.presenters.LoginPresenter
import com.mints.goodmoney.mvp.views.LoginView
import com.mints.goodmoney.ui.activitys.base.BaseActivity
......@@ -102,6 +99,7 @@ class MobileLoginActivity : BaseActivity()
SceneManager.signIn(this)
RsNewsManager.init(baseApplication)
BxmManager.bindUserData()
// false-登录 true-绑定手机号
showToast("登录成功")
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WxLoginActivity.kt
View file @ 0f3db08e
......@@ -14,6 +14,7 @@ import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.login.LoginApi
import com.mints.goodmoney.login.OnLoginListener
import com.mints.goodmoney.manager.BxmManager
import com.mints.goodmoney.manager.RsNewsManager
import com.mints.goodmoney.manager.SceneManager
import com.mints.goodmoney.manager.YwhzManager
......@@ -123,6 +124,7 @@ class WxLoginActivity : BaseActivity()
SceneManager.signIn(this)
RsNewsManager.init(baseApplication)
BxmManager.bindUserData()
showToast("登录成功")
progressDialog?.dismiss()
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/GvMyAdapter.java
View file @ 0f3db08e
......@@ -16,6 +16,7 @@ import android.widget.TextView;
import com.mints.goodmoney.R;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.manager.BxmManager;
import com.mints.goodmoney.manager.UserManager;
import com.mints.goodmoney.mvp.model.BannerBean;
import com.mints.goodmoney.utils.ForegroundOrBackground;
import com.mints.library.utils.GlideUtils;
......@@ -76,11 +77,10 @@ public class GvMyAdapter extends BaseAdapter {
}
BannerBean.ListBean data = orders.get(position);
if (data != null) {
// GlideUtils.loadImageViewGifUrl(context, viewHolder.ic_my_icon, data.getImgUrl());
GlideUtils.loadImageView(context, data.getImgUrl(), viewHolder.ic_my_icon);
viewHolder.tv_my_title.setText(data.getTitle());
if (TextUtils.equals(data.getToUrl(), Constant.HOT_ACTIVITY_BXM)) {
if (TextUtils.equals(data.getToUrl(), Constant.HOT_ACTIVITY_BXM) && UserManager.getInstance().userIsLogin()) {
BxmManager.INSTANCE.loadButtonAd(activity, viewHolder.fl_my_icon);
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt
View file @ 0f3db08e
......@@ -104,6 +104,8 @@ class MainFragment : BaseFragment(), HomeView, View.OnClickListener {
// 打开激活
uploadDeviceInfo()
}
override fun onHiddenChanged(hidden: Boolean) {
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ 0f3db08e
......@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.DividerItemDecoration
import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity.Companion.open
import com.fly.scenemodule.SceneUtil
import com.mints.goodmoney.BuildConfig
import com.mints.goodmoney.MintsApplication
import com.mints.goodmoney.R
import com.mints.goodmoney.ad.banner.BannerManager
import com.mints.goodmoney.ad.express.TTPreLoadCarrierExpressManager
......@@ -56,8 +57,6 @@ import net.grandcentrix.tray.AppPreferences
import java.math.BigDecimal
import java.util.*
private val TAG = MyFragment::class.java.simpleName
/**
* 描述：我
* 作者：孟崔广
......@@ -71,6 +70,8 @@ class MyFragment : BaseFragment(),
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() }
......@@ -91,9 +92,6 @@ class MyFragment : BaseFragment(),
private val dataList: MutableList<MyInfo.AutoListBean> = mutableListOf()
private var mainMyAdapter: MainMyAdapter? = null
// 轮播图只展示一次
private var bannerFlag = false
// 高额任务
private var mCurrentPkg: String? = null
private var mReceiverBroadcastReceiver: BroadcastReceiver? = null
......@@ -191,9 +189,7 @@ class MyFragment : BaseFragment(),
}
myPresenter.getSignInHomePageMsg()
if (!bannerFlag) {
myPresenter.myHotActivity()
}
myPresenter.myHotActivity()
myPresenter.getHallBaseMsg()
userConfig = data
......@@ -211,13 +207,10 @@ class MyFragment : BaseFragment(),
override fun getMyHotActivitySuc(data: BannerBean?) {
if (activity != null && !requireActivity().isFinishing) {
if (!bannerFlag) {
bannerFlag = true
data?.let {
item_promotions_egv.visibility = View.VISIBLE
hotList = it.list
item_promotions_egv.adapter = GvMyAdapter(mContext, requireActivity(), hotList)
}
data?.let {
item_promotions_egv.visibility = View.VISIBLE
hotList = it.list
item_promotions_egv.adapter = GvMyAdapter(mContext, requireActivity(), hotList)
}
}
}
......@@ -801,6 +794,10 @@ class MyFragment : BaseFragment(),
}
Constant.HOT_ACTIVITY_BXM -> {
// 消费变现猫事件
if (!userManager.userIsLogin()) {
readyGo(WxLoginActivity::class.java)
return
}
}
Constant.HOT_ACTIVITY_CAICY -> {
RxPermissions(requireActivity())
......
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