diff --git a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java index 9b7d6bc..31b7a98 100644 --- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java +++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java @@ -247,6 +247,8 @@ public class WeworkMessageBean { public String markExtra; //备注标签(推荐) public List tagList; + //是否是新好友 + public Boolean newFriend; } @Override diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt index f593e97..5abd5bb 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkLoopImpl.kt @@ -54,18 +54,20 @@ object WeworkLoopImpl { if (item.parent.childCount > 1) { LogUtils.d("通讯录有红点") AccessibilityUtil.performClick(item) - val addButton = AccessibilityUtil.findOneByText(getRoot(), "添加客户") + val addButton = AccessibilityUtil.findOneByText(getRoot(), "添加") val backNode = AccessibilityUtil.findBackNode(addButton) if (backNode?.className == Views.TextView) { LogUtils.d("有待添加客户") AccessibilityUtil.performClick(backNode) - AccessibilityUtil.findTextAndClick(getRoot(), "新的客户") + AccessibilityUtil.findTextAndClick(getRoot(), "新的") + sleep(Constant.POP_WINDOW_INTERVAL) var retry = 5 while (retry-- > 0) { val checkButton = AccessibilityUtil.findOneByText(getRoot(), "查看", timeout = 2000) if (checkButton == null) { break } else { + AccessibilityUtil.performClick(checkButton) sleep(Constant.CHANGE_PAGE_INTERVAL) val nameList = passFriendRequest() if (nameList.isEmpty()) @@ -170,7 +172,10 @@ object WeworkLoopImpl { } else { val weworkMessageBean = WeworkMessageBean() weworkMessageBean.type = WeworkMessageBean.GET_FRIEND_INFO - weworkMessageBean.nameList = arrayListOf(tvNick.text.toString()) + weworkMessageBean.friend = WeworkMessageBean.Friend().apply { + name = tvNick.text.toString() + newFriend = true + } WeworkController.weworkService.webSocketManager.send(weworkMessageBean) nameList.add(tvNick.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 f6f391e..015bd03 100644 --- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt +++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt @@ -432,7 +432,8 @@ object WeworkOperationImpl { sleep(Constant.POP_WINDOW_INTERVAL) val listViewList = AccessibilityUtil.findAllByClazz(getRoot(), Views.ListView) if (!listViewList.isNullOrEmpty()) { - if (AccessibilityUtil.findTextAndClick(listViewList.last(), "添加客户")) { +// if (AccessibilityUtil.findTextAndClick(listViewList.last(), "添加客户")) { + if (AccessibilityUtil.findTextAndClick(listViewList.last(), "添加")) { AccessibilityUtil.findTextAndClick(getRoot(), "搜索手机号添加") AccessibilityUtil.findTextInput(getRoot(), friend.phone.trim()) if (AccessibilityUtil.findTextAndClick(getRoot(), "网络查找手机")) {