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..fb3bc40 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,26 +511,23 @@ class NewMainActivity : BaseActivity() { startActivity(Intent(CommonUtils.getApp(), ActivityActivity::class.java)) } setSometion() - initMainPageHorseRaceLamp() } - private fun initMainPageHorseRaceLamp() { - val mainPageHorseRaceLamp=findViewById(R.id.mainPageHorseRaceLamp) - val notice = - MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_READ, "暂无新通知") - val noticeIsRead = - MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_NOTICE_DOWNLOAD_READ, "") - if(!notice.equals("暂无新通知")){ - mainPageHorseRaceLamp.text=notice - mainPageHorseRaceLamp.requestFocus() - mainPageHorseRaceLamp.marqueeRepeatLimit = Integer.MAX_VALUE - mainPageHorseRaceLamp.isFocusable = true - mainPageHorseRaceLamp.ellipsize = TextUtils.TruncateAt.MARQUEE - mainPageHorseRaceLamp.setSingleLine() - mainPageHorseRaceLamp.isFocusableInTouchMode = true - mainPageHorseRaceLamp.setHorizontallyScrolling(true) - Log.d("noticeIsRead:::::::==>${noticeIsRead}") - } + 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 + } } 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" + > + +