Skip to content

A
android_youyou
Commit cedec2f8 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码优化

parent 6a62afe4
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 295 deletions
app/build.gradle
View file @ cedec2f8
......@@ -242,8 +242,8 @@ dependencies {
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
implementation(name: 'xrsdk-release_tbs', ext: 'aar')
// 枫岚
implementation(name: 'mh-adsdk', ext: 'aar')
implementation(name: 'mh-adsdk-ext', ext: 'aar')
// implementation(name: 'mh-adsdk', ext: 'aar')
// implementation(name: 'mh-adsdk-ext', ext: 'aar')
// implementation(name: 'ks_3.3.5.3', ext: 'aar')
// 聚乐云
implementation(name: 'okgo-2.2', ext: 'aar')
......
app/proguard-rules.pro
View file @ cedec2f8
......@@ -319,21 +319,6 @@
# ===================== TalkingData START ================
-dontwarn com.tendcloud.tenddata.**
-keep class com.tendcloud.** {*;}
-keep public class com.tendcloud.tenddata.** { public protected *;}
-keepclassmembers class com.tendcloud.tenddata.**{
public void *(***);
}
-keep class com.talkingdata.sdk.TalkingDataSDK {public *;}
-keep class com.apptalkingdata.** {*;}
-keep class dice.** {*; }
-dontwarn dice.**
# ======================= TalkingData END ================
# ===================== 极光推送 START ================
-keep class * extends cn.jpush.android.helpers.JPushMessageReceiver { *; }
......@@ -427,65 +412,6 @@
# ===================== 推啊AD START ================
-dontwarn com.lechuan.midunovel.**
-keep class com.lechuan.midunovel.** { *; }
# ======================= 推啊AD END ================
# ===================== 掌阅书城 START ================
-keep class com.zhangyue.**{*;}
-keep class com.ireader.ireadersdk.IreaderApi {*;}
-dontwarn com.alibaba.fastjson.**
-keep class com.alibaba.fastjson.** { *; }
-keep public class * extends androidx.fragment.app.Fragment
-keep class androidx.core.app.NotificationCompat**{
public *;
}
-dontwarn androidx.**
-keep class androidx.** { *;}
-keep public class * extends androidx.**
-keep public class * extends androidx.fragment.app.FragmentContainer
-keep class com.squareup.okhttp.** { *;}
-keep class okhttp3.** { *; }
-keep interface okhttp3.** { *; }
-keep class okio.**{ *; }
-keep interface okio.**{ *; }
-dontwarn com.squareup.okhttp.**
-dontwarn okio.**
-dontwarn okhttp3.**
-keep class com.qq.e.** {
public protected *;
}
# ======================= 掌阅书城 END ================
# ===================== 变现猫 START ================
-keep class com.ss.android.* {*;}
-keep class com.pgl.* {*;}
-keep class com.qq.e.** {
public protected *;
}
-keep class com.wgs.sdk.**{ *;}
-keep class com.dhcw.sdk.**{*;}
-keep class android.support.v4.app.NotificationCompat**{
public *;
}
# ======================= 变现猫 END ================
# ===================== 闪电盒子 START ================
-keep class com.wannuosili.sdk.** {*;}
-dontwarn com.wannuosili.sdk.**
......
app/src/main/java/com/wenshu/youyou/MintsApplication.java
View file @ cedec2f8
......@@ -14,7 +14,6 @@ import com.hjq.toast.ToastUtils;
import com.wenshu.youyou.common.Constant;
import com.wenshu.youyou.manager.KsManager;
import com.wenshu.youyou.manager.LiebaoManager;
import com.wenshu.youyou.manager.MhManager;
import com.wenshu.youyou.manager.MiitHelper;
import com.wenshu.youyou.manager.RsNewsManager;
import com.wenshu.youyou.manager.TtCsjAdManager;
......
app/src/main/java/com/wenshu/youyou/ad/video/MhVideoAdManager.kt
View file @ cedec2f8
package com.wenshu.youyou.ad.video
import android.app.Activity
import com.maplehaze.adsdk.video.RewardVideoAd
import com.wenshu.youyou.ad.video.base.BaseVideoAd
import com.wenshu.youyou.ad.video.base.VideoAdStatusListener
import com.wenshu.youyou.common.AppConfig
import com.wenshu.youyou.common.Constant
import com.wenshu.youyou.manager.MhManager
import com.wenshu.youyou.manager.TrackManager
import com.wenshu.youyou.utils.LogUtil
private val TAG = MhVideoAdManager::class.java.simpleName
/**
* 枫岚广告视频
*/
class MhVideoAdManager private constructor() :
BaseVideoAd() {
private var videoAdStatusListener: VideoAdStatusListener? = null
private var mRewardVideoAd: RewardVideoAd? = null
private var isClickScreen: Boolean = true
companion object {
private var _inst: MhVideoAdManager? = null
fun getInstance(): MhVideoAdManager? {
return if (_inst != null) {
_inst
} else {
_inst = MhVideoAdManager()
_inst
}
}
}
override fun loadAd(activity: Activity, curCoin: Int, carrierType: String, extraId: String?) {
isClickScreen = true
val postId: String = when (carrierType) {
Constant.CARRIER_VERSUS_VIDEO -> MhManager.POS_ID
Constant.CARRIER_HOMEWATER -> MhManager.POS_ID
Constant.CARRIER_CHALLENGE_TURN, Constant.CARRIER_DRAWCASH -> MhManager.POS_ID
Constant.CARRIER_CHALLENGE_CARD -> MhManager.POS_ID
else -> MhManager.POS_ID
}
val orientation = RewardVideoAd.VERTICAL
mRewardVideoAd = RewardVideoAd(activity, MhManager.APP_ID, postId, orientation, object : RewardVideoAd.RewardVideoListener {
override fun onADCached() {
LogUtil.d(TAG, "onADCached")
mRewardVideoAd?.showAd(activity)
}
override fun onADShow() {
LogUtil.d(TAG, "onADShow")
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ZERO, "", "")
}
override fun onReward() {
LogUtil.d(TAG, "onReward")
}
override fun onADClick() {
if (AppConfig.needReportClickAdEvent) {
TrackManager.getInstance().reportClickAdEvent()
}
LogUtil.d(TAG, "onADClick")
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_TWO, "", "")
if (isClickScreen) {
// 防止重复
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_FOUR, "", "")
isClickScreen = false
}
videoAdStatusListener?.adDownload()
}
override fun onVideoComplete() {
LogUtil.d(TAG, "onVideoComplete")
}
override fun onADClose() {
LogUtil.d(TAG, "onADClose")
TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_FL, extraId, curCoin))
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_THREE, "", "")
videoAdStatusListener?.adSuccess()
}
override fun onADError(p0: Int) {
LogUtil.d(TAG, "onADError->$p0")
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
videoAdStatusListener?.adFail()
}
})
mRewardVideoAd?.loadAd()
}
fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
this.videoAdStatusListener = videoAdStatusListener
}
override fun onDestroy() {
mRewardVideoAd = null
}
}
\ No newline at end of file
//package com.wenshu.youyou.ad.video
//
//import android.app.Activity
//import com.maplehaze.adsdk.video.RewardVideoAd
//import com.wenshu.youyou.ad.video.base.BaseVideoAd
//import com.wenshu.youyou.ad.video.base.VideoAdStatusListener
//import com.wenshu.youyou.common.AppConfig
//import com.wenshu.youyou.common.Constant
//import com.wenshu.youyou.manager.MhManager
//import com.wenshu.youyou.manager.TrackManager
//import com.wenshu.youyou.utils.LogUtil
//
//private val TAG = MhVideoAdManager::class.java.simpleName
//
///**
// * 枫岚广告视频
// */
//class MhVideoAdManager private constructor() :
// BaseVideoAd() {
//
// private var videoAdStatusListener: VideoAdStatusListener? = null
// private var mRewardVideoAd: RewardVideoAd? = null
//
// private var isClickScreen: Boolean = true
//
// companion object {
// private var _inst: MhVideoAdManager? = null
// fun getInstance(): MhVideoAdManager? {
// return if (_inst != null) {
// _inst
// } else {
// _inst = MhVideoAdManager()
// _inst
// }
// }
// }
//
// override fun loadAd(activity: Activity, curCoin: Int, carrierType: String, extraId: String?) {
// isClickScreen = true
//
// val postId: String = when (carrierType) {
// Constant.CARRIER_VERSUS_VIDEO -> MhManager.POS_ID
// Constant.CARRIER_HOMEWATER -> MhManager.POS_ID
// Constant.CARRIER_CHALLENGE_TURN, Constant.CARRIER_DRAWCASH -> MhManager.POS_ID
// Constant.CARRIER_CHALLENGE_CARD -> MhManager.POS_ID
// else -> MhManager.POS_ID
// }
//
// val orientation = RewardVideoAd.VERTICAL
//
// mRewardVideoAd = RewardVideoAd(activity, MhManager.APP_ID, postId, orientation, object : RewardVideoAd.RewardVideoListener {
// override fun onADCached() {
// LogUtil.d(TAG, "onADCached")
// mRewardVideoAd?.showAd(activity)
// }
//
// override fun onADShow() {
// LogUtil.d(TAG, "onADShow")
// TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ZERO, "", "")
// }
//
// override fun onReward() {
// LogUtil.d(TAG, "onReward")
// }
//
// override fun onADClick() {
// if (AppConfig.needReportClickAdEvent) {
// TrackManager.getInstance().reportClickAdEvent()
// }
//
// LogUtil.d(TAG, "onADClick")
// TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_TWO, "", "")
// if (isClickScreen) {
// // 防止重复
// TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_FOUR, "", "")
// isClickScreen = false
// }
//
// videoAdStatusListener?.adDownload()
// }
//
// override fun onVideoComplete() {
// LogUtil.d(TAG, "onVideoComplete")
// }
//
// override fun onADClose() {
// LogUtil.d(TAG, "onADClose")
//
// TrackManager.getInstance().reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_FL, extraId, curCoin))
//
// TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_THREE, "", "")
//
// videoAdStatusListener?.adSuccess()
// }
//
// override fun onADError(p0: Int) {
// LogUtil.d(TAG, "onADError->$p0")
//
// TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_FL, Constant.EVENT_TYPE_ONE, (p0).toString(), "")
//
// videoAdStatusListener?.adFail()
// }
//
// })
//
// mRewardVideoAd?.loadAd()
// }
//
// fun setVideoAdStatusListener(videoAdStatusListener: VideoAdStatusListener?) {
// this.videoAdStatusListener = videoAdStatusListener
// }
//
// override fun onDestroy() {
// mRewardVideoAd = null
// }
//}
\ No newline at end of file
app/src/main/java/com/wenshu/youyou/ad/video/VideoAdingManager.java
View file @ cedec2f8
......@@ -35,7 +35,6 @@ public class VideoAdingManager {
private WnVideoAdManager wnVideoAdManager;
private CsjVideoAdManager csjVideoAdManager;
private YlhVideoAdManager ylhVideoAdManager;
private MhVideoAdManager mhVideoAdManager;
private ShVideoAdManager shVideoAdManager;
private CsjFullVideoAdManager csjFullVideoAdManager;
private KsVideoAdManager ksVideoAdManager;
......@@ -43,7 +42,6 @@ public class VideoAdingManager {
private int wnWeight;
private int ylhWeight;
private int csjVideoWeight;
private int flVideoWeight;
private int shVideoWeight;
private int csjFullVideoWeight;
private int ksVideoWeight;
......@@ -79,7 +77,6 @@ public class VideoAdingManager {
// csjVideoAdManager = CsjVideoAdManager.getInstance(activity);
// ylhVideoAdManager = YlhVideoAdManager.getInstance();
// wnVideoAdManager = WnVideoAdManager.Companion.getInstance();
// mhVideoAdManager = MhVideoAdManager.Companion.getInstance();
// shVideoAdManager = ShVideoAdManager.Companion.getInstance(activity);
// csjFullVideoAdManager = CsjFullVideoAdManager.getInstance(activity);
// ksVideoAdManager = KsVideoAdManager.Companion.getInstance();
......@@ -139,7 +136,6 @@ public class VideoAdingManager {
this.csjVideoWeight = csjVideoWeight;
this.ylhWeight = ylhWeight;
this.wnWeight = wnWeight;
this.flVideoWeight = flVideoWeight;
this.shVideoWeight = shVideoWeight;
this.csjFullVideoWeight = csjFullVideoWeight;
this.ksVideoWeight = ksVideoWeight;
......@@ -213,12 +209,10 @@ public class VideoAdingManager {
nextAdType = Constant.YLH_VEDIO_AD;
} else if (AppConfig.csjFullVedioAdCount > 0) {
nextAdType = Constant.CSJ_FULL_AD;
} else if (AppConfig.ksVideoAdCount > 0) {
nextAdType = Constant.KS_VEDIO_AD;
} else if (AppConfig.shVideoAdCount > 0) {
nextAdType = Constant.SH_VEDIO_AD;
} else {
nextAdType = Constant.FL_VEDIO_AD;
nextAdType = Constant.KS_VEDIO_AD;
}
return nextAdType;
}
......@@ -299,11 +293,6 @@ public class VideoAdingManager {
weight = weight + wnWeight;
LogUtil.d(TAG, "权重值：sdhzWeight:" + wnWeight);
}
if (AppConfig.flVideoAdCount > 0) {
weightList.add(new WeightBean(flVideoWeight, Constant.FL_VEDIO_AD));
weight = weight + flVideoWeight;
LogUtil.d(TAG, "权重值：flVideoWeight:" + flVideoWeight);
}
// 权重随机
if (weightList != null && weightList.size() > 0 && weight > 0) {
......@@ -339,12 +328,14 @@ public class VideoAdingManager {
*/
public boolean getVideoFinishFlag() {
int csjVideoAdCount = AppConfig.csjVideoAdCount;
int csjFullVedioAdCount = AppConfig.csjFullVedioAdCount;
int ylhAdCount = AppConfig.ylhAdCount;
int wnAdCount = AppConfig.wnVideoAdCount;
int flVideoAdCount = AppConfig.flVideoAdCount;
int ksVideoAdCount = AppConfig.ksVideoAdCount;
int tzVideoAdCount = AppConfig.shVideoAdCount;
if (ylhAdCount <= 0 && csjVideoAdCount <= 0 && wnAdCount <= 0 && flVideoAdCount <= 0 && tzVideoAdCount <= 0) {
if (ylhAdCount <= 0 && csjVideoAdCount <= 0 && wnAdCount <= 0
&& csjFullVedioAdCount <= 0 && ksVideoAdCount <= 0 && tzVideoAdCount <= 0) {
// showToast("今日视频已看完，请明天再来吧");
return true;
}
......@@ -370,11 +361,6 @@ public class VideoAdingManager {
wnVideoAdManager.onDestroy();
wnVideoAdManager = null;
}
if (mhVideoAdManager != null) {
mhVideoAdManager.setVideoAdStatusListener(null);
mhVideoAdManager.onDestroy();
mhVideoAdManager = null;
}
if (csjFullVideoAdManager != null) {
csjFullVideoAdManager.setVideoAdStatusListener(null);
csjFullVideoAdManager.onDestroy();
......@@ -530,43 +516,6 @@ public class VideoAdingManager {
}
});
wnVideoAdManager.loadAd(activity, bean.getCurCoin(), bean.getCarrierType(), bean.getExtraId());
} else if (TextUtils.equals(videoAdType, Constant.FL_VEDIO_AD)) {
// 枫岚广告激励视频
if (mhVideoAdManager == null) {
if (activity == null) {
if (videoAdingListener != null) {
videoAdingListener.videoAdingListenerError(Constant.FL_VEDIO_AD);
}
return;
}
mhVideoAdManager = MhVideoAdManager.Companion.getInstance();
}
mhVideoAdManager.setVideoAdStatusListener(new VideoAdStatusListener() {
@Override
public void adSuccess() {
AppConfig.flVideoAdCount--;
if (videoAdingListener != null) {
videoAdingListener.videoAdingListenerSuccess(Constant.FL_VEDIO_AD);
}
}
@Override
public void adFail() {
if (videoAdingListener != null) {
videoAdingListener.videoAdingListenerFail(Constant.FL_VEDIO_AD);
}
}
@Override
public void adDownload() {
isVideoAdDownload = true;
// 注册下载任务监听
registerBroad();
}
});
mhVideoAdManager.loadAd(activity, bean.getCurCoin(), bean.getCarrierType(), bean.getExtraId());
} else if (TextUtils.equals(videoAdType, Constant.CSJ_FULL_AD)) {
// 穿山甲全屏广告激励视频
if (csjFullVideoAdManager == null) {
......
app/src/main/java/com/wenshu/youyou/common/Constant.kt
View file @ cedec2f8
......@@ -77,9 +77,9 @@ object Constant {
const val FRAGMENT_TAG_RSNEWS = "FRAGMENT_TAG_RSNEWS"
// 协议地址
var REGISTER_URL = BuildConfig.MainIp + "gs/register.html"//服务协议
var PRIVACY_URL = BuildConfig.MainIp + "gs/privacy.html"//隐私协议
var STRATEGY_URL = BuildConfig.MainIp + "gs/strategy.html"//团长攻略
var REGISTER_URL = BuildConfig.MainIp + "yy/register.html"//服务协议
var PRIVACY_URL = BuildConfig.MainIp + "yy/privacy.html"//隐私协议
var STRATEGY_URL = BuildConfig.MainIp + "yy/strategy.html"//团长攻略
/**
......
app/src/main/java/com/wenshu/youyou/manager/MhManager.kt
View file @ cedec2f8
package com.wenshu.youyou.manager
import android.app.Application
import com.maplehaze.adsdk.MaplehazeSDK
/**
* 描述：枫岚激励视频
* 作者：孟崔广
*/
object MhManager {
const val APP_ID = ""
const val POS_ID = ""
/**
* 初始化
*/
fun initWn(application: Application) {
MaplehazeSDK.init(application)
}
}
\ No newline at end of file
//package com.wenshu.youyou.manager
//
//import android.app.Application
//import com.maplehaze.adsdk.MaplehazeSDK
//
///**
// * 描述：枫岚激励视频
// * 作者：孟崔广
// */
//object MhManager {
//
// const val APP_ID = ""
// const val POS_ID = ""
//
// /**
// * 初始化
// */
// fun initWn(application: Application) {
// MaplehazeSDK.init(application)
// }
//}
\ No newline at end of file
app/src/main/java/com/wenshu/youyou/ui/fragment/MyFragment.kt
View file @ cedec2f8
......@@ -846,10 +846,6 @@ class MyFragment : BaseFragment(),
bundle.putString(WebActivity.WEB_URL, Constant.STRATEGY_URL)
readyGo(WebActivity::class.java, bundle)
}
R.id.iv_right_icon2 -> {
// 跳转QQ客服
jumpQQGroup()
}
R.id.item_customer_service -> {
// 跳转加入QQ群
jumpQQGroup()
......@@ -1146,13 +1142,10 @@ class MyFragment : BaseFragment(),
view_title.text = "每日任务"
iv_right_icon.visibility = View.VISIBLE
iv_right_icon.setImageResource(R.mipmap.ic_settings)
iv_right_icon2.visibility = View.VISIBLE
iv_right_icon2.setImageResource(R.mipmap.icon_customer_service)
tv_left_subtitle.visibility = View.VISIBLE
tv_left_subtitle.text = "平台攻略"
tv_left_subtitle.setOnClickListener(this)
iv_right_icon2.setOnClickListener(this)
item_title_id.setOnClickListener(this)
iv_right_icon.setOnClickListener(this)
btn_withdraw.setOnClickListener(this)
......
app/src/main/java/com/wenshu/youyou/utils/AESUtils.java
View file @ cedec2f8
......@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
public class AESUtils {
private static final String vis = MD5.GetMD5Code("mints_2019").substring(8, 24);
private static final String vis = MD5.GetMD5Code("youyou_2021").substring(8, 24);
// public static final String key = "123456";
public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
......@@ -83,17 +83,4 @@ public class AESUtils {
.append(getBK3(6));
return sb.toString();
}
public static void main(String[] args) throws Exception {
// String message = "123456wwe";
// String entryptedMsg = encrypt(message, key);
// System.out.println("encrypted message is below :");
// System.out.println("加密结果：" + entryptedMsg);
// String dexryptedmsg = "Dj4MYXI5X6gL3H+bBjAhspXibZVhO79bgzoIawpl/6NNJWsjTHKMJGLtTPmvInRmbK3ipi4NvxsU\n" + "FtSufnPbZCtpydpNldkXCJ3vNALju60=";
// String decryptedMsg = detrypt(dexryptedmsg, key);
// System.out.println("decrypted message is below :");
// System.out.println(MD5.GetMD5Code("meijie_2016").substring(8, 24));
System.out.println(MD5.GetMD5Code("youyou_2021").substring(8, 24));
}
}
app/src/main/res/layout/item_fragment_main_my_customer_service.xml
View file @ cedec2f8
......@@ -2,6 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<TextView
android:visibility="gone"
android:id="@+id/item_customer_service"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -12,6 +13,7 @@
android:text="官方QQ群(点击咨询)：" />
<TextView
android:visibility="gone"
android:id="@+id/item_bottom_qqGroupNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -23,6 +25,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp"
android:text="请关注公众号：淘金微管家，获取更多赚钱资讯" />
android:text="请关注公众号：尤友，获取更多赚钱资讯" />
</merge>
\ No newline at end of file
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