From 2ae2ab0ff5e84fff97cd781e0310748dacf46bb4 Mon Sep 17 00:00:00 2001 From: tanjianbin <632190820@qq.com> Date: Mon, 11 May 2026 16:08:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8D=B0=E8=8A=82=E7=82=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E6=97=A0=E7=94=A8=E8=AE=BE=E7=BD=AE=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 移除左右悬浮菜单中的打印节点按钮及相关点击逻辑 2. 调整悬浮菜单截图按钮的布局间距与logo图标位置,修复XML文件末尾换行问题 3. 删除设置页面的检查更新、赞助、分享应用菜单项及对应代码 --- .../worktool/activity/SettingsActivity.kt | 34 ---- .../worktool/utils/FloatWindowHelper.kt | 29 --- app/src/main/res/layout/activity_settings.xml | 166 ------------------ .../floatwindow/DefaultFloatService.kt | 5 - .../src/main/res/layout/layout_menu_left.xml | 13 +- .../src/main/res/layout/layout_menu_right.xml | 13 +- 6 files changed, 6 insertions(+), 254 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt index f5d7cf5..9f6e24b 100644 --- a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt +++ b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt @@ -69,9 +69,6 @@ class SettingsActivity : AppCompatActivity() { }) rl_reply_strategy.setOnClickListener { showReplyStrategyDialog() } rl_log.setOnClickListener { showLogDialog() } - rl_update.setOnClickListener { showUpdateDialog() } - rl_donate.setOnClickListener { showDonateDialog() } - rl_share.setOnClickListener { showShareDialog() } rl_advance.setOnClickListener { SettingsAdvanceActivity.enterActivity(this) } freshOpenFlow() bt_open_flow.setOnClickListener { @@ -148,37 +145,6 @@ class SettingsActivity : AppCompatActivity() { } } - private fun showUpdateDialog() { - if (Constant.getMasterCheckUpdateUrl() == Constant.getCheckUpdateUrl()) { - HttpUtil.checkUpdate() - } else { - QMUIDialog.CheckableDialogBuilder(this) - .setTitle("检查新版本") - .addItems(arrayOf("检查当前Host新版本", "检查${getString(R.string.app_name)}官方新版本")) { dialog, which -> - dialog.dismiss() - if (which == 0) { - HttpUtil.checkUpdate() - } else { - HttpUtil.checkUpdate(Constant.getMasterCheckUpdateUrl()) - } - } - .create(R.style.QMUI_Dialog) - .show() - } - } - - private fun showDonateDialog() { - DonateUtil.zfbDonate(this) - } - - private fun showShareDialog() { - startActivity(Intent.createChooser(Intent().apply { - action = Intent.ACTION_SEND - type = ShareUtil.TEXT - putExtra(Intent.EXTRA_TEXT, "我发现一个非常好用的企业微信机器人程序,文档地址: https://worktool.apifox.cn/ APP下载地址是: https://cdn.asrtts.cn/uploads/worktool/apk/worktool-latest.apk") - }, "分享")) - } - private fun freshOpenFlow() { if (Settings.canDrawOverlays(Utils.getApp())) { if (FlowPermissionHelper.canBackgroundStart(Utils.getApp())) { diff --git a/app/src/main/java/org/yameida/worktool/utils/FloatWindowHelper.kt b/app/src/main/java/org/yameida/worktool/utils/FloatWindowHelper.kt index 3279614..01ac491 100644 --- a/app/src/main/java/org/yameida/worktool/utils/FloatWindowHelper.kt +++ b/app/src/main/java/org/yameida/worktool/utils/FloatWindowHelper.kt @@ -102,35 +102,6 @@ object FloatWindowHelper { service.onClickListener = object : OnClickListener { override fun onClick(v: View, event: Int) { when (event) { - 1 -> { - if (PermissionHelper.isAccessibilitySettingOn()) { - if (!isPause) { - ToastUtils.showShort("请先暂停Awin WorkTool主功能~") - return - } - thread { - val printNodeClazzTree = - AccessibilityUtil.printNodeClazzTree(getRoot(true)) - val df = SimpleDateFormat("MMdd_HHmmss") - val filePath = "${ - Utils.getApp().getExternalFilesDir("share") - }/${df.format(Date())}/${df.format(Date())}_printNode.txt" - val newFile = File(filePath) - val create = FileUtils.createFileByDeleteOldFile(newFile) - if (create && newFile.canWrite()) { - printNodeClazzTree.append("\n") - .append(WeworkController.weworkService.currentPackage) - .append("\n") - .append(WeworkController.weworkService.currentClass) - newFile.writeBytes(printNodeClazzTree.toString().toByteArray()) - LogUtils.i("打印节点文件存储本地成功 $filePath", "当前页面: ${WeworkController.weworkService.currentClass}") - } - ShareUtil.share("*/*", newFile) - } - } else { - ToastUtils.showShort("请先打开Awin WorkTool主功能~") - } - } 2 -> { if (PermissionHelper.isAccessibilitySettingOn()) { if (isPause) { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 6b9ba49..bdcbcda 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -473,172 +473,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/floatwindow/src/main/res/layout/layout_menu_right.xml b/floatwindow/src/main/res/layout/layout_menu_right.xml index e984e2d..c8009fb 100644 --- a/floatwindow/src/main/res/layout/layout_menu_right.xml +++ b/floatwindow/src/main/res/layout/layout_menu_right.xml @@ -15,18 +15,11 @@ android:layout_height="190dp" android:visibility="visible"> - - @@ -91,4 +84,4 @@ - \ No newline at end of file +