Skip to content

A
android_highgold
Commit b7f0702a authored by jyx's avatar jyx
Browse files
Options

gradle版本升级

parent e60e99df
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 103 deletions
highgold/app/build.gradle
View file @ b7f0702a
......@@ -154,7 +154,8 @@ dependencies {
implementation "io.reactivex.rxjava2:rxjava:2.2.6"
implementation 'io.reactivex:rxandroid:1.2.1'
// butterknife
implementation 'com.jakewharton:butterknife:7.0.1'
implementation 'com.jakewharton:butterknife:7.0.1'
annotationProcessor 'com.jakewharton:butterknife:7.0.1'
// 状态栏适配
implementation 'com.readystatesoftware.systembartint:systembartint:1.0.3'
implementation 'com.gyf.immersionbar:immersionbar:2.3.3-beta15'
......@@ -202,7 +203,7 @@ dependencies {
// 三方接入
// 穿山甲广告
implementation(name: 'open_ad_sdk', ext: 'aar')
implementation(name: 'open_ad_sdk_3.9.0.0', ext: 'aar')
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.6'
// 极光推送
implementation 'cn.jiguang.sdk:jpush:3.6.6'
......
highgold/app/src/main/java/com/mints/highgold/ad/CsjFullVedioAdManager.java
View file @ b7f0702a
......@@ -206,6 +206,11 @@ public class CsjFullVedioAdManager implements LyVedioAdManagerView {
}
}
}
@Override
public void onFullScreenVideoCached(TTFullScreenVideoAd ttFullScreenVideoAd) {
}
});
}
......
highgold/app/src/main/java/com/mints/highgold/ad/CsjVedioAdManager.java
View file @ b7f0702a
......@@ -200,6 +200,11 @@ public class CsjVedioAdManager implements LyVedioAdManagerView {
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -269,9 +274,9 @@ public class CsjVedioAdManager implements LyVedioAdManagerView {
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
}
// if (rewardVerify) {
// if (csjVedioAdListener != null) {
// csjVedioAdListener.csjVedioAdSuccess();
......@@ -280,7 +285,6 @@ public class CsjVedioAdManager implements LyVedioAdManagerView {
// csjVedioAdPresenter.checkCoinRecordByTid(activity, tid);
//
// }
}
@Override
public void onSkippedVideo() {
......
highgold/app/src/main/java/com/mints/highgold/ad/inscreenvedio/MintegralInscreenVedioAdManager.java
View file @ b7f0702a
......@@ -180,6 +180,11 @@ public class MintegralInscreenVedioAdManager {
mttFullVideoAd = null;
}
}
@Override
public void onFullScreenVideoCached(TTFullScreenVideoAd ttFullScreenVideoAd) {
}
});
}
}
highgold/app/src/main/java/com/mints/highgold/manager/LiebaoManager.java
View file @ b7f0702a
......@@ -68,7 +68,18 @@ public class LiebaoManager {
.debug(BuildConfig.DEBUG) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
.directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
.supportMultiProcess(false) //是否支持多进程，true支持
.build());
.asyncInit(true)
.build(), new TTAdSdk.InitCallback() {
@Override
public void success() {
}
@Override
public void fail(int i, String s) {
}
});
CmGameAppInfo cmGameAppInfo = new CmGameAppInfo();
......
highgold/app/src/main/java/com/mints/highgold/manager/TTAdManagerHolder.java
View file @ b7f0702a
......@@ -84,8 +84,17 @@ public class TTAdManagerHolder {
//step1:接入网盟广告sdk的初始化操作，详情见接入文档和穿山甲平台说明
private static void doInit(Context context) {
if (!sInit) {
TTAdSdk.init(context, buildConfig(context));
sInit = true;
TTAdSdk.init(context, buildConfig(context), new TTAdSdk.InitCallback() {
@Override
public void success() {
sInit = true;
}
@Override
public void fail(int i, String s) {
sInit = false;
}
});
}
}
......@@ -107,6 +116,7 @@ public class TTAdManagerHolder {
.debug(logFlag) //测试阶段打开，可以通过日志排查问题，上线时去除该调用
.directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
.supportMultiProcess(false)//是否支持多进程
.asyncInit(true)
//.httpStack(new MyOkStack3())//自定义网络库，demo中给出了okhttp3版本的样例，其余请自行开发或者咨询工作人员。
.build();
}
......
highgold/app/src/main/java/com/mints/highgold/manager/TTBannerManager.java
View file @ b7f0702a
......@@ -394,28 +394,28 @@ public class TTBannerManager {
* @param frameLayout
*/
private void bindDislike(Context context, TTNativeExpressAd ad, boolean customStyle, FrameLayout frameLayout) {
if (customStyle) {
//使用自定义样式
List<FilterWord> words = ad.getFilterWords();
if (words == null || words.isEmpty()) {
return;
}
final DislikeDialog dislikeDialog = new DislikeDialog(context, words);
dislikeDialog.setOnDislikeItemClick(new DislikeDialog.OnDislikeItemClick() {
@Override
public void onItemClick(FilterWord filterWord) {
//屏蔽广告
// showToast("点击 " + filterWord.getName());
//用户选择不喜欢原因后，移除广告展示
if (frameLayout != null) {
frameLayout.removeAllViews();
}
}
});
ad.setDislikeDialog(dislikeDialog);
return;
}
// if (customStyle) {
// //使用自定义样式
// List<FilterWord> words = ad.getFilterWords();
// if (words == null || words.isEmpty()) {
// return;
// }
//
// final DislikeDialog dislikeDialog = new DislikeDialog(context, words);
// dislikeDialog.setOnDislikeItemClick(new DislikeDialog.OnDislikeItemClick() {
// @Override
// public void onItemClick(FilterWord filterWord) {
// //屏蔽广告
//// showToast("点击 " + filterWord.getName());
// //用户选择不喜欢原因后，移除广告展示
// if (frameLayout != null) {
//
// frameLayout.removeAllViews();
// }
// }
// });
// ad.setDislikeDialog(dislikeDialog);
// return;
// }
}
}
highgold/app/src/main/java/com/mints/highgold/manager/TTNativeExpressManager.java
View file @ b7f0702a
......@@ -228,28 +228,28 @@ public class TTNativeExpressManager {
* @param frameLayout
*/
private void bindDislike(Context context, TTNativeExpressAd ad, boolean customStyle, FrameLayout frameLayout) {
if (customStyle) {
//使用自定义样式
List<FilterWord> words = ad.getFilterWords();
if (words == null || words.isEmpty()) {
return;
}
final DislikeDialog dislikeDialog = new DislikeDialog(context, words);
dislikeDialog.setOnDislikeItemClick(new DislikeDialog.OnDislikeItemClick() {
@Override
public void onItemClick(FilterWord filterWord) {
//屏蔽广告
// showToast("点击 " + filterWord.getName());
//用户选择不喜欢原因后，移除广告展示
if (frameLayout != null) {
frameLayout.removeAllViews();
}
}
});
ad.setDislikeDialog(dislikeDialog);
return;
}
// if (customStyle) {
// //使用自定义样式
// List<FilterWord> words = ad.getFilterWords();
// if (words == null || words.isEmpty()) {
// return;
// }
//
// final DislikeDialog dislikeDialog = new DislikeDialog(context, words);
// dislikeDialog.setOnDislikeItemClick(new DislikeDialog.OnDislikeItemClick() {
// @Override
// public void onItemClick(FilterWord filterWord) {
// //屏蔽广告
//// showToast("点击 " + filterWord.getName());
// //用户选择不喜欢原因后，移除广告展示
// if (frameLayout != null) {
//
// frameLayout.removeAllViews();
// }
// }
// });
// ad.setDislikeDialog(dislikeDialog);
// return;
// }
}
}
highgold/app/src/main/java/com/mints/highgold/ui/activitys/AwardActivity.java
View file @ b7f0702a
......@@ -980,6 +980,11 @@ public class AwardActivity extends BaseActivity implements AwardView {
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -1033,8 +1038,8 @@ public class AwardActivity extends BaseActivity implements AwardView {
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
if (rewardVerify) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
isloadTTVedio = true;
} else {
awardPresenter.checkCoinRecordByTid(tid, carrierType);
......@@ -1177,6 +1182,11 @@ public class AwardActivity extends BaseActivity implements AwardView {
showToast("加载失败，请稍后重试.");
}
}
@Override
public void onFullScreenVideoCached(TTFullScreenVideoAd ttFullScreenVideoAd) {
}
});
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/DrinkClockActivity.java
View file @ b7f0702a
......@@ -717,6 +717,11 @@ public class DrinkClockActivity extends BaseActivity implements DrinkClockView,
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -754,8 +759,8 @@ public class DrinkClockActivity extends BaseActivity implements DrinkClockView,
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
if (rewardVerify) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
isTTVedioFinish = true;
dialogDrink.setDialogAdFinsh(goldTimes, goldCash);
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/DrinkTeaActivity.java
View file @ b7f0702a
......@@ -483,6 +483,11 @@ public class DrinkTeaActivity extends BaseActivity
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -520,7 +525,20 @@ public class DrinkTeaActivity extends BaseActivity
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
isTTVedioFinish = true;
dialogDrink.setDialogAdFinsh(goldTimes, goldCash);
} else {
goldTimesReset();
isTTVedioFinish = false;
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
}
}
// showToast("verify:" + rewardVerify + " amount:" + rewardAmount +
// " name:" + rewardName);
......@@ -534,18 +552,6 @@ public class DrinkTeaActivity extends BaseActivity
// showToast("观看视频:" + patchWaterCoin + "金币已发放");
// }
// }
if (rewardVerify) {
isTTVedioFinish = true;
dialogDrink.setDialogAdFinsh(goldTimes, goldCash);
} else {
goldTimesReset();
isTTVedioFinish = false;
if (dialog != null && dialog.isShowing()) {
dialog.dismiss();
}
}
}
@Override
public void onSkippedVideo() {
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/EraseActivity.java
View file @ b7f0702a
......@@ -462,6 +462,11 @@ public class EraseActivity extends BaseActivity
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -494,8 +499,8 @@ public class EraseActivity extends BaseActivity
}
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
if (rewardVerify) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
isloadTTVedio = true;
} else {
erasePresenter.checkCoinRecordByTid(tid);
......
highgold/app/src/main/java/com/mints/highgold/ui/activitys/TurntableActivity.java
View file @ b7f0702a
......@@ -472,6 +472,10 @@ public class TurntableActivity extends BaseActivity
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -505,10 +509,9 @@ public class TurntableActivity extends BaseActivity
}
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
if (rewardVerify) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
isloadTTVedio = true;
} else {
turntablePresenter.checkCoinRecordByTid(tid);
......
highgold/app/src/main/java/com/mints/highgold/ui/fragment/VersusFragment.java
View file @ b7f0702a
......@@ -18,7 +18,6 @@ import com.bytedance.sdk.openadsdk.TTAdNative;
import com.bytedance.sdk.openadsdk.TTAppDownloadListener;
import com.bytedance.sdk.openadsdk.TTFullScreenVideoAd;
import com.bytedance.sdk.openadsdk.TTRewardVideoAd;
import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity;
import com.daimajia.androidanimations.library.Techniques;
import com.daimajia.androidanimations.library.YoYo;
import com.mints.highgold.BuildConfig;
......@@ -68,7 +67,6 @@ import com.mints.library.base.BaseWebActivity;
import com.mints.library.net.netstatus.NetUtils;
import com.mints.library.utils.json.JsonUtil;
import com.mints.library.utils.nodoubleclick.AntiShake;
import com.qq.e.ads.rewardvideo.RewardVideoAD;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.tbruyelle.rxpermissions.RxPermissions;
......@@ -358,7 +356,7 @@ public class VersusFragment extends BaseFragment
private VedioAdingManager vedioAdingManager;// 随机广告
// 优量汇激励视频
RewardVideoAD rewardVideoAD;
// RewardVideoAD rewardVideoAD;
private boolean isClickScreen = true; // 是否点击屏幕跳转广告
......@@ -818,7 +816,7 @@ public class VersusFragment extends BaseFragment
.subscribe(granted -> {
if (granted) {
try {
YwSDK_WebActivity.Companion.open(getActivity());
// YwSDK_WebActivity.Companion.open(getActivity());
} catch (Exception e) {
e.printStackTrace();
showToast("暂不支持该版本");
......@@ -1978,6 +1976,11 @@ public class VersusFragment extends BaseFragment
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕，比如视频url等，在此回调后，可以播放在线视频，网络不好可能出现加载缓冲，影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......@@ -2043,8 +2046,8 @@ public class VersusFragment extends BaseFragment
//视频播放完成后，奖励验证回调，rewardVerify：是否有效，rewardAmount：奖励梳理，rewardName：奖励名称
@Override
public void onRewardVerify(boolean rewardVerify, int rewardAmount, String rewardName) {
if (rewardVerify) {
public void onRewardVerify(boolean b, int i, String s, int i1, String s1) {
if (b) {
if (TextUtils.equals(carrierType, Constant.CARRIER_SIGNIN_HOMEPAGE_CARD)) {
// 签到
isShowSignAd = true;
......
highgold/app/src/main/res/values/attrs.xml
View file @ b7f0702a
......@@ -58,29 +58,29 @@
<!-- 圆形进度条 -->
<declare-styleable name="CircleProgressBar">
<attr name="antiAlias" />
<attr name="startAngle" />
<attr name="sweepAngle" />
<attr name="animTime" />
<attr name="maxValue" />
<attr name="value" />
<attr name="precision" />
<attr name="valueSize" />
<attr name="valueColor" />
<attr name="textOffsetPercentInRadius" />
<attr name="antiAlias" format="boolean" />
<attr name="startAngle" format="float" />
<attr name="sweepAngle" format="float" />
<attr name="animTime" format="float" />
<attr name="maxValue" format="float" />
<attr name="value" format="float" />
<attr name="precision" format="integer" />
<attr name="valueSize" format="dimension" />
<attr name="valueColor" format="color" />
<attr name="textOffsetPercentInRadius" format="float" />
<!-- 绘制内容相应的提示语 -->
<attr name="hint" />
<attr name="hintSize" />
<attr name="hintColor" />
<attr name="hint" format="string" />
<attr name="hintSize" format="dimension" />
<attr name="hintColor" format="color" />
<!-- 绘制内容的单位 -->
<attr name="unit" />
<attr name="unitSize" />
<attr name="unitColor" />
<attr name="unit" format="string" />
<attr name="unitSize" format="dimension" />
<attr name="unitColor" format="color" />
<!-- 圆弧宽度 -->
<attr name="arcWidth" />
<attr name="arcColors" />
<attr name="arcWidth" format="dimension" />
<attr name="arcColors" format="color" />
<!-- 背景圆弧颜色 -->
<attr name="bgArcColor" />
<attr name="bgArcColor" format="color" />
<!-- 背景圆弧宽度 -->
<attr name="bgArcWidth" format="dimension" />
</declare-styleable>
......
highgold/build.gradle
View file @ b7f0702a
......@@ -21,7 +21,7 @@ buildscript {
// domob广告
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'com.android.tools.build:gradle:4.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// TalkingDada 灵动事件
// classpath 'com.tendcloud:codeless-gradle-plugin:0.0.2'
......
highgold/gradle/wrapper/gradle-wrapper.properties
View file @ b7f0702a
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
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