Merge branch 'master' into worktool

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "org.yameida.worktool"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 225
-        versionName "2.2.5"
+        versionCode 226
+        versionName "2.2.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/proguard-rules.pro

@@ -45,3 +45,8 @@
 #bean
 -dontwarn org.yameida.worktool.model.**
 -keep class org.yameida.worktool.model.**{*;}
+
+#talkingdata
+-dontwarn com.tendcloud.tenddata.**
+-keep class com.tendcloud.** {*;}
+-keep public class com.tendcloud.** {  public protected *;}

app/src/main/AndroidManifest.xml

@@ -60,6 +60,8 @@
                 android:resource="@xml/accessibility_service_config" />
         </service>
 
+        <meta-data android:name="TD_APP_ID" android:value="80E9C84E39904DAFB28562910FF7C86C" />
+        <meta-data android:name="TD_CHANNEL_ID" android:value="worktool_master" />
     </application>
 
 </manifest>

app/src/main/java/org/yameida/worktool/MyApplication.kt

@@ -3,6 +3,7 @@ package org.yameida.worktool
 import android.app.Application
 import com.blankj.utilcode.util.SPUtils
 import com.blankj.utilcode.util.Utils
+import com.tendcloud.tenddata.TalkingDataSDK
 import com.umeng.commonsdk.UMConfigure
 import org.yameida.worktool.config.GlobalException
 import update.UpdateAppUtils
@@ -19,6 +20,7 @@ class MyApplication : Application() {
         if (SPUtils.getInstance().getString("uminit", "1") == "1") {
             UMConfigure.init(this, "6284a3a3d024421570f97c3c", "main_channel", UMConfigure.DEVICE_TYPE_PHONE, "")
         }
+        TalkingDataSDK.init(this, "80E9C84E39904DAFB28562910FF7C86C", "worktool_master", SPUtils.getInstance().getString(Constant.LISTEN_CHANNEL_ID));
         //初始化自动更新
         UpdateAppUtils.init(this)
         //设置全局异常捕获重启

app/src/main/java/org/yameida/worktool/utils/WeworkRoomUtil.kt

@@ -104,10 +104,10 @@ object WeworkRoomUtil {
                 sleep(Constant.CHANGE_PAGE_INTERVAL)
                 //消息页搜索结果列表
                 val selectListView = findOneByClazz(getRoot(), Views.ListView)
-                val searchResult = AccessibilityUtil.findOneByText(
+                val regex = "^$trimTitle(-.*)?(…)?(\\(.*?\\))?" + if (needTrim) "" else "$"
+                val searchResult = AccessibilityUtil.findOneByTextRegex(
                     selectListView,
-                    trimTitle,
-                    exact = !needTrim,
+                    regex,
                     timeout = 2000,
                     root = false
                 )