From 0825af38a26c1d9020adb88da98520f0cd4d4808 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Tue, 30 Jul 2024 10:40:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AE=80=E8=BF=B0=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20TextView=E8=B5=B0=E9=A9=AC=E7=81=AF=E8=83=8C?= =?UTF-8?q?=E6=99=AF=20=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98=EF=BC=9A=201.?= =?UTF-8?q?=E4=BD=BF=E7=94=A8TextView=E5=AE=9E=E7=8E=B0=E8=B5=B0=E9=A9=AC?= =?UTF-8?q?=E7=81=AF=E6=95=88=E6=9E=9C=E9=9C=80=E8=A6=81TextView=E7=9A=84V?= =?UTF-8?q?alue=E5=80=BC=E4=B8=BA=E9=95=BF=E6=96=87=E6=9C=AC=202.=E8=B5=B0?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E6=98=AF=E5=90=A6=E6=98=AF=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E9=A6=96=E9=A1=B5=203.=E8=B5=B0?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E7=9A=84=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 4 +- .../res/drawable/shape_notice_background.xml | 6 +++ app/src/main/res/layout/new_main_activity.xml | 40 +++++++++++++------ app/src/main/res/values/strings.xml | 1 + 4 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/drawable/shape_notice_background.xml diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 7b9bd0c..106cb89 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -514,10 +514,10 @@ class NewMainActivity : BaseActivity() { private fun initMainPageHorseRaceLamp() { val mainPageHorseRaceLamp=findViewById(R.id.mainPageHorseRaceLamp) val notice = - MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_READ, "暂无新通知") + MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_READ, R.string.noNewNotifications.toString()) val noticeIsRead = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_DOWNLOAD_READ, "") - if(!notice.equals("暂无新通知")){ + if(notice != R.string.noNewNotifications.toString()){ mainPageHorseRaceLamp.text=notice mainPageHorseRaceLamp.requestFocus() mainPageHorseRaceLamp.marqueeRepeatLimit = Integer.MAX_VALUE diff --git a/app/src/main/res/drawable/shape_notice_background.xml b/app/src/main/res/drawable/shape_notice_background.xml new file mode 100644 index 0000000..332614d --- /dev/null +++ b/app/src/main/res/drawable/shape_notice_background.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/new_main_activity.xml b/app/src/main/res/layout/new_main_activity.xml index 3601449..fd2b581 100644 --- a/app/src/main/res/layout/new_main_activity.xml +++ b/app/src/main/res/layout/new_main_activity.xml @@ -69,21 +69,35 @@ - + android:layout_marginEnd="30dp" + android:layout_marginStart="30dp" + android:orientation="horizontal" + android:background="@drawable/shape_notice_background" + android:gravity="center" + > + + ]]> + 暂无新通知 \ No newline at end of file From e21004aa43bfec3d504dba49235c3e8776d2376e Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Tue, 30 Jul 2024 16:14:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AE=80=E8=BF=B0=EF=BC=9ATextView?= =?UTF-8?q?=E6=9D=A5=E5=AE=9E=E7=8E=B0=E7=9A=84=E8=B5=B0=E9=A9=AC=E7=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=20=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98=EF=BC=9A=201.?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E6=B6=88=E5=A4=B1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 18 +++++++++--------- app/src/main/res/values/strings.xml | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 106cb89..6483a26 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -371,6 +371,9 @@ class NewMainActivity : BaseActivity() { val lastNotice = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_READ, "") val data = it.data + if(data?.notice!=null){ + initMainPageHorseRaceLamp(data.notice) + } if (data?.notice != null && lastNotice != data.notice) { val notice = data.notice!! val dialog = DialogNotice(this@NewMainActivity, notice, data.downloadUrl) @@ -508,17 +511,12 @@ class NewMainActivity : BaseActivity() { startActivity(Intent(CommonUtils.getApp(), ActivityActivity::class.java)) } setSometion() - initMainPageHorseRaceLamp() } - private fun initMainPageHorseRaceLamp() { + private fun initMainPageHorseRaceLamp(noticeData:String) { val mainPageHorseRaceLamp=findViewById(R.id.mainPageHorseRaceLamp) - val notice = - MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_READ, R.string.noNewNotifications.toString()) - val noticeIsRead = - MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_DOWNLOAD_READ, "") - if(notice != R.string.noNewNotifications.toString()){ - mainPageHorseRaceLamp.text=notice + if(noticeData.length>20){ + mainPageHorseRaceLamp.text=noticeData mainPageHorseRaceLamp.requestFocus() mainPageHorseRaceLamp.marqueeRepeatLimit = Integer.MAX_VALUE mainPageHorseRaceLamp.isFocusable = true @@ -526,7 +524,9 @@ class NewMainActivity : BaseActivity() { mainPageHorseRaceLamp.setSingleLine() mainPageHorseRaceLamp.isFocusableInTouchMode = true mainPageHorseRaceLamp.setHorizontallyScrolling(true) - Log.d("noticeIsRead：：：：：：：==>${noticeIsRead}") + }else{ + val llNoticeBackground=findViewById(R.id.llNoticeBackground) + llNoticeBackground.visibility=View.GONE } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c45bf78..4f1b530 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -386,5 +386,4 @@

]]> - 暂无新通知 \ No newline at end of file From 1c408598cd0ebb6ccf6fdd08b7f8e65e10579024 Mon Sep 17 00:00:00 2001 From: level <1364007522@qq.com> Date: Tue, 30 Jul 2024 16:22:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 6483a26..fb3bc40 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -513,21 +513,21 @@ class NewMainActivity : BaseActivity() { setSometion() } - private fun initMainPageHorseRaceLamp(noticeData:String) { - val mainPageHorseRaceLamp=findViewById(R.id.mainPageHorseRaceLamp) - if(noticeData.length>20){ - mainPageHorseRaceLamp.text=noticeData - mainPageHorseRaceLamp.requestFocus() - mainPageHorseRaceLamp.marqueeRepeatLimit = Integer.MAX_VALUE - mainPageHorseRaceLamp.isFocusable = true - mainPageHorseRaceLamp.ellipsize = TextUtils.TruncateAt.MARQUEE - mainPageHorseRaceLamp.setSingleLine() - mainPageHorseRaceLamp.isFocusableInTouchMode = true - mainPageHorseRaceLamp.setHorizontallyScrolling(true) - }else{ - val llNoticeBackground=findViewById(R.id.llNoticeBackground) - llNoticeBackground.visibility=View.GONE - } + private fun initMainPageHorseRaceLamp(noticeData: String) { + val mainPageHorseRaceLamp = findViewById(R.id.mainPageHorseRaceLamp) + if (noticeData.length > 20) { + mainPageHorseRaceLamp.text = noticeData + mainPageHorseRaceLamp.requestFocus() + mainPageHorseRaceLamp.marqueeRepeatLimit = Integer.MAX_VALUE + mainPageHorseRaceLamp.isFocusable = true + mainPageHorseRaceLamp.ellipsize = TextUtils.TruncateAt.MARQUEE + mainPageHorseRaceLamp.setSingleLine() + mainPageHorseRaceLamp.isFocusableInTouchMode = true + mainPageHorseRaceLamp.setHorizontallyScrolling(true) + } else { + val llNoticeBackground = findViewById(R.id.llNoticeBackground) + llNoticeBackground.visibility = View.GONE + } }