Commit 4ad1f495 authored by wanglei's avatar wanglei

[拆包]图标

parent 32f24cfc
...@@ -16,7 +16,7 @@ class SplashViewModel : ViewModel() { ...@@ -16,7 +16,7 @@ class SplashViewModel : ViewModel() {
private var countdownJob: Job? = null private var countdownJob: Job? = null
private var startTime: Long = 0 private var startTime: Long = 0
val totalTimeMs = (AdConfigBean.adsConfigBean.openAdLoading + 2) * 1000L // 倒计时总时长 val totalTimeMs = (AdConfigBean.adsConfigBean.openAdLoading + 1) * 1000L // 倒计时总时长
private val checkIntervalMs = 100L // 检查间隔(100毫秒) private val checkIntervalMs = 100L // 检查间隔(100毫秒)
private var countdownOver: Boolean = false private var countdownOver: Boolean = false
...@@ -42,7 +42,7 @@ class SplashViewModel : ViewModel() { ...@@ -42,7 +42,7 @@ class SplashViewModel : ViewModel() {
break break
} else { } else {
val percent = elapsed * 100f / totalTimeMs val percent = elapsed * 100f / totalTimeMs
if (percent > 90) { if (percent > 95) {
async(Dispatchers.Main) { onTick?.invoke(totalTimeMs, totalTimeMs, 100f) } async(Dispatchers.Main) { onTick?.invoke(totalTimeMs, totalTimeMs, 100f) }
break break
} else { } else {
......
...@@ -3,12 +3,15 @@ ...@@ -3,12 +3,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="@color/transparent">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_10"
android:scaleType="fitXY" android:scaleType="fitXY"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/tanchuang"> app:srcCompat="@drawable/tanchuang">
</androidx.appcompat.widget.AppCompatImageView> </androidx.appcompat.widget.AppCompatImageView>
...@@ -24,6 +27,14 @@ ...@@ -24,6 +27,14 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icon_close_pop" /> app:srcCompat="@drawable/icon_close_pop" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icon_lingdang" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -37,7 +48,7 @@ ...@@ -37,7 +48,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40" android:layout_marginTop="@dimen/dp_40"
android:text="@string/don_t_miss_important_tips" android:text="@string/turn_on_notification"
android:textColor="#1A1A1A" android:textColor="#1A1A1A"
android:textSize="@dimen/sp_24" android:textSize="@dimen/sp_24"
android:textStyle="bold" /> android:textStyle="bold" />
......
...@@ -170,6 +170,7 @@ Please rest assured that we will handle your information in strict accordance wi ...@@ -170,6 +170,7 @@ Please rest assured that we will handle your information in strict accordance wi
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
<string name="scan_completed">Scan Completed</string> <string name="scan_completed">Scan Completed</string>
<string name="turn_on_notification">Turn on notification</string>
</resources> </resources>
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