From ec0149decb510324369ede416c37fd2f746d4a64 Mon Sep 17 00:00:00 2001
From: shenzuqiang <zuqiangshen@163.com>
Date: Fri, 13 Mar 2026 10:43:42 +0800
Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E6=8A=A0=E5=9B=BE=E6=B7=BB=E5=8A=A0decode=202?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 app/build.gradle.kts                          | 118 +++---------------
 .../img/rabbit/utils/appwalle/ApkUtil.java    |   2 +-
 .../img/rabbit/viewmodel/CutoutViewModel.kt   |   2 +-
 4 files changed, 18 insertions(+), 108 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index fa6cdeb..36020bf 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-03-12T10:17:50.197535700Z">
+        <DropdownSelection timestamp="2026-03-13T02:12:15.837405600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=JRBI89BIE6AI5TG6" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=Y5DELZR46DZTCI9D" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9dab488..ba7fed9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,122 +123,29 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-}
+    //noinspection WrongGradleMethod
+    androidComponents {
+        onVariants { variant ->
+            variant.outputs.forEach { output ->
+                // 关键：强制转换为 VariantOutputImpl 以访问 outputFileName
+                val outputImpl = output as? com.android.build.api.variant.impl.VariantOutputImpl
 
-
-
-/*
-android {
-    namespace = "com.img.rabbit"
-    compileSdk = 36
-
-    buildFeatures {
-        compose = true
-        buildConfig = true
-        viewBinding = true
-    }
-    aaptOptions {
-        additionalParameters("--auto-add-overlay")
-    }
-    androidResources {
-        ignoreAssetsPattern = "!.svn:!.git:.*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
-    }
-
-    packagingOptions {
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.8"
-    }
-
-    defaultConfig {
-        applicationId = "com.img.rabbit"
-        minSdk = 24
-        targetSdk = 36
-        versionCode = 1
-        versionName = "1.0.0"
-        multiDexEnabled = true
-
-
-        setManifestPlaceholders(mapOf(
-            "GETUI_APPID" to (project.findProperty("GETUI_APPID") as? String ?: ""),
-            "GT_INSTALL_CHANNEL" to (project.findProperty("GT_INSTALL_CHANNEL") as? String ?: "GT_INSTALL_CHANNEL")
-        ))
-        ndk {
-            abiFilters.addAll(listOf("arm64-v8a", "x86_64", "x86", "armeabi-v7a"))
-        }
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        vectorDrawables {
-            useSupportLibrary = true
-        }
-        multiDexEnabled = true
-
-        resConfigs("en", "zh-rCN")
-
-        flavorDimensions.addAll(listOf("channel"))
-
-        productFlavors {
-            create("general") {
-                dimension = "channel"
-                manifestPlaceholders["UMENG_CHANNEL"] = "general"
+                val flavor = variant.flavorName ?: "default"
+                val buildType = variant.buildType ?: "release"
+                val versionName = android.defaultConfig.versionName ?: "1.0.0"
+                // 输出格式: Rabbit_huawei_release_v1.0.0.apk
+                outputImpl?.outputFileName?.set("Rabbit_${flavor}_${buildType}_v${versionName}.apk")
             }
         }
-
-        productFlavors.configureEach {
-            dimension = "channel"
-            manifestPlaceholders.putAll(mapOf("UMENG_CHANNEL" to name))
-        }
-        manifestPlaceholders.putAll(mapOf(
-            "GETUI_APPID" to (project.findProperty("GETUI_APPID") as? String ?: ""),
-            "GT_INSTALL_CHANNEL" to "general",
-            "apk.applicationId" to "com.img.rabbit",
-        ))
     }
 
 
-    // 配置签名信息
-    signingConfigs {
-        create("config") {
-            storeFile = file(project.findProperty("RELEASE_STORE_FILE") ?: "bidinfo.keystore")
-            storePassword = project.findProperty("RELEASE_STORE_PASSWORD") as? String ?: ""
-            keyAlias = project.findProperty("RELEASE_KEY_ALIAS") as? String ?: ""
-            keyPassword = project.findProperty("RELEASE_KEY_PASSWORD") as? String ?: ""
-            enableV1Signing = true
-            enableV2Signing = true
-            enableV3Signing = true
-        }
-    }
-
-    buildTypes {
-        getByName("debug") {
-            isMinifyEnabled = false
-            isShrinkResources = false
-            signingConfig = signingConfigs.getByName("config")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-        getByName("release") {
-            isMinifyEnabled = false
-            isShrinkResources = false
-            signingConfig = signingConfigs.getByName("config")
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-    }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
 }
- */
 
 configurations {
     all {
@@ -246,6 +153,9 @@ configurations {
     }
 }
 
+tasks.withType<JavaCompile>().configureEach {
+    options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation"))
+}
 
 dependencies {
     api(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar","*.aar"))))
diff --git a/app/src/main/java/com/img/rabbit/utils/appwalle/ApkUtil.java b/app/src/main/java/com/img/rabbit/utils/appwalle/ApkUtil.java
index 6671169..8c0580b 100644
--- a/app/src/main/java/com/img/rabbit/utils/appwalle/ApkUtil.java
+++ b/app/src/main/java/com/img/rabbit/utils/appwalle/ApkUtil.java
@@ -98,7 +98,7 @@ final class ApkUtil {
     public static Map<Integer, ByteBuffer> findIdValues(ByteBuffer apkSigningBlock) throws SignatureNotFoundException {
         checkByteOrderLittleEndian(apkSigningBlock);
         ByteBuffer pairs = sliceFromTo(apkSigningBlock, 8, apkSigningBlock.capacity() - 24);
-        Map<Integer, ByteBuffer> idValues = new LinkedHashMap();
+        Map<Integer, ByteBuffer> idValues = new LinkedHashMap<>();
         int entryCount = 0;
         while(pairs.hasRemaining()) {
             ++entryCount;
diff --git a/app/src/main/java/com/img/rabbit/viewmodel/CutoutViewModel.kt b/app/src/main/java/com/img/rabbit/viewmodel/CutoutViewModel.kt
index 3d0d7fc..cbcf224 100644
--- a/app/src/main/java/com/img/rabbit/viewmodel/CutoutViewModel.kt
+++ b/app/src/main/java/com/img/rabbit/viewmodel/CutoutViewModel.kt
@@ -78,7 +78,7 @@ class CutoutViewModel : BaseViewModel() {
                 if (response.status) {
                     Log.i("CutoutViewModel", "抠图成功: ${response.data}")
 
-                    val resultUrl = response.data.toString()
+                    val resultUrl = Uri.decode(response.data.toString())
                     // 将 http 替换为 https
                     //val resultUrl = response.data.toString().replace("http://", "https://")
                     saveUrlToCache(resultUrl, onResult)