Commit d9da0255 authored by mengcuiguang's avatar mengcuiguang

添加审核去广告包

parent e6ac82fb
...@@ -64,7 +64,8 @@ android { ...@@ -64,7 +64,8 @@ android {
// 不显示Log // 不显示Log
buildConfigField "boolean", "LOG_DEBUG", "true" buildConfigField "boolean", "LOG_DEBUG", "true"
buildConfigField "String", "AppKeyPre", "\"abcd\"" buildConfigField "String", "AppKeyPre", "\"abcd\""
buildConfigField "String", "MainIp", DEBUG_URL // buildConfigField "String", "MainIp", DEBUG_URL
buildConfigField "String", "MainIp", RELEASE_URL
manifestPlaceholders = [TD_SCHEMA_KEY: DEBUG_TD_SCHEMA_KEY, manifestPlaceholders = [TD_SCHEMA_KEY: DEBUG_TD_SCHEMA_KEY,
TD_KEY : DEBUG_TD_KEY] TD_KEY : DEBUG_TD_KEY]
...@@ -190,7 +191,7 @@ dependencies { ...@@ -190,7 +191,7 @@ dependencies {
// 三方接入 // 三方接入
// leakcanary // leakcanary
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4' // debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
// 极光推送 // 极光推送
implementation 'cn.jiguang.sdk:jpush:3.6.6' implementation 'cn.jiguang.sdk:jpush:3.6.6'
implementation 'cn.jiguang.sdk:jcore:2.3.8' implementation 'cn.jiguang.sdk:jcore:2.3.8'
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<!-- </activity>--> <!-- </activity>-->
<activity <activity
android:name=".ui.activitys.SplashYlhActivity" android:name=".ui.activitys.SplashActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/NormalSplash"> android:theme="@style/NormalSplash">
<intent-filter> <intent-filter>
......
...@@ -354,33 +354,33 @@ class MyFragment : BaseFragment(), ...@@ -354,33 +354,33 @@ class MyFragment : BaseFragment(),
* 设置Banner * 设置Banner
*/ */
override fun getMyRotationChartSuc(data: RotationChartBean) { override fun getMyRotationChartSuc(data: RotationChartBean) {
mBannerData = data // mBannerData = data
//
if (mBannerData?.list == null || mBannerData?.list!!.size == 0) { // if (mBannerData?.list == null || mBannerData?.list!!.size == 0) {
mAdBannerAdapter = null // mAdBannerAdapter = null
//
fl_my_banner.visibility = View.VISIBLE // fl_my_banner.visibility = View.VISIBLE
LogUtil.d("TAG", "getMyRotationChartSuc") // LogUtil.d("TAG", "getMyRotationChartSuc")
banner_view.visibility = View.GONE // banner_view.visibility = View.GONE
banner_view.stopAutoScroll() // banner_view.stopAutoScroll()
BannerManager.getTtBanner(TtCsjAdManager.TT_AD_BANNER_MY, fl_my_banner) // BannerManager.getTtBanner(TtCsjAdManager.TT_AD_BANNER_MY, fl_my_banner)
} else { // } else {
//
fl_my_banner.visibility = View.GONE // fl_my_banner.visibility = View.GONE
banner_view.visibility = View.VISIBLE // banner_view.visibility = View.VISIBLE
mAdBannerAdapter = AdBannerAdapter(activity) // mAdBannerAdapter = AdBannerAdapter(activity)
//
mAdBannerAdapter?.let { // mAdBannerAdapter?.let {
val list: MutableList<RotationChartBean.ListBean?> = mutableListOf() // val list: MutableList<RotationChartBean.ListBean?> = mutableListOf()
list.addAll(mBannerData?.list!!) // list.addAll(mBannerData?.list!!)
list.add(data.position, null) // list.add(data.position, null)
it.setOnPageClickListener(this) // it.setOnPageClickListener(this)
it.setData(list) // it.setData(list)
it.setAdPosition(data.position) // it.setAdPosition(data.position)
banner_view.setAdapter(it) // banner_view.setAdapter(it)
} // }
banner_view.startAutoScroll() // banner_view.startAutoScroll()
} // }
} }
override fun onRefresh(refreshLayout: RefreshLayout) { override fun onRefresh(refreshLayout: RefreshLayout) {
......
...@@ -101,37 +101,37 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall ...@@ -101,37 +101,37 @@ public class ForegroundOrBackground implements Application.ActivityLifecycleCall
return; return;
} }
if (count == 0) { // if (count == 0) {
// LogUtil.d("ForegroundOrBackground", System.currentTimeMillis() - leaveTime + " onActivityStarted"); //// LogUtil.d("ForegroundOrBackground", System.currentTimeMillis() - leaveTime + " onActivityStarted");
// 60秒后打开应用 显示开屏广告 // // 60秒后打开应用 显示开屏广告
if (System.currentTimeMillis() - leaveTime >= 60000) { // if (System.currentTimeMillis() - leaveTime >= 60000) {
//
if (isYlhSplash) { // if (isYlhSplash) {
isYlhSplash = false; // isYlhSplash = false;
//
if (ylhIntent == null) { // if (ylhIntent == null) {
// 优量汇广告 // // 优量汇广告
ylhIntent = new Intent(activity, SplashADActivity.class); // ylhIntent = new Intent(activity, SplashADActivity.class);
} // }
activity.startActivity(ylhIntent); // activity.startActivity(ylhIntent);
} else { // } else {
isYlhSplash = true; // isYlhSplash = true;
//
if (csjIntent == null) { // if (csjIntent == null) {
// 快手广告
csjIntent = new Intent(activity, SplashCsjADActivity.class);
}
activity.startActivity(csjIntent);
// if (ksIntent == null) {
// // 快手广告 // // 快手广告
// ksIntent = new Intent(activity, SplashKsADActivity.class); // csjIntent = new Intent(activity, SplashCsjADActivity.class);
// } // }
// activity.startActivity(ksIntent); // activity.startActivity(csjIntent);
} //
//// if (ksIntent == null) {
} //// // 快手广告
} //// ksIntent = new Intent(activity, SplashKsADActivity.class);
//// }
//// activity.startActivity(ksIntent);
// }
//
// }
// }
count++; count++;
} }
......
...@@ -170,6 +170,7 @@ ...@@ -170,6 +170,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/flAwardAd" android:id="@+id/flAwardAd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/flSubsidykAd" android:id="@+id/flSubsidykAd"
android:layout_width="340dp" android:layout_width="340dp"
android:layout_height="340dp" android:layout_height="340dp"
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/flMorningClockAd" android:id="@+id/flMorningClockAd"
android:layout_width="340dp" android:layout_width="340dp"
android:layout_height="340dp" android:layout_height="340dp"
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/flWalkAd" android:id="@+id/flWalkAd"
android:layout_width="340dp" android:layout_width="340dp"
android:layout_height="340dp" android:layout_height="340dp"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:visibility="gone"
android:id="@+id/flWaterAd" android:id="@+id/flWaterAd"
android:layout_width="340dp" android:layout_width="340dp"
android:layout_height="340dp" android:layout_height="340dp"
......
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