diff --git a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt index e1f24ed1..64e2e380 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/activity/MainActivity.kt @@ -143,8 +143,8 @@ class MainActivity : BaseActivity(), } private fun initData() { - //仅当有WIFI网络时自动检查更新/获取提示 - if (NetworkUtils.isWifi() && NetworkUtils.isHaveInternet()) { + //仅当开启自动检查且有网络时自动检查更新/获取提示 + if (SettingUtils.autoCheckUpdate && NetworkUtils.isHaveInternet()) { showTips(this) XUpdateInit.checkUpdate(this, false) } diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt index eb8e1451..b533bd67 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/AboutFragment.kt @@ -16,6 +16,7 @@ import com.idormy.sms.forwarder.utils.CommonUtils.Companion.previewMarkdown import com.idormy.sms.forwarder.utils.CommonUtils.Companion.previewPicture import com.idormy.sms.forwarder.utils.HistoryUtils import com.idormy.sms.forwarder.utils.HttpServerUtils +import com.idormy.sms.forwarder.utils.SettingUtils import com.idormy.sms.forwarder.utils.XToastUtils import com.idormy.sms.forwarder.utils.sdkinit.XUpdateInit import com.xuexiang.xaop.annotation.SingleClick @@ -29,7 +30,8 @@ import com.xuexiang.xutil.file.FileUtils import frpclib.Frpclib import java.io.File import java.text.SimpleDateFormat -import java.util.* +import java.util.Date +import java.util.Locale @Page(name = "关于软件") class AboutFragment : BaseFragment(), SuperTextView.OnSuperTextViewClickListener { @@ -62,6 +64,11 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup val dateFormat = SimpleDateFormat("yyyy", Locale.CHINA) val currentYear = dateFormat.format(Date()) binding!!.copyright.text = java.lang.String.format(resources.getString(R.string.about_copyright), currentYear) + + binding!!.scbAutoCheckUpdate.isChecked = SettingUtils.autoCheckUpdate + binding!!.scbAutoCheckUpdate.setOnCheckedChangeListener { _, isChecked -> + SettingUtils.autoCheckUpdate = isChecked + } } override fun initListeners() { @@ -117,6 +124,7 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup R.id.menu_donation -> { previewMarkdown(this, getString(R.string.about_item_donation_link), getString(R.string.url_donation_link), false) } + R.id.menu_wechat_miniprogram -> { if (HttpServerUtils.safetyMeasures != 3) { XToastUtils.error("微信小程序只支持SM4加密传输!请前往主动控制·服务端修改安全措施!") @@ -124,18 +132,23 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup } previewPicture(this, getString(R.string.url_wechat_miniprogram), null) } + R.id.menu_wecom_group -> { previewPicture(this, getString(R.string.url_wework_group), null) } + R.id.menu_dingtalk_group -> { previewPicture(this, getString(R.string.url_dingtalk_group), null) } + R.id.menu_qq_channel -> { AgentWebActivity.goWeb(context, getString(R.string.url_qq_channel)) } + R.id.menu_user_protocol -> { gotoProtocol(this, isPrivacy = false, isImmersive = false) } + R.id.menu_privacy_protocol -> { gotoProtocol(this, isPrivacy = true, isImmersive = false) } diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt index 0d39b749..3756b11e 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/Constants.kt @@ -28,6 +28,7 @@ object TaskWorker { } //初始化相关 +const val AUTO_CHECK_UPDATE = "auto_check_update" const val IS_FIRST_OPEN_KEY = "is_first_open_key" const val IS_AGREE_PRIVACY_KEY = "is_agree_privacy_key" diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt index c51b3cab..df57f851 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/utils/SettingUtils.kt @@ -7,8 +7,8 @@ import com.xuexiang.xui.utils.ResUtils.getString class SettingUtils private constructor() { companion object { - //是否是第一次启动 - //var isFirstOpen: Boolean by SharedPreference(IS_FIRST_OPEN_KEY, true) + //是否启动时检查更新 + var autoCheckUpdate: Boolean by SharedPreference(AUTO_CHECK_UPDATE, true) //是否同意隐私政策 var isAgreePrivacy: Boolean by SharedPreference(IS_AGREE_PRIVACY_KEY, false) diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index b10abfc9..5e377c75 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -30,21 +30,44 @@ android:layout_marginTop="15dp" app:sLeftTextString="@string/about_app_version"> - + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 5070c964..66fa781c 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -706,6 +706,7 @@ Please confirm that the app permission [Get mobile phone information] is [Always allow] The SIM card information in the card slot %s has not been obtained Add + Auto check Check update Clear cache Delete Frpc diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41b7ab88..0e588946 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -707,6 +707,7 @@ 无法获取卡槽信息,请确认应用权限【获取手机信息】为【始终允许】 未获取到卡槽%s中的SIM卡信息 添加 + 启动时检查 检查更新 清理缓存 删除动态库