Support swy baitian version

DawningW · Aug 17, 2024 · 1423ad8 · 1423ad8
1 parent 71482e6
commit 1423ad8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 28 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
-/build
+/build
+/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "kongsang.swybot"
         minSdk 24
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
         python {
             version "3.8"
             pip {

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
     <queries>
         <package android:name="com.tencent.swy" />
+        <package android:name="com.baitian.pjg.swy.bt" />
     </queries>
 
     <application

diff --git a/app/src/main/java/kongsang/swybot/MainActivity.java b/app/src/main/java/kongsang/swybot/MainActivity.java
@@ -21,8 +21,10 @@
 public class MainActivity extends AppCompatActivity {
     public static final String CHANNEL_ID = "SWY_BOT";
     public static final String SWY_PACKAGE_NAME = "com.tencent.swy";
+    public static final String SWY_BT_PACKAGE_NAME = "com.baitian.pjg.swy.bt";
     private static final String TAG = "MainActivity";
 
+    private String gamePackageName;
     private ActivityResultLauncher<Intent> activityResultLauncher;
 
     @Override
@@ -38,9 +40,20 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         try {
-            PackageInfo swyPackageInfo = getPackageManager().getPackageInfo(SWY_PACKAGE_NAME, 0);
-            Log.i(TAG, "Found swy version: " + swyPackageInfo.versionName);
-        } catch (PackageManager.NameNotFoundException e) {
+            PackageInfo swyPackageInfo = getPackageManager().getPackageInfo(SWY_BT_PACKAGE_NAME, 0);
+            gamePackageName = SWY_BT_PACKAGE_NAME;
+            Log.i(TAG, "Found swy (baitian) version: " + swyPackageInfo.versionName);
+        } catch (PackageManager.NameNotFoundException e1) {
+            e1.printStackTrace();
+            try {
+                PackageInfo swyPackageInfo = getPackageManager().getPackageInfo(SWY_PACKAGE_NAME, 0);
+                gamePackageName = SWY_PACKAGE_NAME;
+                Log.i(TAG, "Found swy (tencent) version: " + swyPackageInfo.versionName);
+            } catch (PackageManager.NameNotFoundException e2) {
+                gamePackageName = null;
+            }
+        }
+        if (gamePackageName == null) {
             new AlertDialog.Builder(this)
                     .setMessage(R.string.exit_message)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
@@ -86,7 +99,7 @@ private void startGame() {
         if (SystemUtil.isHarmonyOS() && SystemUtil.getHarmonyVersion() >= 3) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
-        startActivity(getPackageManager().getLaunchIntentForPackage(SWY_PACKAGE_NAME));
+        startActivity(getPackageManager().getLaunchIntentForPackage(gamePackageName));
         finish();
     }
 }
diff --git a/app/src/main/java/kongsang/swybot/SwyBotService.java b/app/src/main/java/kongsang/swybot/SwyBotService.java
@@ -71,7 +71,7 @@ public void onCreate() {
     protected void onServiceConnected() {
         Log.i(TAG, "Accessibility service connected");
         AccessibilityServiceInfo serviceInfo = getServiceInfo();
-        serviceInfo.packageNames = new String[] { MainActivity.SWY_PACKAGE_NAME };
+        serviceInfo.packageNames = new String[] { MainActivity.SWY_PACKAGE_NAME, MainActivity.SWY_BT_PACKAGE_NAME };
         setServiceInfo(serviceInfo);
     }