From 3bcd1883d92f3c13fee90c82cafd5675b2da8539 Mon Sep 17 00:00:00 2001
From: cyh <cyh>
Date: Wed, 14 Aug 2024 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=87=E7=94=A8=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E8=BF=94=E5=9B=9E=E6=97=B6=E5=AF=B9=E8=AF=9D=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yingmao/clash/act/ActivityActivity.kt | 12 +++---
 .../com/yingmao/clash/act/NewMainActivity.kt  |  5 +++
 .../yingmao/clash/fragment/NewAccFragment.kt  | 13 ++++--
 .../java/com/yingmao/clash/vm/MainAtyVM.kt    |  2 +-
 build.gradle.kts                              | 43 ++++++++++++++++++-
 5 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt
index 07cecec..282cc2f 100644
--- a/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/ActivityActivity.kt
@@ -34,6 +34,7 @@ import com.yingmao.clash.net.http.HttpStatus
 import com.yingmao.clash.net.http.entity.Activity_
 import com.yingmao.clash.net.http.entity.GetActivityRsp
 import com.yingmao.clash.util.CommonUtils
+import com.yingmao.clash.util.Utils
 
 import com.yingmao.clash.view.RxToast
 import com.yingmao.clash.view.adapter.GetActivityAdapter
@@ -75,14 +76,11 @@ class ActivityActivity : BaseActivity() {
             GetActivityAdapter(R.layout.get_activity_item_layout, object : MyAdapterListener {
                 override fun onMyItemChildClickListener(itemBean: Activity_) {
                     if (itemBean.redirectLink.contains("BindAccount")) {
-
                         showBindAccDialog(itemBean)
                     } else {
-
                         showActDialog(itemBean)
                     }
                 }
-
             })
         getActivityAdapter.animationEnable = true
         expensesRecordRv.adapter = getActivityAdapter
@@ -122,7 +120,12 @@ class ActivityActivity : BaseActivity() {
     }
 
     private fun showBindAccDialog(bean: Activity_) {
-
+        var useraccount =
+            MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME, "")!!;
+        if (Utils.isEmail(useraccount) || Utils.isPhoneNumber(useraccount)) {
+            RxToast.info("您的账号已绑定,无需再次绑定")
+            return
+        }
         var act_dialog = MaterialDialog(this@ActivityActivity).show {
             this.cancelable(false)
             cornerRadius(res = R.dimen.dp_10)
@@ -248,7 +251,6 @@ class ActivityActivity : BaseActivity() {
                         } else {
                             getActivityAdapter.loadMoreModule.loadMoreComplete()
                         }
-
                     } else {
                         RxToast.error("${getActivityRsp.code}${getActivityRsp.message}")
                         getActivityAdapter.loadMoreModule.loadMoreFail()
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 aaff3d1..a5d84eb 100644
--- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
@@ -43,6 +43,7 @@ import com.yingmao.clash.core.model.LogMessage
 import com.yingmao.clash.entity.CheckLoginRsp
 import com.yingmao.clash.fragment.NewAccFragment
 import com.yingmao.clash.fragment.mine.MineFragment
+import com.yingmao.clash.fragment.recharge.BackupRechargeActivity
 import com.yingmao.clash.fragment.recharge.RechargeFragment
 import com.yingmao.clash.listener.DownLoadListener
 import com.yingmao.clash.net.http.HttpApi
@@ -673,7 +674,11 @@ class NewMainActivity : BaseActivity() {
         intent.putExtra("url", rcURL)
 //        startActivity(intent)
         startActivityForResult(intent, REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY)
+    }
 
+    public fun goBackupRechargeWeb() {
+
+        startActivityForResult(Intent(this@NewMainActivity, BackupRechargeActivity::class.java), REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY)
     }
 
     private fun showPayResultDialog() {
diff --git a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
index f81d772..2acbedb 100644
--- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
+++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
@@ -25,6 +25,7 @@ import com.tencent.mmkv.MMKV
 import com.yingmao.clash.R
 import com.yingmao.clash.act.ChangeNodeActivity
 import com.yingmao.clash.act.NewMainActivity
+import com.yingmao.clash.act.NewMainActivity.Companion.REQUEST_CODE_PAY_WEB_VIEW_ACTIVITY
 import com.yingmao.clash.act.NewMainActivity.Companion.isSubed
 import com.yingmao.clash.act.NewMainActivity.Companion.newUuid
 import com.yingmao.clash.act.ProxyModeActivity
@@ -173,15 +174,13 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
         }
         //备用充值
         view.findViewById<Button>(R.id.backupRecharge).setOnClickListener {
-            goBackupRechargeWeb()
+            goNewRecharge()
         }
         setExpireDate()
         setProxyModeView(NewMainActivity.newMainActGlo)
     }
 
-    private fun goBackupRechargeWeb() {
-        startActivity(Intent(activity, BackupRechargeActivity::class.java))
-    }
+
 
     override fun onResume() {
         super.onResume()
@@ -572,6 +571,12 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
         mact.goRechargeWeb()
     }
 
+    private fun goNewRecharge() {
+        var mact = activity as NewMainActivity
+        mact.goBackupRechargeWeb()
+    }
+
+
     private fun checkGlo() {
         val isGlobal = isGlo
         val isGlobal2 = MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
diff --git a/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt b/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt
index 71f8501..a5b4dfe 100644
--- a/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt
+++ b/app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt
@@ -78,7 +78,7 @@ class MainAtyVM : PublicViewMode() {
             "userId" to userId,
             "phoneNumber" to phone,
             "phToken" to phToken,
-            "phToken" to phToken,
+//            "phToken" to phToken,
 //            (默认为公告 公告=Bulletin,跑马灯=Running)
             "actType" to "Running",
             "osType" to "1"
diff --git a/build.gradle.kts b/build.gradle.kts
index f6bee3d..ca2e585 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -276,7 +276,7 @@ subprojects {
                 buildConfigField("boolean", "is_ym", "true")
                 buildConfigField("boolean", "is_free", "false")
                 buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
-                buildConfigField("String", "service_url", "\"https://api.yingmaovpnpro.win:18002\"")
+                buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:18002\"")
                 buildConfigField("String", "productId", "\"9972\"")
                 manifestPlaceholders(
                     mapOf(
@@ -304,6 +304,47 @@ subprojects {
                     )
                 )
             }
+
+            create("6886") {
+                isDefault = true
+                dimension = flavorDimensionList[0]
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
+                if (isApp) {
+//                    applicationIdSuffix = ".meta"
+                }
+                buildConfigField("boolean", "is_back_cn", "false")
+                buildConfigField("boolean", "is_ym", "true")
+                buildConfigField("boolean", "is_free", "false")
+                buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
+                buildConfigField("String", "service_url", "\"https://api.yingmaovpnpro.win:18002\"")
+                buildConfigField("String", "productId", "\"6886\"")
+                manifestPlaceholders(
+                    mapOf(
+                        "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972"
+                    )
+                )
+            }
+
+            create("6159") {
+                isDefault = true
+                dimension = flavorDimensionList[0]
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
+                if (isApp) {
+//                    applicationIdSuffix = ".meta"
+                }
+                buildConfigField("boolean", "is_back_cn", "false")
+                buildConfigField("boolean", "is_ym", "true")
+                buildConfigField("boolean", "is_free", "false")
+                buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
+                buildConfigField("String", "service_url", "\"https://api.yingmaovpnpro.win:18002\"")
+                buildConfigField("String", "productId", "\"6159\"")
+                manifestPlaceholders(
+                    mapOf(
+                        "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972"
+                    )
+                )
+            }
+
             create("182242") {
                 isDefault = true
                 dimension = flavorDimensionList[0]