fix

UtilsApplication/.idea/other.xml

@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP5552L1" />
+          <option name="id" value="OP5552L1" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2415" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="OPPO" />
@@ -58,6 +69,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -91,6 +113,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="1272" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="austin" />
+          <option name="id" value="austin" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g 5G (2022)" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -256,6 +289,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gta9pwifi" />
+          <option name="id" value="gta9pwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X210" />
+          <option name="screenDensity" value="240" />
+          <option name="screenX" value="1200" />
+          <option name="screenY" value="1920" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7xllite" />
+          <option name="id" value="gts7xllite" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T738U" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -267,6 +322,28 @@
           <option name="screenX" value="1848" />
           <option name="screenY" value="2960" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8wifi" />
+          <option name="id" value="gts8wifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8" />
+          <option name="screenDensity" value="274" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9fe" />
+          <option name="id" value="gts9fe" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S9 FE 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="2304" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />
@@ -322,6 +399,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="o1q" />
+          <option name="id" value="o1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21" />
+          <option name="screenDensity" value="421" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="google" />
@@ -378,6 +466,17 @@
           <option name="screenY" value="384" />
           <option name="type" value="WEAR_OS" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r11q" />
+          <option name="id" value="r11q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S711U" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -400,6 +499,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="t2q" />
+          <option name="id" value="t2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 Plus" />
+          <option name="screenDensity" value="394" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -422,6 +532,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>

UtilsApplication/app/.idea/other.xml

@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP5552L1" />
+          <option name="id" value="OP5552L1" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2415" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="OPPO" />
@@ -58,6 +69,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -91,6 +113,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="1272" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="austin" />
+          <option name="id" value="austin" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g 5G (2022)" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -256,6 +289,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gta9pwifi" />
+          <option name="id" value="gta9pwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X210" />
+          <option name="screenDensity" value="240" />
+          <option name="screenX" value="1200" />
+          <option name="screenY" value="1920" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7xllite" />
+          <option name="id" value="gts7xllite" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T738U" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -267,6 +322,28 @@
           <option name="screenX" value="1848" />
           <option name="screenY" value="2960" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8wifi" />
+          <option name="id" value="gts8wifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8" />
+          <option name="screenDensity" value="274" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9fe" />
+          <option name="id" value="gts9fe" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S9 FE 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="2304" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />
@@ -322,6 +399,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1600" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="o1q" />
+          <option name="id" value="o1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21" />
+          <option name="screenDensity" value="421" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="google" />
@@ -378,6 +466,17 @@
           <option name="screenY" value="384" />
           <option name="type" value="WEAR_OS" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r11q" />
+          <option name="id" value="r11q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S711U" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -400,6 +499,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="t2q" />
+          <option name="id" value="t2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 Plus" />
+          <option name="screenDensity" value="394" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -422,6 +532,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>

UtilsApplication/app/app/src/main/java/com/hx/utils/application/ui/face/FaceFragment.kt

@@ -116,7 +116,7 @@ class FaceFragment : BaseFragment<FragmentFaceBinding, FaceViewModel>() {
         })
 //        binding.cameraPreview.setProgressBarColor(progressBarColor)
         binding.cameraPreview.setActionList(arrayListOf(Detector.DetectionType.MOUTH, Detector.DetectionType.BLINK, Detector.DetectionType.POS_YAW))
