Commit 11eb31a3 authored by 周文华's avatar 周文华

Merge remote-tracking branch 'origin/master'

parents 2a388ce7 cad068df
...@@ -107,7 +107,7 @@ object NotificationUiUtil { ...@@ -107,7 +107,7 @@ object NotificationUiUtil {
bigRemoteViews.setImageViewResource(R.id.ivIcon, R.mipmap.h_website) bigRemoteViews.setImageViewResource(R.id.ivIcon, R.mipmap.h_website)
bigRemoteViews.setTextViewText(R.id.tvDesc, "Try to create your own website QR cord and share it!") bigRemoteViews.setTextViewText(R.id.tvDesc, "Try to create your own website QR cord and share it!")
smallRemoteViews.setImageViewResource(R.id.ivIcon, R.mipmap.h_email) smallRemoteViews.setImageViewResource(R.id.ivIcon, R.mipmap.h_website)
smallRemoteViews.setTextViewText(R.id.tvTitle, "Create website QR") smallRemoteViews.setTextViewText(R.id.tvTitle, "Create website QR")
smallRemoteViews.setTextViewText(R.id.tvDesc, "Try to create your own website QR cord and share it!") smallRemoteViews.setTextViewText(R.id.tvDesc, "Try to create your own website QR cord and share it!")
...@@ -173,6 +173,14 @@ object NotificationUiUtil { ...@@ -173,6 +173,14 @@ object NotificationUiUtil {
ACTION_ID_CONSTELLATION -> { ACTION_ID_CONSTELLATION -> {
val smallRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_constellation_small) val smallRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_constellation_small)
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_constellation_big) val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_constellation_big)
val content = arrayOf(
"Your daily horoscope has the answers you seek. Click to discover!",
"Your horoscope opens new doors. Click to unlock your destiny!",
"Today's horoscope reveals life-changing secrets. Click to see!",
"Your daily horoscope maps your path to success. Click to find it!"
).random()
smallRemoteViews.setTextViewText(R.id.tv_desc, content)
bigRemoteViews.setTextViewText(R.id.tv_desc, content)
sendBean.bigRemoteViews = bigRemoteViews sendBean.bigRemoteViews = bigRemoteViews
sendBean.smallRemoteViews = smallRemoteViews sendBean.smallRemoteViews = smallRemoteViews
......
...@@ -5,6 +5,7 @@ import com.base.scanqrclear.BuildConfig ...@@ -5,6 +5,7 @@ import com.base.scanqrclear.BuildConfig
import com.base.scanqrclear.MyApplication import com.base.scanqrclear.MyApplication
import com.base.scanqrclear.R import com.base.scanqrclear.R
import com.base.scanqrclear.utils.KotlinExt.toFormatTime2 import com.base.scanqrclear.utils.KotlinExt.toFormatTime2
import com.base.scanqrclear.utils.PermissionUtils.checkStorePermission
import java.io.File import java.io.File
object WriteLogEx { object WriteLogEx {
...@@ -17,6 +18,7 @@ object WriteLogEx { ...@@ -17,6 +18,7 @@ object WriteLogEx {
fun writeLogFile(key: String, log: String) { fun writeLogFile(key: String, log: String) {
if (!BuildConfig.DEBUG) return if (!BuildConfig.DEBUG) return
if (!MyApplication.appContext.checkStorePermission()) return
val logName = key + "_" + System.currentTimeMillis().toFormatTime2() + ".txt" val logName = key + "_" + System.currentTimeMillis().toFormatTime2() + ".txt"
val logFile = File(logoDir, logName) val logFile = File(logoDir, logName)
logFile.createNewFile() logFile.createNewFile()
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_tittle_1" android:id="@+id/tv_desc"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Check out your luck today!" android:text="Check out your luck today!"
......
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Base.Theme.ScanQR" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Base.Theme.ScanQR" parent="Theme.Material3.Light.NoActionBar">
<!-- Customize your dark theme here. --> <!-- Customize your dark theme here. -->
<!-- <item name="colorPrimary">@color/my_dark_primary</item> --> <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
</style> </style>
......
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="Base.Theme.ScanQR" parent="Theme.Material3.DayNight.NoActionBar"> <style name="Base.Theme.ScanQR" parent="Theme.Material3.Light.NoActionBar">
</style> </style>
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
<style name="BottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog"> <style name="BottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
<item name="bottomSheetStyle">@style/BottomSheetStyleWrapper</item> <item name="bottomSheetStyle">@style/BottomSheetStyleWrapper</item>
</style> </style>
<style name="BottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal"> <style name="BottomSheetStyleWrapper" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@android:color/transparent</item> <item name="android:background">@android:color/transparent</item>
</style> </style>
......
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