Commit b7f0702a authored by jyx's avatar jyx

gradle版本升级

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