From ac8b45002c267498c9dcca88991c81248feba667 Mon Sep 17 00:00:00 2001 From: gallonyin Date: Wed, 24 May 2023 20:20:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=88=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=B0=83=E6=95=B4;=E5=BE=AE=E7=9B=98=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=87=8D=E8=AF=95;=E5=9B=BE=E7=89=87=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E7=8E=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/SettingsAdvanceActivity.kt | 3 ++- .../worktool/service/WeworkOperationImpl.kt | 24 ++++++++++++++----- .../org/yameida/worktool/utils/IWWAPIUtil.kt | 6 +++-- .../res/layout/activity_settings_advance.xml | 2 +- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/yameida/worktool/activity/SettingsAdvanceActivity.kt b/app/src/main/java/org/yameida/worktool/activity/SettingsAdvanceActivity.kt index 5c39a96..a960be5 100644 --- a/app/src/main/java/org/yameida/worktool/activity/SettingsAdvanceActivity.kt +++ b/app/src/main/java/org/yameida/worktool/activity/SettingsAdvanceActivity.kt @@ -203,7 +203,8 @@ class SettingsAdvanceActivity : AppCompatActivity() { val text = builder.editText.text if (text != null) { dialog.dismiss() - Constant.weworkMP = text.toString().trim() + val username = text.toString().trim() + Constant.weworkMP = if (username.endsWith("@app")) username else "$username@app" } else { ToastUtils.showLong("请勿为空！") } diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt index 9f0213e..edc750b 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -399,8 +399,10 @@ object WeworkOperationImpl { message: WeworkMessageBean, titleList: List, objectName: String, - extraText: String? = null + extraText: String? = null, + maxRetryCount: Int? = null ): Boolean { + val retryCount = maxRetryCount ?: 2 val startTime = System.currentTimeMillis() goHomeTab("工作台") val node = AccessibilityUtil.scrollAndFindByText(WeworkController.weworkService, getRoot(), "微盘", exact = true) @@ -443,21 +445,33 @@ object WeworkOperationImpl { return true } else { LogUtils.e("微盘文件转发失败: $objectName") + if (retryCount > 0) { + return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1) + } uploadCommandResult(message, ExecCallbackBean.ERROR_RELAY, "微盘文件转发失败: $objectName", startTime, listOf(), titleList) return false } } else { LogUtils.e("微盘未搜索到相关图片: $objectName") + if (retryCount > 0) { + return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1) + } uploadCommandResult(message, ExecCallbackBean.ERROR_TARGET, "微盘未搜索到相关图片: $objectName", startTime, listOf(), titleList) return false } } else { LogUtils.e("未找到微盘内搜索") + if (retryCount > 0) { + return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1) + } uploadCommandResult(message, ExecCallbackBean.ERROR_BUTTON, "未找到微盘内搜索", startTime, listOf(), titleList) return false } } else { LogUtils.e("未找到微盘") + if (retryCount > 0) { + return pushMicroDiskImage(message, titleList, objectName, extraText, retryCount - 1) + } uploadCommandResult(message, ExecCallbackBean.ERROR_BUTTON, "未找到微盘", startTime, listOf(), titleList) return false } @@ -533,8 +547,7 @@ object WeworkOperationImpl { receivedContent: String, originalContent: String, fileUrl: String, - extraText: String? = null, - maxRetryCount: Int? = null + extraText: String? = null ): Boolean { val startTime = System.currentTimeMillis() if (IWWAPIUtil.sendMicroProgram(fileUrl, originalContent, objectName, receivedContent)) { @@ -630,7 +643,7 @@ object WeworkOperationImpl { extraText: String? = null, maxRetryCount: Int? = null ): Boolean { - val retryCount = maxRetryCount ?: 1 + val retryCount = maxRetryCount ?: 2 val startTime = System.currentTimeMillis() if (!PermissionUtils.isGrantedDrawOverlays()) { LogUtils.e("未打开悬浮窗权限") @@ -781,8 +794,7 @@ object WeworkOperationImpl { receivedContent: String, originalContent: String, fileUrl: String, - extraText: String? = null, - maxRetryCount: Int? = null + extraText: String? = null ): Boolean { val startTime = System.currentTimeMillis() if (IWWAPIUtil.sendLink(fileUrl, originalContent, objectName, receivedContent)) { diff --git a/app/src/main/java/org/yameida/worktool/utils/IWWAPIUtil.kt b/app/src/main/java/org/yameida/worktool/utils/IWWAPIUtil.kt index 8dbbea9..1ffeb8e 100644 --- a/app/src/main/java/org/yameida/worktool/utils/IWWAPIUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/IWWAPIUtil.kt @@ -11,6 +11,7 @@ import com.tencent.wework.api.model.WWMediaLink import com.tencent.wework.api.model.WWMediaMiniProgram import org.yameida.worktool.Constant import org.yameida.worktool.R +import org.yameida.worktool.service.log import java.io.ByteArrayOutputStream import java.io.File import java.text.SimpleDateFormat @@ -52,9 +53,10 @@ object IWWAPIUtil { miniProgram.path = webpageUrl miniProgram.title = title + log("小程序: ${miniProgram.appId} ${miniProgram.username} ${miniProgram.title}") val bitmap = (Utils.getApp().getDrawable(R.mipmap.ic_launcher) as BitmapDrawable).bitmap val stream = ByteArrayOutputStream() - bitmap.compress(Bitmap.CompressFormat.JPEG, 0, stream) + bitmap.compress(Bitmap.CompressFormat.JPEG, 75, stream) miniProgram.hdImageData = stream.toByteArray() if (imageUrl != null) { LogUtils.i("下载开始 $imageUrl") @@ -73,7 +75,7 @@ object IWWAPIUtil { LogUtils.i("文件存储本地成功 $filePath") val bitmap = ImageUtils.bytes2Bitmap(File(filePath).readBytes()) val stream = ByteArrayOutputStream() - bitmap.compress(Bitmap.CompressFormat.JPEG, 0, stream) + bitmap.compress(Bitmap.CompressFormat.JPEG, 75, stream) miniProgram.hdImageData = stream.toByteArray() } else { LogUtils.e("文件存储本地失败 $filePath") diff --git a/app/src/main/res/layout/activity_settings_advance.xml b/app/src/main/res/layout/activity_settings_advance.xml index 386288d..373d0ed 100644 --- a/app/src/main/res/layout/activity_settings_advance.xml +++ b/app/src/main/res/layout/activity_settings_advance.xml @@ -490,7 +490,7 @@