Commit 663594f8 authored by jyx's avatar jyx

代码提交

parent 503e89c6
......@@ -37,8 +37,7 @@ android {
UMENG_KEY : RELEASE_UMENG_KEY,
SHARE_KEY : RELEASE_SHARESDK_KEY,
SHARE_SECRET : RELEASE_SHARESDK_SECRET,
APPLICATION_ID : applicationId,
APPLOG_SCHEME : "rangersapplog.98d71e505549780b".toLowerCase()]
APPLICATION_ID : applicationId]
}
......@@ -343,8 +342,10 @@ dependencies {
// androidTestImplementation 'androidx.test.ext:junit:1.1.2'
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
// 穿山甲广告
implementation(name: 'open_ad_sdk_4.0.1.1', ext: 'aar')
// 穿山甲广告 4.0.11
// implementation(name: 'open_ad_sdk_4.0.1.9', ext: 'aar')
implementation 'com.pangle.cn:ads-sdk-pro:4.0.1.9'
implementation(name: 'tools_release', ext: 'aar')
// 广点通广告 腾讯
implementation(name: 'GDTSDK.unionNormal.4.420.1290', ext: 'aar')
// 快手
......
......@@ -323,7 +323,8 @@
# ===================== 穿山甲 START ================
-keep class com.bytedance.sdk.openadsdk.** { *; }
-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,EnclosingMethod
-keep class com.bytedance.sdk.openadsdk.** {*;}
-keep public interface com.bytedance.sdk.openadsdk.downloadnew.** {*;}
-keep class com.pgl.sys.ces.* {*;}
# ======================= 穿山甲 END ================
......@@ -371,13 +372,6 @@
# ======================= 数美 END ================
# ===================== 猎豹游戏 START ================
-keep class com.cmgame.x5fit.** {*;}
-keep class com.cmgame.gdtfit.** {*;}
-keep class com.cmcm.cmgame.** {*;}
# ======================= 猎豹游戏 END ================
# ===================== 移动安全联盟 START ================
......@@ -387,56 +381,6 @@
# ===================== 一览视频 START ================
-keep class com.yilan.sdk.**{
*;
}
-dontwarn javax.annotation.**
-dontwarn sun.misc.Unsafe
-dontwarn org.conscrypt.*
-dontwarn okio.**
###阿里云混淆
-keep class com.alibaba.sdk.android.**{*;}
-keep class com.ut.**{*;}
-keep class com.ta.**{*;}
###其他混淆
-keep class android.support.v4.**{
public *;
}
-keep class android.support.v7.**{
public *;
}
-keep class org.chromium.** {*;}
-keep class org.chromium.** { *; }
-keep class aegon.chrome.** { *; }
-keep class com.kwai.**{ *; }
-dontwarn com.kwai.**
-dontwarn com.kwad.**
-dontwarn com.ksad.**
-dontwarn aegon.chrome.**
-keepclassmembers class * extends android.app.Activity { public void *(android.view.View);
}
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class com.baidu.mobads.*.** { *; }
#ijkplayer
-keep class tv.danmaku.ijk.media.player.** {*;}
-keep class tv.danmaku.ijk.media.player.IjkMediaPlayer{*;}
-keep class tv.danmaku.ijk.media.player.ffmpeg.FFmpegApi{*;}
# ======================= 一览视频 END ================
......@@ -644,15 +588,15 @@
# ===================== 快手 START ================ 好兔视频已混淆
# -keep class org.chromium.** {*;}
# -keep class org.chromium.** { *; }
# -keep class aegon.chrome.** { *; }
# -keep class com.kwai.**{ *; }
# -dontwarn com.kwai.**
# -dontwarn com.kwad.**
# -dontwarn com.ksad.**
# -dontwarn aegon.chrome.**
# ===================== 快手 START ================
-keep class org.chromium.** {*;}
-keep class org.chromium.** { *; }
-keep class aegon.chrome.** { *; }
-keep class com.kwai.**{ *; }
-dontwarn com.kwai.**
-dontwarn com.kwad.**
-dontwarn com.ksad.**
-dontwarn aegon.chrome.**
# ======================= 快手 END ================
......@@ -811,37 +755,6 @@
-keep class com.mdad.sdk.mduisdk.shouguan.** { *; }
# ======================= 愉悦赚 END ================
# ======================= 穿山甲 GroMore START ================
#pangle
-keep class com.bytedance.sdk.openadsdk.** { *; }
-keep public interface com.bytedance.sdk.openadsdk.downloadnew.** {*;}
-keep class com.pgl.sys.ces.* {*;}
#聚合混淆
-keep class bykvm*.**
-keep class com.bytedance.msdk.adapter.**{ public *; }
-keep class com.bytedance.msdk.api.** {
public *;
}
-keep class com.bytedance.msdk.base.TTBaseAd{*;}
-keep class com.bytedance.msdk.adapter.TTAbsAdLoaderAdapter{
public *;
protected <fields>;
}
# baidu sdk 不接入baidu sdk可以不引入
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class com.baidu.mobads.** { *; }
-keep class com.baidu.mobad.** { *; }
-keep class com.bun.miitmdid.core.** {*;}
#ks 快手 不接入ks sdk可以不引入
-keep class org.chromium.** {*;}
-keep class org.chromium.** { *; }
......@@ -852,19 +765,4 @@
-dontwarn com.ksad.**
-dontwarn aegon.chrome.**
# Admob 不接入admob sdk可以不引入
-keep class com.google.android.gms.ads.MobileAds {
public *;
}
#sigmob 不接入sigmob sdk可以不引入
-dontwarn android.support.v4.**
-keep class android.support.v4.** { *; }
-keep interface android.support.v4.** { *; }
-keep public class * extends android.support.v4.**
-keep class sun.misc.Unsafe { *; }
-dontwarn com.sigmob.**
-keep class com.sigmob.**.**{*;}
# ======================= 穿山甲 GroMore END ================
\ No newline at end of file
......@@ -11,10 +11,10 @@
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<permission android:name="com.mints.goodmoney.permission.JPUSH_MESSAGE" />
......@@ -60,6 +60,7 @@
<application
android:name=".MintsApplication"
android:allowBackup="true"
android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
android:icon="@mipmap/ic_launcher_main"
android:label="@string/app_name"
android:largeHeap="true"
......@@ -69,7 +70,7 @@
android:theme="@style/CustomAppTheme"
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning"
tools:replace="android:theme">
tools:replace="android:appComponentFactory,android:theme">
<uses-library
android:name="org.apache.http.legacy"
......@@ -368,24 +369,21 @@
android:resource="@xml/ywsdk_file_paths" />
</provider>
<!-- 穿山甲广告 -->
<provider
android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
android:authorities="${applicationId}.TTMultiProvider"
android:exported="false" />
<provider
android:name="com.bytedance.sdk.openadsdk.TTFileProvider"
android:authorities="${applicationId}.TTFileProvider"
android:exported="false"
android:grantUriPermissions="true"
tools:replace="android:authorities">
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/pangle_file_paths"
tools:replace="android:resource" />
tools:replace="android:resource"
android:resource="@xml/file_paths" />
</provider>
<provider
android:name="com.bytedance.sdk.openadsdk.multipro.TTMultiProvider"
android:authorities="${applicationId}.TTMultiProvider"
android:exported="false" />
<!-- 广点通广告 -->
<uses-library
......
......@@ -82,7 +82,8 @@ object KsPreLoadExpressManager {
* 使用SDK渲染的播放控件
*/
private fun getVideoItemView(parent: ViewGroup, ksNativeAd: KsNativeAd): View? {
val convertView: View = LayoutInflater.from(mContext).inflate(R.layout.native_item_video, parent, false)
val convertView: View =
LayoutInflater.from(mContext).inflate(R.layout.native_item_video, parent, false)
val videoViewHolder = AdVideoViewHolder(convertView)
// 设置广告数据
......@@ -116,7 +117,8 @@ object KsPreLoadExpressManager {
* 自定义的单图广告
*/
private fun getSingleImageItemView(parent: ViewGroup, ksNativeAd: KsNativeAd): View? {
val convertView: View = LayoutInflater.from(mContext).inflate(R.layout.native_item_single_image, parent, false)
val convertView: View =
LayoutInflater.from(mContext).inflate(R.layout.native_item_single_image, parent, false)
val viewHolder = AdSingleImageViewHolder(convertView)
bindCommonData(convertView as ViewGroup, viewHolder, ksNativeAd)
......@@ -134,7 +136,8 @@ object KsPreLoadExpressManager {
* 自定义的组图广告
*/
private fun getGroupImageItemView(parent: ViewGroup, ksNativeAd: KsNativeAd): View? {
val convertView: View = LayoutInflater.from(mContext).inflate(R.layout.native_item_group_image, parent, false)
val convertView: View =
LayoutInflater.from(mContext).inflate(R.layout.native_item_group_image, parent, false)
val viewHolder = AdGroupImageViewHolder(convertView)
bindCommonData(convertView as ViewGroup, viewHolder, ksNativeAd)
......@@ -163,14 +166,17 @@ object KsPreLoadExpressManager {
@SuppressLint("DefaultLocale")
private fun getNormalItemView(parent: ViewGroup): View? {
val convertView: View = LayoutInflater.from(mContext).inflate(R.layout.native_item_normal, parent, false)
val convertView: View =
LayoutInflater.from(mContext).inflate(R.layout.native_item_normal, parent, false)
val normalViewHolder = NormalViewHolder(convertView)
normalViewHolder.textView.text = "没有广告"
return convertView
}
private fun bindCommonData(convertView: ViewGroup, adBaseViewHolder: AdBaseViewHolder,
ad: KsNativeAd) {
private fun bindCommonData(
convertView: ViewGroup, adBaseViewHolder: AdBaseViewHolder,
ad: KsNativeAd
) {
// 点击转换view的集合,传入的view点击时会触发转换操作:app下载, 打开h5页面
val clickViewList: MutableList<View> = ArrayList()
clickViewList.add(convertView) // 点击整个view都可触发转换
......@@ -181,16 +187,12 @@ object KsPreLoadExpressManager {
ad.registerViewForInteraction(convertView, clickViewList,
object : KsNativeAd.AdInteractionListener {
override fun onAdClicked(view: View, ad: KsNativeAd) {
if (ad != null) {
// Toast.makeText(MintsApplication.getContext(), "广告" + ad.appName + "被点击", Toast.LENGTH_SHORT).show()
}
}
override fun onAdShow(ad: KsNativeAd) {
if (ad != null) {
// Toast.makeText(mContext, "广告" + ad.appName + "展示", Toast.LENGTH_SHORT).show()
}
}
override fun handleDownloadDialog(p0: DialogInterface.OnClickListener?): Boolean {
return false
......@@ -228,7 +230,8 @@ object KsPreLoadExpressManager {
adBaseViewHolder.mAppIcon.visibility = View.GONE
} else {
adBaseViewHolder.mAppIcon.visibility = View.VISIBLE
Glide.with(MintsApplication.getContext()).load(ad.appIconUrl).into(adBaseViewHolder.mAppIcon)
Glide.with(MintsApplication.getContext()).load(ad.appIconUrl)
.into(adBaseViewHolder.mAppIcon)
}
// app名称
adBaseViewHolder.mAppName.text = ad.appName
......
......@@ -5,14 +5,15 @@ 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.TTAdSdk;
import com.bytedance.sdk.openadsdk.TTAppDownloadListener;
import com.bytedance.sdk.openadsdk.TTRewardVideoAd;
import com.mints.goodmoney.BuildConfig;
import com.mints.goodmoney.MintsApplication;
import com.mints.goodmoney.ad.video.base.BaseVideoAd;
import com.mints.goodmoney.ad.video.base.VideoAdStatusListener;
import com.mints.goodmoney.common.AppConfig;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.manager.TTNativeExpressManager;
import com.mints.goodmoney.manager.TrackManager;
import com.mints.goodmoney.manager.TtCsjAdManager;
import com.mints.goodmoney.manager.UserManager;
......@@ -60,8 +61,7 @@ public class CsjVideoAdManager extends BaseVideoAd {
ps = new AppPreferences(activity);
userManager = UserManager.getInstance();
TTNativeExpressManager ttNativeExpressManager = new TTNativeExpressManager();
ttAdNative = ttNativeExpressManager.initTTAd(false);
ttAdNative = TTAdSdk.getAdManager().createAdNative(MintsApplication.getContext());
}
@Override
......@@ -79,8 +79,8 @@ public class CsjVideoAdManager extends BaseVideoAd {
* @param carrierType
*/
@Override
public void loadAd(Activity activity, int curCoin, String carrierType, String extraId) {
this.activity = activity;
public void loadAd(Activity _activity, int curCoin, String carrierType, String extraId) {
this.activity = _activity;
isClickScreen = true;
this.curCoin = curCoin;
this.extraId = extraId;
......@@ -137,9 +137,9 @@ public class CsjVideoAdManager extends BaseVideoAd {
AdSlot adSlot = new AdSlot.Builder()
.setCodeId(codeId)
.setSupportDeepLink(true)
// .setAdLoadType(TTAdLoadType.LOAD)
//个性化模板广告需要设置期望个性化模板广告的大小,单位dp,激励视频场景,只要设置的值大于0即可。仅模板广告需要设置此参数
.setExpressViewAcceptedSize(500, 500)
.setImageAcceptedSize(1080, 1920)
.setUserID(userID)//用户id,必传参数
.setMediaExtra(JsonUtil.toJson(getAdMapVO(carrierType, tid)))
.setOrientation(TTAdConstant.VERTICAL)
......@@ -160,9 +160,12 @@ public class CsjVideoAdManager extends BaseVideoAd {
//视频广告加载后,视频资源缓存到本地的回调,在此回调后,播放本地视频,流畅不阻塞。
@Override
public void onRewardVideoCached() {
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
if (mttRewardVideoAd != null) {
mttRewardVideoAd.showRewardVideoAd(activity);
mttRewardVideoAd = null;
mttRewardVideoAd.showRewardVideoAd(_activity, TTAdConstant.RitScenes.CUSTOMIZE_SCENES, "scenes_test");
} else {
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_CSJ, Constant.EVENT_TYPE_ONE, "999999", "Cached Fail");
LogUtil.d(TAG, " onRewardVideoCached onError ");
......@@ -173,10 +176,6 @@ public class CsjVideoAdManager extends BaseVideoAd {
}
}
@Override
public void onRewardVideoCached(TTRewardVideoAd ttRewardVideoAd) {
}
//视频广告的素材加载完毕,比如视频url等,在此回调后,可以播放在线视频,网络不好可能出现加载缓冲,影响体验。
@Override
public void onRewardVideoAdLoad(TTRewardVideoAd ad) {
......
......@@ -566,7 +566,6 @@ public class VideoAdingManager {
csjVideoAdManager = CsjVideoAdManager.getInstance(activity);
}
csjVideoAdManager.setVideoAdStatusListener(new VideoAdStatusListener() {
@Override
public void adFail() {
......
......@@ -114,7 +114,6 @@ public class TtCsjAdManager {
.appName(TT_AD_NAME)
.titleBarTheme(TTAdConstant.TITLE_BAR_THEME_DARK)
.allowShowNotify(true) //是否允许sdk展示通知栏提示
.allowShowPageWhenScreenLock(false) //是否在锁屏场景支持展示广告落地页
.debug(logFlag) //测试阶段打开,可以通过日志排查问题,上线时去除该调用
.directDownloadNetworkType(TTAdConstant.NETWORK_STATE_WIFI, TTAdConstant.NETWORK_STATE_4G, TTAdConstant.NETWORK_STATE_3G) //允许直接下载的网络状态集合
.supportMultiProcess(false)//是否支持多进程
......
......@@ -14,6 +14,7 @@ import android.widget.GridView
import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.viewpager.widget.ViewPager
import com.bytedance.tools.ui.ToolsActivity
import com.component.dly.xzzq_ywsdk.YwSDK_WebActivity.Companion.open
import com.fly.scenemodule.SceneUtil
import com.mints.goodmoney.BuildConfig
......@@ -1057,12 +1058,15 @@ class MyFragment : BaseFragment(),
jumpQQGroup()
}
R.id.item_title_id -> {
if (!userManager.userIsLogin()) {
readyGo(WxLoginActivity::class.java)
}
// if (!userManager.userIsLogin()) {
// readyGo(WxLoginActivity::class.java)
// }
awardVideo(0,"")
}
R.id.iv_right_icon -> {
readyGo(SettingsActivity::class.java)
// readyGo(SettingsActivity::class.java)
readyGo(ToolsActivity::class.java)
}
R.id.btn_withdraw -> {
if (userConfig == null) {
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<corners android:radius="60dp" />
<stroke android:color="#B22222" android:width="1dp"/>
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#e0e0e0" />
</shape>
......@@ -6,7 +6,6 @@
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:visibility="gone"
android:orientation="horizontal">
<Button
......@@ -16,7 +15,7 @@
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:background="@drawable/btn_bg_blue"
android:textColor="#3C93CD"
android:textColor="#EEB4B4"
android:text="暂停下载"
android:visibility="gone" />
......@@ -25,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="30dp"
android:background="@drawable/btn_bg_red"
android:textColor="#f85959"
android:textColor="#EEB4B4"
android:text="删除下载"
android:visibility="gone" />
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<com.bytedance.msdk.api.format.TTNativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
......@@ -16,8 +12,8 @@
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:paddingEnd="10dp"
android:paddingRight="10dp" />
......@@ -27,8 +23,8 @@
android:layout_height="wrap_content"
android:layout_below="@+id/icon_source_layout"
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:ellipsize="end"
android:lineSpacingMultiplier="1"
android:maxLines="2"
......@@ -37,7 +33,6 @@
android:textColor="@android:color/black"
android:textSize="18sp" />
<!-- -->
<LinearLayout
android:id="@+id/layout_image_group"
android:layout_width="match_parent"
......@@ -83,8 +78,8 @@
android:layout_height="45dp"
android:layout_below="@+id/layout_image_group"
android:layout_marginLeft="10dp"
android:layout_marginTop="4dp"
android:layout_marginRight="10dp" />
android:layout_marginRight="10dp"
android:layout_marginTop="4dp" />
<!--==== 测试下载状态控制功能 begin ========-->
<include
......@@ -92,11 +87,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ad_title_creative_btn_layout"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal" />
<!--==== 测试下载状态控制功能 end ========-->
</RelativeLayout>
</com.bytedance.msdk.api.format.TTNativeAdView>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
......@@ -16,7 +16,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:src="@drawable/tt_mute" />
android:src="@drawable/demo_mute" />
<TextView
android:id="@+id/tv_listitem_ad_source"
......
<?xml version="1.0" encoding="utf-8"?>
<com.bytedance.msdk.api.format.TTNativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
......@@ -18,10 +14,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/icon_source_layout"
android:layout_marginBottom="3dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="3dp"
android:layout_marginTop="3dp"
android:ellipsize="end"
android:lineSpacingMultiplier="1"
android:maxLines="2"
......@@ -37,9 +33,14 @@
android:layout_below="@id/tv_listitem_ad_desc"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/tt_ad_cover_btn_begin_bg"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/img_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/iv_listitem_image"/>
<!-- title+creativeBtn layout -->
<include
......@@ -51,6 +52,16 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" />
</RelativeLayout>
<!--==== 测试下载状态控制功能 begin ========-->
<include
layout="@layout/listitem_ad_download_btn_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ad_title_creative_btn_layout"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal" />
<!--==== 测试下载状态控制功能 end ========-->
</com.bytedance.msdk.api.format.TTNativeAdView>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<com.bytedance.msdk.api.format.TTNativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
......@@ -20,28 +16,32 @@
android:layout_height="wrap_content"
android:layout_below="@+id/icon_source_layout"
android:layout_marginLeft="10dp"
android:layout_marginTop="3dp"
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_marginBottom="3dp"
android:ellipsize="end"
android:lineSpacingMultiplier="1"
android:maxLines="2"
android:singleLine="false"
android:text="劳力士服务中心,清洗保养,更换配件,9秒费用查询"
android:maxLines="2"
android:ellipsize="end"
android:lineSpacingMultiplier="1"
android:textColor="@android:color/black"
android:textSize="18sp" />
<com.bytedance.msdk.api.format.TTMediaView
<FrameLayout
android:id="@+id/iv_listitem_video"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_below="@id/tv_listitem_ad_desc"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@android:color/background_dark"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/img_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/iv_listitem_video"/>
<!-- title+creativeBtn layout -->
<include
......@@ -54,5 +54,16 @@
android:layout_marginRight="10dp" />
</RelativeLayout>
</com.bytedance.msdk.api.format.TTNativeAdView>
\ No newline at end of file
<!--==== 测试下载状态控制功能 begin ========-->
<include
layout="@layout/listitem_ad_download_btn_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ad_title_creative_btn_layout"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal" />
<!--==== 测试下载状态控制功能 end ========-->
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<com.bytedance.msdk.api.format.TTNativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
<FrameLayout
android:id="@+id/iv_listitem_express"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</com.bytedance.msdk.api.format.TTNativeAdView>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
......@@ -14,9 +10,8 @@
android:layout_width="match_parent"
android:layout_height="85dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp">
android:layout_marginRight="10dp"
android:layout_marginTop="10dp">
<ImageView
android:id="@+id/iv_listitem_image"
......@@ -24,16 +19,15 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="@drawable/tt_ad_cover_btn_begin_bg"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:src="@drawable/tt_ad_cover_btn_begin_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/iv_listitem_image"
android:layout_toLeftOf="@+id/iv_listitem_image"
android:layout_toStartOf="@+id/iv_listitem_image"
android:orientation="vertical">
<TextView
......@@ -58,22 +52,22 @@
android:id="@+id/iv_listitem_icon"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:src="@drawable/tt_mute" />
android:src="@drawable/demo_mute" />
<TextView
android:id="@+id/tv_listitem_ad_source"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/iv_listitem_dislike"
android:layout_toLeftOf="@+id/iv_listitem_dislike"
android:layout_toEndOf="@+id/iv_listitem_icon"
android:layout_toLeftOf="@+id/iv_listitem_dislike"
android:layout_toRightOf="@+id/iv_listitem_icon"
android:layout_toStartOf="@+id/iv_listitem_dislike"
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
......@@ -88,10 +82,11 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:clickable="true"
android:focusable="true" />
android:focusable="true"
android:src="@drawable/tt_dislike" />
</RelativeLayout>
</LinearLayout>
......@@ -107,5 +102,17 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" />
</RelativeLayout>
</FrameLayout>
\ No newline at end of file
<!--==== 测试下载状态控制功能 begin ========-->
<include
layout="@layout/listitem_ad_download_btn_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ad_title_creative_btn_layout"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:orientation="horizontal" />
<!--==== 测试下载状态控制功能 end ========-->
</RelativeLayout>
\ No newline at end of file
......@@ -5,16 +5,10 @@
android:layout_height="45dp"
android:layout_below="@+id/iv_listitem_image"
android:layout_marginBottom="2dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="#F4F5F7">
<RelativeLayout
android:id="@+id/tt_ad_logo"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:visibility="gone" />
<TextView
android:id="@+id/tv_listitem_ad_title"
android:layout_width="match_parent"
......@@ -22,6 +16,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toLeftOf="@+id/btn_listitem_creative"
android:layout_toStartOf="@+id/btn_listitem_creative"
android:gravity="center_vertical"
......@@ -38,12 +33,10 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginLeft="3dp"
android:layout_marginRight="8dp"
android:layout_marginStart="3dp"
android:background="@drawable/shape_jd_selected"
android:background="@drawable/btn_bg_creative"
android:gravity="center"
android:text="立即下载"
android:textColor="@color/black"
android:textColor="#B22222"
android:textSize="14sp" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
<TextView
android:id="@+id/feed_live_feed_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="14dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:ellipsize="end"
android:lineSpacingMultiplier="1"
android:maxLines="2"
android:singleLine="false"
android:textColor="#222222"
android:textSize="17sp"
tools:text="劳力士服务中心,清洗保养,更换配件,9秒费用查询" />
<FrameLayout
android:id="@+id/feed_live_feed_video"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_below="@id/feed_live_feed_desc"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/feed_live_feed_icon"
android:layout_width="45dp"
android:layout_height="16dp"
android:layout_alignLeft="@id/feed_live_feed_video"
android:layout_alignTop="@id/feed_live_feed_video"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:background="@drawable/feed_live_ad_status_icon" />
<RelativeLayout
android:id="@+id/feed_live_feed_layout"
android:layout_width="match_parent"
android:layout_height="58dp"
android:layout_below="@id/feed_live_feed_video"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="#F8F8F8"
android:gravity="center_vertical">
<ImageView
android:id="@+id/feed_live_feed_avatar"
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp">
</ImageView>
<TextView
android:id="@+id/feed_live_feed_title"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/feed_live_feed_avatar"
android:layout_marginLeft="9dp"
android:layout_toRightOf="@id/feed_live_feed_avatar"
android:ellipsize="end"
android:singleLine="true"
android:textColor="#161823"
android:textSize="14sp"
tools:text="罗永浩交个朋友直播间" />
<TextView
android:id="@+id/feed_live_feed_fans"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/feed_live_feed_title"
android:layout_alignLeft="@id/feed_live_feed_title"
android:layout_marginTop="2dp"
android:layout_toRightOf="@id/feed_live_feed_avatar"
android:gravity="center"
android:textColor="#80161823"
android:textSize="12sp"
tools:text="吊儿郎当" />
<ImageView
android:id="@+id/feed_live_ad_img"
android:layout_width="1dp"
android:layout_height="12dp"
android:layout_below="@id/feed_live_feed_title"
android:layout_alignTop="@id/feed_live_feed_fans"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_toRightOf="@id/feed_live_feed_fans"
android:background="#80161823" />
<TextView
android:id="@+id/feed_live_feed_watch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/feed_live_feed_title"
android:layout_centerVertical="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="2dp"
android:layout_toRightOf="@id/feed_live_ad_img"
android:gravity="center"
android:textColor="#80161823"
android:textSize="12sp"
tools:text="吊儿郎当发发发" />
<Button
android:id="@+id/feed_live_btn"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="12dp"
android:gravity="center"
android:text="@string/live_feed_btn"
android:textColor="#F04142"
android:background="@null"
android:textSize="12sp" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_centerVertical="true"
android:layout_marginRight="4dp"
android:layout_toLeftOf="@id/feed_live_btn"
android:background="@drawable/feed_live_icon_red" />
</RelativeLayout>
<ImageView
android:id="@+id/feed_live_feed_logo"
android:layout_width="36dp"
android:layout_height="14dp"
android:layout_below="@id/feed_live_feed_layout"
android:layout_marginLeft="16dp"
android:layout_marginTop="12dp" />
<TextView
android:id="@+id/feed_live_feed_logo_desc"
android:layout_width="wrap_content"
android:layout_height="12dp"
android:layout_below="@id/feed_live_feed_layout"
android:layout_marginLeft="4dp"
android:layout_marginTop="12dp"
android:layout_toRightOf="@id/feed_live_feed_logo"
android:text="穿山甲联盟"
android:textColor="#57161823"
android:textSize="10sp" />
<ImageView
android:id="@+id/feed_live_feed_close"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_below="@id/feed_live_feed_layout"
android:layout_alignParentRight="true"
android:layout_marginTop="12dp"
android:layout_marginRight="16dp"
android:background="@drawable/tt_dislike" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<com.bytedance.msdk.api.format.TTNativeAdView xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:ignore="HardcodedText">
......@@ -33,17 +29,16 @@
android:gravity="center"
android:singleLine="false"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:orientation="vertical">
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal">
android:gravity="center_horizontal"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_listitem_icon"
......@@ -63,8 +58,7 @@
android:layout_marginLeft="5dp"
android:layout_toEndOf="@id/iv_listitem_icon"
android:layout_toRightOf="@id/iv_listitem_icon"
android:orientation="vertical"
tools:ignore="NotSibling">
android:orientation="vertical">
<TextView
android:id="@+id/tv_listitem_ad_desc"
......@@ -88,13 +82,37 @@
</LinearLayout>
</RelativeLayout>
<Button
android:id="@+id/btn_listitem_creative"
android:layout_width="135dp"
android:layout_height="40dp"
android:textSize="9sp" />
</LinearLayout>
<!--==== 测试下载状态控制功能 begin ========-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:orientation="vertical">
<Button
android:id="@+id/btn_listitem_stop"
android:layout_width="135dp"
android:layout_height="40dp"
android:text="暂停"
android:textSize="9sp"
android:visibility="gone" />
<Button
android:id="@+id/btn_listitem_remove"
android:layout_width="135dp"
android:layout_height="40dp"
android:text="删除"
android:textSize="9sp"
android:visibility="gone" />
</LinearLayout>
<!--==== 测试下载状态控制功能 end ========-->
</LinearLayout>
......@@ -107,8 +125,6 @@
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:clickable="true"
android:src="@mipmap/dislike_icon" />
</RelativeLayout>
android:src="@drawable/tt_dislike" />
</com.bytedance.msdk.api.format.TTNativeAdView>
\ No newline at end of file
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="HardcodedText"
android:layout_height="40dp">
<TextView
android:id="@+id/text_idle"
android:layout_width="150dp"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="普通的view" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_native_ad_title"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:singleLine="true"
android:textSize="14sp" />
<ImageView
android:id="@+id/iv_native_image"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_below="@id/tv_native_ad_title"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:scaleType="centerCrop" />
<ImageView
android:id="@+id/iv_native_icon"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_below="@id/iv_native_image"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp" />
<LinearLayout
android:id="@+id/tv_source_desc_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_below="@id/iv_native_image"
android:layout_toRightOf="@id/iv_native_icon"
android:layout_toEndOf="@id/iv_native_icon"
tools:ignore="UseCompoundDrawables">
<TextView
android:id="@+id/tv_native_ad_desc"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:layout_marginTop="15dp"
android:ellipsize="end"
android:singleLine="true"
android:textSize="14sp" />
<ImageView
android:id="@+id/img_native_dislike"
android:layout_width="20dp"
android:layout_height="20dp"
android:background="@drawable/tt_dislike" />
<ImageView
android:id="@+id/iv_native_ad_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"/>
</LinearLayout>
<Button
android:id="@+id/btn_native_creative"
android:layout_width="90dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginRight="14dp"
android:layout_marginEnd="14dp"
android:layout_alignTop="@+id/tv_source_desc_layout"
android:textSize="10sp"
/>
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="55dp"
android:layout_marginTop="20dp"
android:layout_marginRight="10dp"
android:background="#FFFFFF">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_marginLeft="5dp"
android:maxLines="1"
android:text="title"
android:textColor="#000000"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="5dp"
android:maxLines="2"
android:textColor="#000000"
android:textSize="10sp"
android:text="desc" />
<Button
android:id="@+id/button_creative"
android:layout_width="200dp"
android:layout_marginTop="20dp"
android:layout_height="35dp"
android:layout_marginBottom="10dp"
android:layout_gravity="center_horizontal"
android:textColor="@android:color/white"
android:background="#B22222"
android:text="立即下载" />
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/native_insert_ad_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:ignore="MergeRootFrame">
<ImageView
android:id="@+id/native_insert_ad_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:layout_marginTop="32dp"/>
<ImageView
android:id="@+id/native_insert_close_icon_img"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="end|top"
android:scaleType="fitXY"
android:layout_marginTop="10dp"
android:background="@drawable/tt_dislike"
/>
<ImageView
android:id="@+id/native_insert_ad_logo"
android:layout_width="36dp"
android:layout_height="14dp"
android:layout_gravity="start|bottom"
android:layout_marginBottom="40dp"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|bottom"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_marginBottom="15dp"
android:background="@drawable/circle_solid_main"
android:gravity="center"
android:text="@string/demo_ad"
android:textColor="@color/white" />
<TextView
android:id="@+id/native_insert_dislike_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/circle_solid_main"
android:textColor="@color/white"
android:text="@string/demo_reward_feedback"
android:gravity="center"
android:layout_gravity="end|bottom"
android:layout_marginBottom="15dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
/>
</FrameLayout>
\ No newline at end of file
......@@ -35,4 +35,10 @@
<string name="notification_permission">通知权限</string>
<string name="get_permission">获取权限</string>
<string name="live_feed_btn">去抖音直播间</string>
<string name="live_fans_text">粉丝 %1$s</string>
<string name="live_watch_text">观看 %1$s</string>
<string name="demo_reward_feedback">反馈</string>
<string name="demo_ad">Ad</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
<!--为了适配所有路径可以设置 path = "." -->
<external-path
name="tt_external_root"
path="." />
<external-path
name="tt_external_download"
path="Download" />
<external-files-path
name="tt_external_files_download"
path="Download" />
<files-path
name="tt_internal_file_download"
path="Download" />
<cache-path
name="tt_internal_cache_download"
path="Download" />
<external-path name="tt_external_root" path="." />
<external-path name="tt_external_download" path="Download" />
<external-files-path name="tt_external_files_download" path="Download" />
<files-path name="tt_internal_file_download" path="Download" />
<cache-path name="tt_internal_cache_download" path="Download" />
</paths>
\ No newline at end of file
......@@ -2,6 +2,7 @@
<network-security-config>
<base-config cleartextTrafficPermitted="true" >
<trust-anchors>
<certificates src="user" />
<certificates src="system" />
</trust-anchors>
</base-config>
......
......@@ -75,10 +75,8 @@ allprojects {
// umeng仓库
maven { url 'https://repo1.maven.org/maven2/' }
maven { url "https://jitpack.io" }
//添加一览 maven地址
maven {
url 'http://nexus.1lan.tv/repository/maven-releases/'
url 'https://artifact.bytedance.com/repository/pangle'
}
maven {
url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
......
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