Commit 5faa4e47 authored by wanglei's avatar wanglei

..

parent 4a7d3e92
...@@ -14,7 +14,10 @@ class AdConfigBean( ...@@ -14,7 +14,10 @@ class AdConfigBean(
var scanTabShowAd: Boolean = true, var scanTabShowAd: Boolean = true,
val setTabShowAd: Boolean = true, val setTabShowAd: Boolean = true,
var taichiAdValue: Int = 1,//价值上报阀值 var taichiAdValue: Int = 1,//价值上报阀值
var adRatio: Int = 100//价值上报随机控制 var adRatio: Int = 100,//价值上报随机控制
var homeShowNative: Boolean = false,//首页显示原生
var historyShowNative: Boolean = false,//历史显示原生
var setShowNative: Boolean = false,//设置显示原生
) { ) {
companion object { companion object {
/** /**
......
...@@ -2,6 +2,7 @@ package com.base.scanqrclear.ui.main ...@@ -2,6 +2,7 @@ package com.base.scanqrclear.ui.main
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.view.View
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import com.base.scanqrclear.R import com.base.scanqrclear.R
...@@ -89,12 +90,18 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -89,12 +90,18 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
} }
} }
} }
if (adsConfigBean.homeShowNative) {
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
} else {
binding.flAd.visibility = View.GONE
}
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
private fun setWeather(){ private fun setWeather() {
val weatherEntity = WeatherUtils.getWeatherEntity() val weatherEntity = WeatherUtils.getWeatherEntity()
var icon:Int var icon: Int
var value = 22 var value = 22
weatherEntity?.let { weatherEntity?.let {
val subBean = weatherEntity.list[0] val subBean = weatherEntity.list[0]
......
...@@ -2,15 +2,18 @@ package com.base.scanqrclear.ui.main ...@@ -2,15 +2,18 @@ package com.base.scanqrclear.ui.main
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.view.View
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import com.base.scanqrclear.R import com.base.scanqrclear.R
import com.base.scanqrclear.ads.AdsMgr
import com.base.scanqrclear.base.BaseFragment import com.base.scanqrclear.base.BaseFragment
import com.base.scanqrclear.bean.AdScanBean import com.base.scanqrclear.bean.AdScanBean
import com.base.scanqrclear.bean.FunctionUIBean import com.base.scanqrclear.bean.FunctionUIBean
import com.base.scanqrclear.bean.ScanBean import com.base.scanqrclear.bean.ScanBean
import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean
import com.base.scanqrclear.databinding.FragmentHistoryBinding import com.base.scanqrclear.databinding.FragmentHistoryBinding
import com.base.scanqrclear.ui.contact.ContractCodeActivity import com.base.scanqrclear.ui.contact.ContractCodeActivity
import com.base.scanqrclear.ui.email.EmailCodeActivity import com.base.scanqrclear.ui.email.EmailCodeActivity
...@@ -42,6 +45,11 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind ...@@ -42,6 +45,11 @@ class HistoryFragment : BaseFragment<FragmentHistoryBinding>(FragmentHistoryBind
super.initView() super.initView()
binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight()) binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight())
if (adsConfigBean.historyShowNative) {
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
} else {
binding.flAd.visibility = View.GONE
}
} }
override fun onResumeOneShoot() { override fun onResumeOneShoot() {
......
...@@ -3,12 +3,15 @@ package com.base.scanqrclear.ui.main ...@@ -3,12 +3,15 @@ package com.base.scanqrclear.ui.main
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.view.View
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
import com.base.scanqrclear.BuildConfig import com.base.scanqrclear.BuildConfig
import com.base.scanqrclear.GlobalConfig import com.base.scanqrclear.GlobalConfig
import com.base.scanqrclear.R import com.base.scanqrclear.R
import com.base.scanqrclear.ads.AdsMgr
import com.base.scanqrclear.base.BaseFragment import com.base.scanqrclear.base.BaseFragment
import com.base.scanqrclear.bean.EmailUIBean import com.base.scanqrclear.bean.EmailUIBean
import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean
import com.base.scanqrclear.bean.config.ConfigBean import com.base.scanqrclear.bean.config.ConfigBean
import com.base.scanqrclear.databinding.FragmentSettingsBinding import com.base.scanqrclear.databinding.FragmentSettingsBinding
import com.base.scanqrclear.ui.language.LanguageActivity import com.base.scanqrclear.ui.language.LanguageActivity
...@@ -30,6 +33,12 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB ...@@ -30,6 +33,12 @@ class SettingsFragment : BaseFragment<FragmentSettingsBinding>(FragmentSettingsB
binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight()) binding.flTop.updatePadding(top = BarUtils.getStatusBarHeight())
binding.tvVersion.text = getString(R.string.version) + BuildConfig.VERSION_NAME binding.tvVersion.text = getString(R.string.version) + BuildConfig.VERSION_NAME
if (adsConfigBean.setShowNative) {
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_item)
} else {
binding.flAd.visibility = View.GONE
}
} }
override fun initListener() { override fun initListener() {
......
...@@ -18,28 +18,28 @@ ...@@ -18,28 +18,28 @@
android:id="@+id/tv_weather" android:id="@+id/tv_weather"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="4dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:gravity="center" android:layout_marginTop="4dp"
android:background="@drawable/bg_gradient_weather" android:background="@drawable/bg_gradient_weather"
android:gravity="center"
android:paddingHorizontal="14dp" android:paddingHorizontal="14dp"
android:text="22℃"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" android:textSize="15sp"
app:drawableStartCompat="@mipmap/x_qing" app:drawableStartCompat="@mipmap/x_qing"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/space" app:layout_constraintTop_toBottomOf="@id/space" />
android:text="22℃" />
<TextView <TextView
android:id="@+id/tv_zodiac" android:id="@+id/tv_zodiac"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_gradient_zodiac" android:background="@drawable/bg_gradient_zodiac"
android:paddingHorizontal="13dp"
android:drawablePadding="3dp" android:drawablePadding="3dp"
android:paddingVertical="8dp"
android:gravity="center" android:gravity="center"
android:layout_marginEnd="16dp" android:paddingHorizontal="13dp"
android:paddingVertical="8dp"
android:text="@string/zodiac" android:text="@string/zodiac"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="15sp" android:textSize="15sp"
...@@ -60,17 +60,17 @@ ...@@ -60,17 +60,17 @@
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_zodiac" /> app:layout_constraintTop_toBottomOf="@id/tv_zodiac" />
<!-- <ImageView--> <!-- <ImageView-->
<!-- android:id="@+id/ivVip"--> <!-- android:id="@+id/ivVip"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="20dp"--> <!-- android:layout_marginEnd="20dp"-->
<!-- android:src="@mipmap/h_vip"--> <!-- android:src="@mipmap/h_vip"-->
<!-- android:visibility="gone"--> <!-- android:visibility="gone"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/tvTitle"--> <!-- app:layout_constraintBottom_toBottomOf="@id/tvTitle"-->
<!-- app:layout_constraintEnd_toEndOf="parent"--> <!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="@id/tvTitle"--> <!-- app:layout_constraintTop_toTopOf="@id/tvTitle"-->
<!-- tools:ignore="ContentDescription" />--> <!-- tools:ignore="ContentDescription" />-->
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
...@@ -78,9 +78,44 @@ ...@@ -78,9 +78,44 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginHorizontal="10dp" android:layout_marginHorizontal="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toTopOf="@id/fl_ad"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_logo" /> app:layout_constraintTop_toBottomOf="@id/tv_logo" />
<com.base.scanqrclear.ads.NativeParentView
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:background="@drawable/bg_ecf6ff_20"
android:minHeight="133dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv">
<io.supercharge.shimmerlayout.ShimmerLayout
android:id="@+id/shimmerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
app:shimmer_angle="25"
app:shimmer_animation_duration="2000"
app:shimmer_auto_start="true"
app:shimmer_color="#33ffffff"
app:shimmer_mask_width="0.2">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/czhanweitu"
tools:ignore="ContentDescription,ImageContrastCheck" />
</io.supercharge.shimmerlayout.ShimmerLayout>
</com.base.scanqrclear.ads.NativeParentView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -166,11 +166,11 @@ ...@@ -166,11 +166,11 @@
</LinearLayout> </LinearLayout>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_marginTop="12dp"> android:layout_marginTop="12dp"
android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv" android:id="@+id/rv"
...@@ -207,5 +207,39 @@ ...@@ -207,5 +207,39 @@
</FrameLayout> </FrameLayout>
<com.base.scanqrclear.ads.NativeParentView
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:background="@drawable/bg_ecf6ff_20"
android:minHeight="133dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv">
<io.supercharge.shimmerlayout.ShimmerLayout
android:id="@+id/shimmerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
app:shimmer_angle="25"
app:shimmer_animation_duration="2000"
app:shimmer_auto_start="true"
app:shimmer_color="#33ffffff"
app:shimmer_mask_width="0.2">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/czhanweitu"
tools:ignore="ContentDescription,ImageContrastCheck" />
</io.supercharge.shimmerlayout.ShimmerLayout>
</com.base.scanqrclear.ads.NativeParentView>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -465,6 +465,40 @@ ...@@ -465,6 +465,40 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
<com.base.scanqrclear.ads.NativeParentView
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="8dp"
android:background="@drawable/bg_ecf6ff_20"
android:minHeight="133dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv">
<io.supercharge.shimmerlayout.ShimmerLayout
android:id="@+id/shimmerLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginHorizontal="16dp"
app:shimmer_angle="25"
app:shimmer_animation_duration="2000"
app:shimmer_auto_start="true"
app:shimmer_color="#33ffffff"
app:shimmer_mask_width="0.2">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/czhanweitu"
tools:ignore="ContentDescription,ImageContrastCheck" />
</io.supercharge.shimmerlayout.ShimmerLayout>
</com.base.scanqrclear.ads.NativeParentView>
<LinearLayout <LinearLayout
android:id="@+id/llApp" android:id="@+id/llApp"
android:layout_width="match_parent" android:layout_width="match_parent"
......
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