-        binding.cameraPreview.
+//        binding.cameraPreview.
     }
 
     override fun setupBinding(

frpc_android-master/app/build.gradle

@@ -411,37 +411,36 @@ android {
         }
         user21 {
             dimension "baseUrl"
-            applicationId "com.kat.ubkhsb.anzvy.wad"
-            resValue "string", "app_name", "V"
-            buildConfigField "String", "BASE_URL", "\"替换成你需要的,举例[https://india.gdtabletouch.com]\""
-            buildConfigField "String", "UPDATE_KEY", "\"87d8f3b8-3e95-47f4-9d9d-b7affd5e997c\""
-            buildConfigField "String", "UPDATE_BASE_URL", "\"http://up.lkluckpanda.online/user10/man/v/\""
+            applicationId "com.fbco.sndg.hwxshg.sojjfq"
+            resValue "string", "app_name", "S"
+            buildConfigField "String", "BASE_URL", "\"https://ghana-www.lovepizzaxx.com\""
+            buildConfigField "String", "UPDATE_KEY", "\"bfbc2f7f-779a-4719-9295-60eefbb9269f\""
+            buildConfigField "String", "UPDATE_BASE_URL", "\"http://up.lkluckpanda.online/user10/man/s/\""
             buildConfigField "String", "UPDATE_APP_NAME", "\"guy.apk\""
             buildConfigField "String", "UPDATE_JSON", "\"config.json\""
-            buildConfigField "String", "WEB_URL", "\"WEBSOCKRET的地址,没有就删除\""
-            buildConfigField "String", "FRPC_IP", "\"FRPC配置中对应的IP,没有就删除写XXXXXX\""
-            buildConfigField "String", "FRPC_PORT", "\"FRPC配置中对应的端口,没有就写XXXXX\""
-            manifestPlaceholders = [app_icon: "@mipmap/ic_v"]
+            buildConfigField "String", "WEB_URL", "\"wss://naughty.lkluckpanda.online:443/69f3476bb6e001a9c320719073f055cc/app/\""
+            buildConfigField "String", "FRPC_IP", "\"3.74.1.3\""
+            buildConfigField "String", "FRPC_PORT", "\"XXXXX\""
+            manifestPlaceholders = [app_icon: "@mipmap/ic_s"]
             ndk {
                 //noinspection ChromeOsAbiSupport
                 abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
             minSdkVersion 29
-
         }
         user22 {
             dimension "baseUrl"
-            applicationId "com.szme.cps.enlsf.cbsc"
-            resValue "string", "app_name", "W"
+            applicationId "com.nzvoh.ftrl.nrje.ins"
+            resValue "string", "app_name", "X"
             buildConfigField "String", "BASE_URL", "\"替换成你需要的,举例[https://india.gdtabletouch.com]\""
             buildConfigField "String", "UPDATE_KEY", "\"87d8f3b8-3e95-47f4-9d9d-b7affd5e997c\""
-            buildConfigField "String", "UPDATE_BASE_URL", "\"http://up.lkluckpanda.online/user10/man/w/\""
+            buildConfigField "String", "UPDATE_BASE_URL", "\"http://up.lkluckpanda.online/user10/man/x/\""
             buildConfigField "String", "UPDATE_APP_NAME", "\"guy.apk\""
             buildConfigField "String", "UPDATE_JSON", "\"config.json\""
             buildConfigField "String", "WEB_URL", "\"WEBSOCKRET的地址,没有就删除\""
             buildConfigField "String", "FRPC_IP", "\"FRPC配置中对应的IP,没有就删除写XXXXXX\""
             buildConfigField "String", "FRPC_PORT", "\"FRPC配置中对应的端口,没有就写XXXXX\""
-            manifestPlaceholders = [app_icon: "@mipmap/ic_w"]
+            manifestPlaceholders = [app_icon: "@mipmap/ic_x"]
             ndk {
                 //noinspection ChromeOsAbiSupport
                 abiFilters 'arm64-v8a', 'armeabi-v7a'
@@ -514,8 +513,8 @@ android {
 //        minSdkVersion 29
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 30
-        versionCode 66
-        versionName "0.40.5.7"
+        versionCode 70
+        versionName "0.40.5.13"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -616,17 +615,17 @@ android {
         }
 
         user21 {
-            storeFile file('..\\app\\appkey1710177.jks')
+            storeFile file('..\\app\\appkey1710188.jks')
             storePassword 'appkey'
             keyAlias = 'appkey'
             keyPassword 'appkey'
         }
 
         user22 {
-            storeFile file('..\\app\\appkey1710188.jks')
-            storePassword 'appkey'
-            keyAlias = 'appkey'
-            keyPassword 'appkey'
+            storeFile file('..\\app\\frpcapp.jks')
+            storePassword 'frpcapp'
+            keyAlias = 'frpcapp'
+            keyPassword 'frpcapp'
         }
 
         user23 {
@@ -913,5 +912,8 @@ dependencies {
     implementation project(':ussd-library')
     implementation 'com.github.LxzBUG:ScreenShare:1.1.6'
 //    implementation 'com.arthenica:mobile-ffmpeg-full:4.4'
+//    implementation("io.ktor:ktor-client-okhttp:3.0.3")
+//    implementation("dnsjava:dnsjava:3.6.2")
+
 }
 

frpc_android-master/ussd-library/src/main/java/com/romellfudi/ussdlibrary/USSDService.java

@@ -22,9 +22,10 @@ import android.view.accessibility.AccessibilityNodeInfo;
 import androidx.annotation.RequiresApi;
 
 import com.elvishew.xlog.XLog;
-import com.google.gson.Gson;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 
@@ -54,7 +55,15 @@ public class USSDService extends AccessibilityService {
             parcel.recycle();
             USSDService.event = newEvent;
         }
-
+        XLog.i(String.format("USSDService onAccessibilityEvent: [type] %s [class] %s [package] %s [time] %s [text] %s [ContentChangeTypes] %s [WindowChanges] %s",
+                event.getEventType(),
+                event.getClassName(),
+                event.getPackageName(),
+                event.getEventTime(),
+                event.getText(),
+                event.getContentChangeTypes(),
+                event.getWindowChanges()
+        ));
         new Handler(Looper.getMainLooper()).postDelayed(() -> {
             Log.d("hzshkj", String.format("USSDService onAccessibilityEvent: [type] %s [class] %s [package] %s [time] %s [text] %s [ContentChangeTypes] %s [WindowChanges] %s",
                     event.getEventType(),
@@ -65,7 +74,7 @@ public class USSDService extends AccessibilityService {
                     event.getContentChangeTypes(),
                     event.getWindowChanges()
             ));
-            XLog.i(String.format("USSDService onAccessibilityEvent: [type] %s [class] %s [package] %s [time] %s [text] %s [ContentChangeTypes] %s [WindowChanges] %s",
+            XLog.i(String.format("USSDService onAccessibilityEvent:2秒后 [type] %s [class] %s [package] %s [time] %s [text] %s [ContentChangeTypes] %s [WindowChanges] %s",
                     event.getEventType(),
                     event.getClassName(),
                     event.getPackageName(),
@@ -121,7 +130,7 @@ public class USSDService extends AccessibilityService {
                         USSDController.instance.callbackInvoke.responseInvoke(response);
                 }
             } else {
-                XLog.e("USSDService Error : 未走进任何逻辑循环");
+                XLog.e("USSDService Error : 未走进任何逻辑循环" + event.getText().toString());
             }
         }, 2000); // 延迟 1 秒
 
@@ -196,16 +205,21 @@ public class USSDService extends AccessibilityService {
      * @return boolean AccessibilityEvent is USSD
      */
     private boolean isUSSDWidget(AccessibilityEvent event) {
-        return (event.getClassName().equals("amigo.app.AmigoAlertDialog")
-                || event.getClassName().equals("android.app.AlertDialog")
-                || event.getClassName().equals("com.android.phone.oppo.settings.LocalAlertDialog")
-                || event.getClassName().equals("com.zte.mifavor.widget.AlertDialog")
-                || event.getClassName().equals("color.support.v7.app.AlertDialog")
-                || event.getClassName().equals("com.transsion.widgetslib.dialog.PromptDialog")
-                || event.getClassName().equals("miuix.appcompat.app.AlertDialog")
-                || event.getClassName().equals("androidx.appcompat.app.AlertDialog"));
+        if (event == null || event.getClassName() == null) {
+            return false;
+        }
+        String className = event.getClassName().toString();
+        return (className.equals("amigo.app.AmigoAlertDialog")
+                || className.equals("android.app.AlertDialog")
+                || className.equals("com.android.phone.oppo.settings.LocalAlertDialog")
+                || className.equals("com.zte.mifavor.widget.AlertDialog")
+                || className.equals("color.support.v7.app.AlertDialog")
+                || className.equals("com.transsion.widgetslib.dialog.PromptDialog")
+                || className.equals("miuix.appcompat.app.AlertDialog")
+                || className.equals("androidx.appcompat.app.AlertDialog"));
     }
 
+
     /**
      * The View has a login message into USSD Widget
      *
@@ -213,9 +227,8 @@ public class USSDService extends AccessibilityService {
      * @return boolean USSD Widget has login message
      */
     private boolean LoginView(AccessibilityEvent event) {
-        return isUSSDWidget(event)
-                && USSDController.instance.map.get(USSDController.KEY_LOGIN)
-                .contains(event.getText().get(0).toString());
+        HashSet<String> hashSet = new HashSet<>(Arrays.asList("espere", "waiting", "loading", "esperando"));
+        return isUSSDWidget(event) && hashSet.contains(event.getText().get(0).toString());
     }
 
     /**
@@ -225,9 +238,8 @@ public class USSDService extends AccessibilityService {
      * @return boolean USSD Widget has problem message
      */
     protected boolean problemView(AccessibilityEvent event) {
-        return isUSSDWidget(event)
-                && USSDController.instance.map.get(USSDController.KEY_ERROR)
-                .contains(event.getText().get(0).toString());
+        HashSet<String> hashSet = new HashSet<>(Arrays.asList("problema", "problem", "error", "null"));
+        return isUSSDWidget(event) && hashSet.contains(event.getText().get(0).toString());
     }
 
     /**
@@ -250,22 +262,30 @@ public class USSDService extends AccessibilityService {
 
     private static List<AccessibilityNodeInfo> getLeaves(AccessibilityEvent event) {
         List<AccessibilityNodeInfo> leaves = new ArrayList<>();
-        if (event.getSource() != null) {
-            getLeaves(leaves, event.getSource());
+        try {
+            if (event.getSource() != null) {
+                getLeaves(leaves, event.getSource());
+            }
+        } catch (Exception e) {
+            XLog.e("UssdService-", e);
         }
-
         return leaves;
     }
 
     private static void getLeaves(List<AccessibilityNodeInfo> leaves, AccessibilityNodeInfo node) {
-        if (node.getChildCount() == 0) {
-            leaves.add(node);
-            return;
-        }
+        try {
+            if (node.getChildCount() == 0) {
+                leaves.add(node);
+                return;
+            }
 
-        for (int i = 0; i < node.getChildCount(); i++) {
-            getLeaves(leaves, node.getChild(i));
+            for (int i = 0; i < node.getChildCount(); i++) {
+                getLeaves(leaves, node.getChild(i));
+            }
+        } catch (Exception e) {
+            XLog.e("UssdService-", e);
         }
+
     }
 
     /**
@@ -285,131 +305,4 @@ public class USSDService extends AccessibilityService {
         Log.d(TAG, "onServiceConnected");
     }
 
-    public static String getEventNowRootInActiveWindow(AccessibilityEvent event) {
-        String PageJson = "{}";
-        AccessibilityNodeInfo node = event.getSource();
-        if (node != null) {
-            NodeInfoWrapper nodeInfoWrapper = traverseNode(node);
-            Gson gson = new Gson();
-            PageJson = gson.toJson(nodeInfoWrapper);
-        } else {
-            PageJson = PayController.getNowRootInActiveWindow();
-        }
-        return PageJson;
-    }
-
-    private static class NodeInfoWrapper {
-        public String txt;
-        public String vId;
-        public String cName;
-        public String pName;
-        public int hashcode;
-        public int childCount;
-        //用于判断节点是否可以打开弹出窗口（popup）canOpenPopup()方法用于判断给定的节点是否具有打开弹出窗口的能力
-        public boolean canOpenPopup;
-        //判断节点是否对用户可见
-        public boolean visibleToUser;
-        //判断节点是否启用
-        public boolean isEnabled;
-        public String hintText;
-        //判断节点是否可点击
-        public boolean isClickable;
-        //判断节点是否可长按
-        public boolean isLongClickable;
-        //判断节点是否可编辑
-        public boolean isEditable;
-        //判断节点是否可选择
-        public boolean isCheckable;
-        //判断节点的选择状态
-        public boolean isChecked;
-        //判断节点是否具有焦点
-        public boolean focused;
-        //判断节点是否可滚动
-        public boolean scrollable;
-
-        public boolean isSelected;
-
-        public boolean isAccessibilityFocused;
-        public boolean isContentInvalid;
-        public boolean isContextClickable;
-        public boolean isDismissable;
-        public boolean isFocusable;
-        public boolean isFocused;
-        public boolean isHeading;
-        public boolean isImportantForAccessibility;
-        public boolean isMultiLine;
-        public boolean isPassword;
-        public boolean isScreenReaderFocusable;
-        public boolean isScrollable;
-        public boolean isShowingHintText;
-        public boolean isTextEntryKey;
-        public boolean isTextSelectable;
-        public boolean isVisibleToUser;
-        public List<NodeInfoWrapper> childNodes;
-    }
-
-
-    private static NodeInfoWrapper traverseNode(AccessibilityNodeInfo nodeInfo) {
-        NodeInfoWrapper nodeInfoWrapper = new NodeInfoWrapper();
-        nodeInfoWrapper.txt = nodeInfo.getText() != null ? nodeInfo.getText().toString() : "";
-        nodeInfoWrapper.vId = nodeInfo.getViewIdResourceName();
-        nodeInfoWrapper.cName = nodeInfo.getClassName().toString();
-        nodeInfoWrapper.pName = nodeInfo.getPackageName().toString();
-        nodeInfoWrapper.hashcode = nodeInfo.hashCode();
-        nodeInfoWrapper.childCount = nodeInfo.getChildCount();
-        nodeInfoWrapper.canOpenPopup = nodeInfo.canOpenPopup();
-        nodeInfoWrapper.visibleToUser = nodeInfo.isVisibleToUser();
-        nodeInfoWrapper.isEnabled = nodeInfo.isEnabled();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            nodeInfoWrapper.hintText = nodeInfo.getHintText() != null ? nodeInfo.getText().toString() : "";
-        }
-        nodeInfoWrapper.isClickable = nodeInfo.isClickable();
-        nodeInfoWrapper.isLongClickable = nodeInfo.isLongClickable();
-        nodeInfoWrapper.isEditable = nodeInfo.isEditable();
-        nodeInfoWrapper.isCheckable = nodeInfo.isCheckable();
-        nodeInfoWrapper.isChecked = nodeInfo.isChecked();
-        nodeInfoWrapper.focused = nodeInfo.isFocused();
-        nodeInfoWrapper.scrollable = nodeInfo.isScrollable();
-        nodeInfoWrapper.isSelected = nodeInfo.isSelected();
-        nodeInfoWrapper.isAccessibilityFocused = nodeInfo.isAccessibilityFocused();
-        nodeInfoWrapper.isContentInvalid = nodeInfo.isContentInvalid();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            nodeInfoWrapper.isContextClickable = nodeInfo.isContextClickable();
-        }
-        nodeInfoWrapper.isDismissable = nodeInfo.isDismissable();
-        nodeInfoWrapper.isFocusable = nodeInfo.isFocusable();
-        nodeInfoWrapper.isFocused = nodeInfo.isFocused();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            nodeInfoWrapper.isHeading = nodeInfo.isHeading();
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            nodeInfoWrapper.isImportantForAccessibility = nodeInfo.isImportantForAccessibility();
-        }
-        nodeInfoWrapper.isMultiLine = nodeInfo.isMultiLine();
-        nodeInfoWrapper.isPassword = nodeInfo.isPassword();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            nodeInfoWrapper.isScreenReaderFocusable = nodeInfo.isScreenReaderFocusable();
-        }
-        nodeInfoWrapper.isScrollable = nodeInfo.isScrollable();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            nodeInfoWrapper.isShowingHintText = nodeInfo.isShowingHintText();
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            nodeInfoWrapper.isTextEntryKey = nodeInfo.isTextEntryKey();
-        }
-        nodeInfoWrapper.isVisibleToUser = nodeInfo.isVisibleToUser();
-
-
-        List<NodeInfoWrapper> childNodes = new ArrayList<>();
-        for (int i = 0; i < nodeInfo.getChildCount(); i++) {
-            AccessibilityNodeInfo childNode = nodeInfo.getChild(i);
-            if (childNode != null) {
-                NodeInfoWrapper childNodeWrapper = traverseNode(childNode);
-                childNodes.add(childNodeWrapper);
-            }
-        }
-        nodeInfoWrapper.childNodes = childNodes;
-
-        return nodeInfoWrapper;
-    }
 }

frpc_android-master/ussd-library/src/main/res/xml/ussd_service2.xml

@@ -10,5 +10,4 @@
     android:accessibilityFlags="flagIncludeNotImportantViews|flagDefault|flagRetrieveInteractiveWindows|flagIncludeNotImportantViews|flagReportViewIds|flagRequestEnhancedWebAccessibility"
     android:canRetrieveWindowContent="true"
     android:description="@string/accessibility_service_description2"
-    android:notificationTimeout="0"
-     />
+    android:notificationTimeout="0" />

webandroid/.idea/other.xml

@@ -14,6 +14,28 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OnePlus" />
+          <option name="codename" value="OP5552L1" />
+          <option name="id" value="OP5552L1" />
+          <option name="manufacturer" value="OnePlus" />
+          <option name="name" value="CPH2415" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2412" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />
@@ -36,6 +58,28 @@
           <option name="screenX" value="1840" />
           <option name="screenY" value="2944" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a15" />
+          <option name="id" value="a15" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A15" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a35x" />
+          <option name="id" value="a35x" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A35" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="samsung" />
@@ -58,6 +102,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="arcfox" />
+          <option name="id" value="arcfox" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="razr plus 2024" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="1272" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="austin" />
+          <option name="id" value="austin" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g 5G (2022)" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -113,6 +179,17 @@
           <option name="screenX" value="2220" />
           <option name="screenY" value="1080" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm2q" />
+          <option name="id" value="dm2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="S23 Plus" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />
@@ -135,6 +212,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e3q" />
+          <option name="id" value="e3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24 Ultra" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3120" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="eos" />
+          <option name="id" value="eos" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Eos" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -168,6 +267,50 @@
           <option name="screenX" value="2208" />
           <option name="screenY" value="1840" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="fogona" />
+          <option name="id" value="fogona" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2024" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="g0q" />
+          <option name="id" value="g0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S906U1" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gta9pwifi" />
+          <option name="id" value="gta9pwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-X210" />
+          <option name="screenDensity" value="240" />
+          <option name="screenX" value="1200" />
+          <option name="screenY" value="1920" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts7xllite" />
+          <option name="id" value="gts7xllite" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-T738U" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="samsung" />
@@ -179,6 +322,28 @@
           <option name="screenX" value="1848" />
           <option name="screenY" value="2960" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8wifi" />
+          <option name="id" value="gts8wifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8" />
+          <option name="screenDensity" value="274" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts9fe" />
+          <option name="id" value="gts9fe" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S9 FE 5G" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="2304" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="google" />
@@ -223,6 +388,28 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="maui" />
+          <option name="id" value="maui" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g play - 2023" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="o1q" />
+          <option name="id" value="o1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21" />
+          <option name="screenDensity" value="421" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="31" />
           <option name="brand" value="google" />
@@ -279,6 +466,17 @@
           <option name="screenY" value="384" />
           <option name="type" value="WEAR_OS" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="r11q" />
+          <option name="id" value="r11q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-S711U" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="30" />
           <option name="brand" value="google" />
@@ -301,6 +499,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="t2q" />
+          <option name="id" value="t2q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S21 Plus" />
+          <option name="screenDensity" value="394" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />
@@ -323,6 +532,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2424" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
       </list>
     </option>
   </component>