diff --git a/app/libs/frpclib.aar b/app/libs/frpclib.aar index a3eaa0e8..d7564c78 100644 Binary files a/app/libs/frpclib.aar and b/app/libs/frpclib.aar differ 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 9446787a..52fe1c49 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 @@ -354,7 +354,7 @@ class MainActivity : BaseActivity(), val downloadUrl = "https://xupdate.bms.ink/uploads/$FRPC_LIB_VERSION/$cpuAbi/libgojni.so" val mContext = this val dialog: MaterialDialog = MaterialDialog.Builder(mContext) - .title(getString(R.string.frpclib_download_title)) + .title(String.format(getString(R.string.frpclib_download_title), FRPC_LIB_VERSION)) .content(getString(R.string.frpclib_download_content)) .contentGravity(GravityEnum.CENTER) .progress(false, 0, true) 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 7c85ecdb..961f8b5b 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 @@ -1,6 +1,8 @@ package com.idormy.sms.forwarder.fragment +import android.content.Intent import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import com.idormy.sms.forwarder.R import com.idormy.sms.forwarder.core.BaseFragment @@ -18,6 +20,9 @@ import com.xuexiang.xpage.annotation.Page import com.xuexiang.xui.widget.actionbar.TitleBar import com.xuexiang.xui.widget.textview.supertextview.SuperTextView import com.xuexiang.xutil.app.AppUtils +import com.xuexiang.xutil.file.FileUtils +import frpclib.Frpclib +import java.io.File import java.text.SimpleDateFormat import java.util.* @@ -44,6 +49,11 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup binding!!.menuVersion.setLeftString(String.format(resources.getString(R.string.about_app_version), AppUtils.getAppVersionName())) binding!!.menuCache.setLeftString(String.format(resources.getString(R.string.about_cache_size), CacheUtils.getTotalCacheSize(requireContext()))) + if (FileUtils.isFileExists(context?.filesDir?.absolutePath + "/libs/libgojni.so")) { + binding!!.menuFrpc.setLeftString(String.format(resources.getString(R.string.about_frpc_version), Frpclib.getVersion())) + binding!!.menuFrpc.visibility = View.VISIBLE + } + 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) @@ -59,6 +69,21 @@ class AboutFragment : BaseFragment(), SuperTextView.OnSup XToastUtils.success(R.string.about_cache_purged) binding!!.menuCache.setLeftString(String.format(resources.getString(R.string.about_cache_size), CacheUtils.getTotalCacheSize(requireContext()))) } + binding!!.btnFrpc.setOnClickListener { + try { + val soFile = File(context?.filesDir?.absolutePath + "/libs/libgojni.so") + if (soFile.exists()) soFile.delete() + XToastUtils.success(R.string.about_frpc_deleted) + + val intent: Intent? = context?.packageManager?.getLaunchIntentForPackage(context?.packageName.toString()) + intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) + startActivity(intent) + android.os.Process.killProcess(android.os.Process.myPid()) //杀掉以前进程 + } catch (e: Exception) { + e.printStackTrace() + XToastUtils.error(e.message.toString()) + } + } binding!!.btnGithub.setOnClickListener { AgentWebActivity.goWeb(context, getString(R.string.url_project_github)) } 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 eab2191d..663fa3af 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 @@ -173,7 +173,7 @@ const val FRONT_CHANNEL_ID = "com.idormy.sms.forwarder" const val FRONT_CHANNEL_NAME = "SmsForwarder Foreground Service" //Frp内网穿透 -const val FRPC_LIB_VERSION = "0.42.0" +const val FRPC_LIB_VERSION = "0.43.0" const val EVENT_FRPC_UPDATE_CONFIG = "EVENT_FRPC_UPDATE_CONFIG" const val EVENT_FRPC_DELETE_CONFIG = "EVENT_FRPC_DELETE_CONFIG" const val EVENT_FRPC_RUNNING_ERROR = "EVENT_FRPC_RUNNING_ERROR" diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index fc104922..d8ef44ba 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -69,6 +69,30 @@ + + + + + + App Version: %s Cache Size: %s + Frpc Version:%s Cache cleared + Frpc Deleted, App restarting © %1$s PPPSCN All rights reserved. OpenSource Repo GitHub @@ -629,6 +631,7 @@ Add Check update Clear cache + Delete Frpc Channel Name/Status Send Channel/Status @@ -699,7 +702,7 @@ Request succeeded Request failed: No SMS sending permission - Missing FrpcLib + Missing FrpcLib v%s Downloading, please wait… FrpcLib version mismatch, download again Page not found! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67889f67..f414a4ce 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,9 @@ 软件版本:%s 缓存大小:%s + Frpc版本:%s 已清理缓存 + 已删除动态库,重启APP中… © %1$s PPPSCN All rights reserved. 开源仓库 GitHub @@ -630,6 +632,7 @@ 添加 检查更新 清理缓存 + 删除动态库 通道名称/状态 发送通道/状态 @@ -700,7 +703,7 @@ 请求成功 请求失败: 没有短信发送权限 - 缺少 FrpcLib 动态库 + 缺少 FrpcLib v%s 动态库 正在下载中,请稍后…… FrpcLib 版本不匹配,重新下载 页面未找到!