Skip to content

A
appzxhy
Commit 38fdab88 authored by wanglei's avatar wanglei
Browse files
Options

[拆包]修改引导页

parent b688d501
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 55 deletions
app/src/main/java/com/base/appzxhy/business/ads/admob/AdmobEvent.kt
View file @ 38fdab88
......@@ -151,10 +151,11 @@ class AdmobOnPaidEventListener(
}
fun onPaidEvent2(ad: Any?, adValue: AdValue) {
coroutineScope.launch {
// coroutineScope.launch {
try {
val flag = eventAdRatio()
if (flag) {
val valueS = adValue.valueMicros > 0
if (flag && valueS) {
SolarEngineEvent.eventSolar(ad, adValue.valueMicros)
eventFireBase(adValue)
eventEvent(adValue)
......@@ -162,7 +163,7 @@ class AdmobOnPaidEventListener(
} catch (e: Exception) {
EventUtils.event("onPaidEvent_Error")
}
}
// }
}
fun eventAdRatio(): Boolean {
......@@ -217,7 +218,7 @@ class AdmobOnPaidEventListener(
//上报ad_price
Firebase.analytics.logEvent("ad_price", Bundle().apply {
putDouble("valueMicros", valueMicros / 1000000.0)
putDouble("valueMicros", currentImpressionRevenue)
})
//上报Ad_Impression_Revenue
......
app/src/main/java/com/base/appzxhy/ui/guide/GuideCleanActivity.kt
View file @ 38fdab88
......@@ -42,7 +42,7 @@ class GuideCleanActivity : BaseActivity<ActivityGuideCleanBinding>(ActivityGuide
finishToMain()
}
binding.llContinue.setOnClickListener {
binding.flContinue.setOnClickListener {
goToAc(GuideActivity::class.java)
finish()
}
......
app/src/main/java/com/base/appzxhy/ui/guide/GuideFragment.kt
View file @ 38fdab88
......@@ -21,21 +21,18 @@ class GuideFragment : BaseFragment<FragmentGuideBinding>(FragmentGuideBinding::i
0 -> {
binding.iv.setImageResource(R.drawable.yindaoye1)
binding.ivDian.setImageResource(R.drawable.dian_1)
binding.tvTitle.text = getString(R.string.guide_title_1)
binding.tvContent.text = getString(R.string.guide_tip_1)
}
1 -> {
binding.iv.setImageResource(R.drawable.yingdaoye2)
binding.ivDian.setImageResource(R.drawable.dian_2)
binding.tvTitle.text = getString(R.string.guide_title_2)
binding.tvContent.text = getString(R.string.guide_tip_2)
}
3 -> {
binding.iv.setImageResource(R.drawable.yingdaoye3)
binding.ivDian.setImageResource(R.drawable.dian_3)
binding.tvTitle.text = getString(R.string.guide_title_3)
binding.tvContent.text = getString(R.string.guide_tip_3)
binding.tvBtn.text = getString(R.string.get_started)
}
......
app/src/main/java/com/base/appzxhy/ui/guide/NativeFullFragment.kt
View file @ 38fdab88
import android.content.Intent
import com.base.appzxhy.R
import com.base.appzxhy.base.BaseFragment
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.FragmentNativeFullBinding
import com.base.appzxhy.ui.guide.GuideActivity
class NativeFullFragment : BaseFragment<FragmentNativeFullBinding>(FragmentNativeFullBinding::inflate) {
......@@ -16,4 +18,16 @@ class NativeFullFragment : BaseFragment<FragmentNativeFullBinding>(FragmentNativ
}
}
override fun initListener() {
super.initListener()
binding.ivClose.setOnClickListener {
val activity = requireActivity() as GuideActivity
activity.next(3)
}
}
}
\ No newline at end of file
app/src/main/res/drawable/bg_stroke_d9d9d9_10.xml 0 → 100644
View file @ 38fdab88
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke android:color="#D9D9D9" android:width="0.5dp"/>
<solid android:color="@color/white"/>
<corners android:radius="@dimen/dp_10"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_guide_clean.xml
View file @ 38fdab88
......@@ -15,7 +15,7 @@
android:gravity="center"
android:text="@string/which_type_do_you_want_to_clean"
android:textColor="#1A1A1A"
android:textSize="24sp"
android:textSize="@dimen/sp_24"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="HardcodedText" />
......@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f0fffa_16"
android:background="@drawable/bg_stroke_d9d9d9_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -75,7 +75,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f0fffa_16"
android:background="@drawable/bg_stroke_d9d9d9_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
......@@ -114,13 +114,13 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f0fffa_16"
android:background="@drawable/bg_stroke_d9d9d9_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_vertical"
android:layout_marginVertical="12dp"
android:layout_marginStart="20dp"
......@@ -153,13 +153,13 @@
android:layout_height="@dimen/dp_70"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="4dp"
android:background="@drawable/bg_f0fffa_16"
android:background="@drawable/bg_stroke_d9d9d9_10"
android:foreground="?attr/selectableItemBackground"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:src="@drawable/icon_document" />
......@@ -187,33 +187,37 @@
</LinearLayout>
<LinearLayout
android:id="@+id/llContinue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
<FrameLayout
android:id="@+id/flContinue"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_54"
android:layout_marginHorizontal="@dimen/dp_70"
android:layout_marginBottom="@dimen/dp_30"
android:background="@drawable/bg_splash_button"
android:orientation="horizontal"
android:padding="@dimen/dp_8"
app:layout_constraintBottom_toTopOf="@id/flAd"
app:layout_constraintEnd_toEndOf="parent">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll"
app:layout_constraintVertical_bias="0.4">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/continue_"
android:textColor="@color/colorPrimary"
android:textSize="17sp"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical|end"
android:src="@drawable/jiangtou_3" />
android:src="@drawable/jiangtou_w" />
</LinearLayout>
</FrameLayout>
<com.base.appzxhy.business.ads.NativeParentView
android:id="@+id/flAd"
......
app/src/main/res/layout/fragment_guide.xml
View file @ 38fdab88
......@@ -41,14 +41,6 @@
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/iv">
<TextView
android:id="@+id/tvTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/one_tap_clean"
android:textColor="#111111"
android:textSize="@dimen/sp_24"
android:textStyle="bold" />
<TextView
android:id="@+id/tvContent"
......@@ -63,10 +55,12 @@
</LinearLayout>
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_30"
android:gravity="center_horizontal"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/ll">
......@@ -74,24 +68,22 @@
android:id="@+id/ivDian"
android:layout_width="@dimen/dp_88"
android:layout_height="@dimen/dp_15"
android:layout_gravity="center_vertical|start"
android:layout_marginStart="@dimen/dp_16"
app:srcCompat="@drawable/dian_1" />
<TextView
android:id="@+id/tvBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="@dimen/dp_16"
android:layout_width="@dimen/dp_180"
android:layout_height="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_30"
android:background="@drawable/bg_splash_button"
android:gravity="center"
android:padding="@dimen/dp_8"
android:text="@string/next"
android:textColor="#2DD29E"
android:textColor="@color/white"
android:textSize="@dimen/sp_22"
android:textStyle="bold" />
</FrameLayout>
</LinearLayout>
<com.base.appzxhy.business.ads.NativeParentView
......
app/src/main/res/layout/fragment_native_full.xml
View file @ 38fdab88
......@@ -4,6 +4,7 @@
android:layout_height="match_parent"
android:background="#D9D9D9">
<com.base.appzxhy.business.ads.NativeParentView
android:id="@+id/flAd"
android:layout_width="match_parent"
......@@ -17,5 +18,14 @@
</com.base.appzxhy.business.ads.NativeParentView>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivClose"
android:layout_width="@dimen/dp_35"
android:layout_height="@dimen/dp_35"
android:layout_gravity="end"
android:layout_marginTop="@dimen/dp_80"
android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/icon_fork_ad" />
</FrameLayout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 38fdab88
......@@ -69,4 +69,5 @@
<dimen name="dp_220">220dp</dimen>
<dimen name="dp_250">250dp</dimen>
<dimen name="dp_28">28dp</dimen>
<dimen name="dp_54">54dp</dimen>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 38fdab88
......@@ -132,17 +132,17 @@ Please rest assured that we will handle your information in strict accordance wi
<string name="guide_title_1">One - Tap Clean</string>
<string name="guide_tip_1">
Banish junk, boost speed. Free up memory with a single tap.
Clean up clutter to unlock more space and keep your phone running smoothly.
</string>
<string name="guide_title_2">Clear storage saves space</string>
<string name="guide_tip_2">
Clean photos,videos,and audio files to save space and keep your phone tidy.
Quickly clear junk files and free up valuable storage with just a few taps.
</string>
<string name="guide_title_3">Virus Shield</string>
<string name="guide_tip_3">
Powerful scan, total protection. Keep you phone safe.
Clean photos,videos,and audio files to save space and keep your phone tidy.
</string>
......
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