From f7d7b6e21a3b044dd1b6180cc98b33418dab2ca3 Mon Sep 17 00:00:00 2001
From: level <1364007522@qq.com>
Date: Thu, 10 Jul 2025 17:39:01 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix=20=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yingmao/clash/act/NewMainActivity.kt  |  1 +
 .../com/yingmao/clash/act/SettingActivity.kt  | 42 ++++++++++++++++++-
 build.gradle.kts                              | 40 +-----------------
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
index 2efa2f6..55ca6c4 100644
--- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
@@ -555,6 +555,7 @@ class NewMainActivity : BaseActivity() {
                         checkPayResultDia?.dismiss()
                         mainAtyVM.getAirNodes()
                         RxToast.info(resources.getString(R.string.SuccessfullyUpdatedUserInformation))
+                        mainAtyVM.getExpensesRecord(mPageInfo)
                     } else {
 //                        RxToast.info(resources.getString(R.string.PaymentResultsStr))
                     }
diff --git a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
index ad0bbcf..d658dbd 100644
--- a/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
@@ -334,7 +334,7 @@ class SettingActivity : BaseActivity() {
                     delay(1000)
                     if (subUrl?.isNotEmpty() == true) {
                         startTimer()
-                        NewMainActivity.setSub2(subUrl!!)
+                        setSub2(subUrl!!, pm)
                     }
                 }
             }
@@ -457,6 +457,46 @@ class SettingActivity : BaseActivity() {
 
 
 
+    private suspend fun setSub2(url: String, pm: IProfileManager) {
+        pm.queryAll().forEach { itemPro ->
+            if (itemPro.name != Conf.getClashConfName(MainApplication.getApp())) {
+                Log.d("setSub2 delete ==>${itemPro.name}")
+                pm.delete(itemPro.uuid)
+            }
+        }
+        val pro = pm.queryActive()
+        pro?.let {
+            val actName = it.name
+            Log.d("new main actname==>" + actName)
+            pm.setActive(it)
+            newUuid = pro.uuid.toString();
+            isSubbed = true
+            Log.d("setSub2 setActive end")
+            finishInit()
+        } ?: run {
+            val uuid: UUID = pm.create(
+                Profile.Type.Url, Conf.getClashConfName(MainApplication.getApp())
+            )
+            delay(500)
+            pm.queryByUUID(uuid)?.let { qPro ->
+                pm.setActive(qPro)
+                pm.patch(
+                    qPro.uuid, qPro.name,
+                    url, 1800000L
+                )
+                pm.commit(qPro.uuid) { status ->
+                    android.util.Log.d(
+                        Conf.TAG,
+                        "new updateStatus: " + Gson().toJson(status.args) + ", pro==>" + status.progress
+                    )
+                }
+                newUuid = qPro.uuid.toString()
+                isSubbed = true
+
+            }
+            finishInit()
+        }
+    }
     private fun showBottomDialog(data: List<LanguageInfoEntity>) {
         //1、使用Dialog、设置style
         val bottomSheetDialog = BottomSheetDialog(this, R.style.BottomSheetDialog)
diff --git a/build.gradle.kts b/build.gradle.kts
index a60f2cd..8be0bd0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -138,47 +138,9 @@ subprojects {
                     )
                 )
             }
-            create("1111") {
-                isDefault = true
-                dimension = flavorDimensionList[0]
-                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
-                buildConfigField("boolean", "is_back_cn", "false")
-                buildConfigField("boolean", "is_ym", "true")
-                buildConfigField("boolean", "is_tz", "false")
-                buildConfigField("boolean", "is_yunti", "false")
-                buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
-                buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
-                buildConfigField("boolean", "is_free", "false")
-                buildConfigField("String", "productId", "\"1111\"")
-                manifestPlaceholders(
-                    mapOf(
-                        "APP_NAME" to "@string/wf",
-                        "APP_ICON" to "@mipmap/oneclickconnection"
-                    )
-                )
-            }
-            create("7777") {
-                isDefault = true
-                dimension = flavorDimensionList[0]
-                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
-                buildConfigField("boolean", "is_back_cn", "false")
-                buildConfigField("boolean", "is_ym", "true")
-                buildConfigField("boolean", "is_tz", "false")
-                buildConfigField("boolean", "is_yunti", "false")
-                buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
-                buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
-                buildConfigField("boolean", "is_free", "false")
-                buildConfigField("String", "productId", "\"7777\"")
-                manifestPlaceholders(
-                    mapOf(
-                        "APP_NAME" to "@string/wf",
-                        "APP_ICON" to "@mipmap/oneclickconnection"
-                    )
-                )
-            }
         }
         sourceSets {
-           getByName("7777") {
+           getByName("9999") {
                 java.srcDirs("src/foss/java")
             }
         }