diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1e73994..541901c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,6 +33,7 @@ android:name="org.yameida.worktool.activity.ListenActivity" android:label="@string/app_name" android:screenOrientation="portrait" + android:windowSoftInputMode="adjustUnspecified|stateHidden" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt index 0d0745c..e1dee01 100644 --- a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt +++ b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt @@ -1,8 +1,10 @@ package org.yameida.worktool.service +import android.graphics.Rect import android.view.accessibility.AccessibilityNodeInfo import com.blankj.utilcode.util.GsonUtils import com.blankj.utilcode.util.LogUtils +import com.blankj.utilcode.util.ScreenUtils import org.yameida.worktool.Constant import org.yameida.worktool.model.WeworkMessageBean import org.yameida.worktool.model.WeworkMessageListBean @@ -31,6 +33,14 @@ fun goHomeTab(title: String): Boolean { val list = getRoot().findAccessibilityNodeInfosByText("消息") for (item in list) { if (item.parent.parent.parent.childCount == 5) { + //处理侧边栏抽屉打开 + if (title == "消息") { + val rect = Rect() + item.getBoundsInScreen(rect) + if (rect.left > ScreenUtils.getScreenWidth() / 2) { + goHomeTab("工作台") + } + } atHome = true val tempList = getRoot().findAccessibilityNodeInfosByText(title) for (tempItem in tempList) { 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 cf08084..c1536a7 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkGetImpl.kt @@ -115,7 +115,7 @@ object WeworkGetImpl { val weworkMessageBean = WeworkMessageBean() weworkMessageBean.type = WeworkMessageBean.GET_GROUP_INFO val tvManagerFlag = - AccessibilityUtil.findOneByText(getRoot(), "由企业微信用户创建,可邀请微信用户进群", "该群由企业微信用户创建") + AccessibilityUtil.findOneByText(getRoot(), "微信用户创建") val button = AccessibilityUtil.findFrontNode(tvManagerFlag) val tvGroupName = AccessibilityUtil.findOneByClazz(button, Views.TextView) if (tvGroupName != null && tvGroupName.text != null) { 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 d7d8205..10ca3b8 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -485,7 +485,7 @@ object WeworkOperationImpl { private fun groupRename(groupName: String): Boolean { if (WeworkRoomUtil.intoGroupManager()) { val textView = - AccessibilityUtil.findOneByText(getRoot(), "由企业微信用户创建,可邀请微信用户进群", "该群由企业微信用户创建") + AccessibilityUtil.findOneByText(getRoot(), "微信用户创建") val button = AccessibilityUtil.findFrontNode(textView) if (button != null) { AccessibilityUtil.performClick(button) diff --git a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt index b0bb816..b17421c 100644 --- a/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt +++ b/app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt @@ -119,11 +119,7 @@ object WeworkRoomUtil { * @return true 成功进入群管理页 */ fun intoGroupManager(): Boolean { - if (AccessibilityUtil.findOneByText( - getRoot(), - "由企业微信用户创建,可邀请微信用户进群", - "该群由企业微信用户创建" - ) != null) { + if (AccessibilityUtil.findOneByText(getRoot(), "微信用户创建") != null) { return true } val list = findOneByClazz(getRoot(), Views.ListView)