From f05ab9e992b43f314f28f143e08b20e20763062d Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Mon, 4 Sep 2023 22:07:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/org/yameida/worktool/Constant.kt           | 1 +
 .../main/java/org/yameida/worktool/service/WeworkGetImpl.kt  | 2 ++
 .../java/org/yameida/worktool/service/WeworkOperationImpl.kt | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt
index 112a33a..e2814eb 100644
--- a/app/src/main/java/org/yameida/worktool/Constant.kt
+++ b/app/src/main/java/org/yameida/worktool/Constant.kt
@@ -18,6 +18,7 @@ object Constant {
 
     var version = Int.MAX_VALUE
     var myName = ""
+    var myCorp = ""
     //    var regTrimTitle = "(…$)|(-.*$)|(\\(.*?\\)$)".toRegex()
     var regMail = "\\S+@\\S+\\.\\S+".toRegex()
     var regTrimTitle = "(…$)".toRegex()
diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
index 761bf25..8b3fd11 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt
@@ -242,6 +242,7 @@ object WeworkGetImpl {
                     }
                 }
                 Constant.myName = nickname
+                Constant.myCorp = corp ?: ""
                 LogUtils.d("我的昵称: ${Constant.myName}")
                 val weworkMessageBean = WeworkMessageBean()
                 weworkMessageBean.type = WeworkMessageBean.GET_MY_INFO
@@ -285,6 +286,7 @@ object WeworkGetImpl {
                 }
                 if (firstText == "所在企业" && myInfo.corporation == null) {
                     myInfo.corporation = textViewList[1].text?.toString() ?: ""
+                    Constant.myCorp = myInfo.corporation
                 }
                 if (firstText == "手机" && myInfo.phone == null) {
                     myInfo.phone = textViewList[1].text?.toString() ?: ""
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 5f3eb17..ca53869 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -1790,6 +1790,11 @@ object WeworkOperationImpl {
     fun switchCorp(message: WeworkMessageBean, objectName: String): Boolean {
         val startTime = System.currentTimeMillis()
         goHomeTab("消息")
+        if (Constant.myCorp == objectName) {
+            LogUtils.d("当前已在目标企业: $objectName")
+            uploadCommandResult(message, ExecCallbackBean.SUCCESS, "切换企业成功: $objectName", startTime, listOf(objectName), listOf())
+            return true
+        }
         val firstTv = AccessibilityUtil.findAllByClazz(getRoot(), Views.TextView)
             .firstOrNull { it.text == null }
         AccessibilityUtil.performClick(firstTv, retry = false)