From d2870379daf151066ad8c5f6bbbca0fd9abd1cd5 Mon Sep 17 00:00:00 2001 From: why Date: Sat, 30 Mar 2024 14:42:51 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E2=80=9C=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E6=88=91=E4=BB=AC=E2=80=9D=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mredrock/cyxbs/common/config/Config.kt | 3 +++ .../cyxbs/mine/page/about/AboutActivity.kt | 10 +++++++--- .../main/res/layout/mine_activity_about.xml | 18 +++++++++++++++--- module_mine/src/main/res/values/strings.xml | 1 + 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/lib_common/src/main/java/com/mredrock/cyxbs/common/config/Config.kt b/lib_common/src/main/java/com/mredrock/cyxbs/common/config/Config.kt index 285312332..8fbe964c9 100644 --- a/lib_common/src/main/java/com/mredrock/cyxbs/common/config/Config.kt +++ b/lib_common/src/main/java/com/mredrock/cyxbs/common/config/Config.kt @@ -35,6 +35,9 @@ const val SP_SIGN_REMIND = "signRemind" const val APP_WEBSITE = "https://m.app.redrock.team" +// 工信部网站 +const val ICP_WEBSITE = "https://beian.miit.gov.cn/" + const val ABOUT_US_WEBSITE = "https://redrock.team" //小控件课表及事务 diff --git a/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/about/AboutActivity.kt b/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/about/AboutActivity.kt index 321b320c1..c96a0164f 100644 --- a/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/about/AboutActivity.kt +++ b/module_mine/src/main/java/com/mredrock/cyxbs/mine/page/about/AboutActivity.kt @@ -25,11 +25,13 @@ import com.mredrock.cyxbs.api.update.BuildConfig import com.mredrock.cyxbs.api.update.IAppUpdateService import com.mredrock.cyxbs.common.config.APP_WEBSITE import com.mredrock.cyxbs.common.config.DIR_LOG +import com.mredrock.cyxbs.common.config.ICP_WEBSITE import com.mredrock.cyxbs.common.config.OKHTTP_LOCAL_LOG import com.mredrock.cyxbs.common.service.ServiceManager import com.mredrock.cyxbs.common.ui.BaseViewModelActivity import com.mredrock.cyxbs.common.utils.extensions.toast import com.mredrock.cyxbs.common.utils.getAppVersionName +import com.mredrock.cyxbs.lib.utils.extensions.setOnSingleClickListener import com.mredrock.cyxbs.mine.R import com.mredrock.cyxbs.mine.util.ui.DebugUpdateDialog import com.mredrock.cyxbs.mine.util.ui.DynamicRVAdapter @@ -45,6 +47,7 @@ class AboutActivity : BaseViewModelActivity() { private val mine_about_tv_copy_right by R.id.mine_about_tv_copy_right.view() private val mine_about_version by R.id.mine_about_version.view() private val mine_about_tv_already_up_to_date by R.id.mine_about_tv_already_up_to_date.view() + private val icpInfoTv by R.id.mine_about_tv_icp_info.view() private val mTvProtocol by R.id.mine_about_user_protocol.view() @@ -72,7 +75,8 @@ class AboutActivity : BaseViewModelActivity() { setAppVersionName() bindUpdate() - mine_about_rl_website.setOnClickListener { clickWebsite() } + mine_about_rl_website.setOnClickListener { clickWebsite(APP_WEBSITE) } + icpInfoTv.setOnSingleClickListener { clickWebsite(ICP_WEBSITE) } mine_about_rl_share.setOnClickListener { onShareClick() } mine_about_rl_update.setOnClickListener { clickUpdate() } mine_about_rl_function.setOnClickListener { clickFeatureIntroduction() } @@ -169,8 +173,8 @@ class AboutActivity : BaseViewModelActivity() { } } - private fun clickWebsite() { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(APP_WEBSITE)) + private fun clickWebsite(url: String) { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) startActivity(intent) } diff --git a/module_mine/src/main/res/layout/mine_activity_about.xml b/module_mine/src/main/res/layout/mine_activity_about.xml index 018f85964..91e0c5387 100644 --- a/module_mine/src/main/res/layout/mine_activity_about.xml +++ b/module_mine/src/main/res/layout/mine_activity_about.xml @@ -63,7 +63,7 @@ android:id="@+id/mine_about_press" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" + android:layout_marginBottom="5dp" android:text="@string/mine_about_1" android:textColor="@color/common_about_colors_declared_below" android:textSize="11sp" @@ -75,14 +75,26 @@ android:id="@+id/mine_about_tv_copy_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="30dp" + android:layout_marginBottom="5dp" android:text="@string/mine_about_copyright" android:textColor="@color/common_about_colors_declared_below" android:textSize="11sp" - app:layout_constraintBottom_toBottomOf="@+id/mine_about_iv" + app:layout_constraintBottom_toTopOf="@+id/mine_about_tv_icp_info" app:layout_constraintEnd_toEndOf="@+id/mine_about_press" app:layout_constraintStart_toStartOf="@+id/mine_about_press" /> + + 版本更新 红岩网校工作站出品 CopyRight © 2015–2021 All Rights Reserved + ICP备案号: 渝ICP备17002788号-7A store back