From 4fd52037f6378810acc7895e8e8f313efbc70c7c Mon Sep 17 00:00:00 2001
From: level <1364007522@qq.com>
Date: Mon, 12 Aug 2024 17:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=87=E7=94=A8=E5=85=85=E5=80=BCUI=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  6 +++
 .../yingmao/clash/fragment/NewAccFragment.kt  |  9 +++++
 .../recharge/BackupRechargeActivity.kt        | 14 +++++++
 .../fragment/recharge/RechargeFragment.kt     |  5 ++-
 .../res/layout/activity_backup_recharge.xml   | 16 ++++++++
 .../main/res/layout/fragment_accelerate.xml   | 37 +++++++++++++++----
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  3 +-
 8 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/yingmao/clash/fragment/recharge/BackupRechargeActivity.kt
 create mode 100644 app/src/main/res/layout/activity_backup_recharge.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1bf2e3a..2fdf085 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -143,6 +143,12 @@
         <activity
             android:name=".act.LossPreventionActivity"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".fragment.recharge.BackupRechargeActivity"
+            android:screenOrientation="portrait"
+            />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
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 cb53b12..f81d772 100644
--- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
+++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
@@ -35,6 +35,7 @@ import com.yingmao.clash.conf.Conf
 import com.yingmao.clash.core.Clash
 import com.yingmao.clash.core.model.TunnelState
 import com.yingmao.clash.entity.ClashNodebBean
+import com.yingmao.clash.fragment.recharge.BackupRechargeActivity
 import com.yingmao.clash.listener.AsyncCallBackListener
 import com.yingmao.clash.util.ActivityResultLifecycle
 import com.yingmao.clash.util.CommonUtils
@@ -170,10 +171,18 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
         view.findViewById<Button>(R.id.recharge_but).setOnClickListener {
             goRechargeWeb()
         }
+        //备用充值
+        view.findViewById<Button>(R.id.backupRecharge).setOnClickListener {
+            goBackupRechargeWeb()
+        }
         setExpireDate()
         setProxyModeView(NewMainActivity.newMainActGlo)
     }
 
+    private fun goBackupRechargeWeb() {
+        startActivity(Intent(activity, BackupRechargeActivity::class.java))
+    }
+
     override fun onResume() {
         super.onResume()
 
diff --git a/app/src/main/java/com/yingmao/clash/fragment/recharge/BackupRechargeActivity.kt b/app/src/main/java/com/yingmao/clash/fragment/recharge/BackupRechargeActivity.kt
new file mode 100644
index 0000000..f655a1c
--- /dev/null
+++ b/app/src/main/java/com/yingmao/clash/fragment/recharge/BackupRechargeActivity.kt
@@ -0,0 +1,14 @@
+package com.yingmao.clash.fragment.recharge
+
+import android.os.Bundle
+import android.view.WindowManager
+import com.yingmao.clash.R
+import com.yingmao.clash.base.BaseActivity
+
+class BackupRechargeActivity : BaseActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_backup_recharge)
+        window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt
index f2cf184..ab954a4 100644
--- a/app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt
+++ b/app/src/main/java/com/yingmao/clash/fragment/recharge/RechargeFragment.kt
@@ -87,12 +87,15 @@ class RechargeFragment : BaseFragment() {
         container: FrameLayout,
     ) {
         titleBarRl.visibility = View.VISIBLE
-        backIv.visibility = View.INVISIBLE
+        backIv.visibility = View.VISIBLE
         moreTv.visibility = View.VISIBLE
         titleTv.visibility = View.VISIBLE
         moreTv.setOnClickListener {
             startActivity(Intent(activity, ExpensesRecordActivity::class.java))
         }
+        backIv.setOnClickListener {
+            activity?.finish()
+        }
         titleTv.text = "充值"
         moreTv.text = "消费记录"
         val view = View.inflate(CommonUtils.getApp(), R.layout.fragment_recharge_new, null)
diff --git a/app/src/main/res/layout/activity_backup_recharge.xml b/app/src/main/res/layout/activity_backup_recharge.xml
new file mode 100644
index 0000000..551e55d
--- /dev/null
+++ b/app/src/main/res/layout/activity_backup_recharge.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black_141b21"
+    tools:context=".fragment.recharge.BackupRechargeActivity">
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/BackupRechargeView"
+        android:name="com.yingmao.clash.fragment.recharge.RechargeFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+       />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_accelerate.xml b/app/src/main/res/layout/fragment_accelerate.xml
index 060a0e0..e5b2e31 100644
--- a/app/src/main/res/layout/fragment_accelerate.xml
+++ b/app/src/main/res/layout/fragment_accelerate.xml
@@ -55,17 +55,38 @@
                 android:textSize="16sp"
                 android:textStyle="bold" />
         </LinearLayout>
-        <android.widget.Button
-            android:id="@+id/recharge_but"
+
+        <LinearLayout
+            android:id="@+id/llRecharge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
+            android:orientation="horizontal">
 
-            android:background="@drawable/main_node_bg_spape"
-            android:gravity="center"
-            android:text="@string/recharge"
-            android:textColor="@color/white"
-            android:textSize="17sp"></android.widget.Button>
+            <android.widget.Button
+                android:id="@+id/recharge_but"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:background="@drawable/main_node_bg_spape"
+                android:gravity="center"
+                android:text="@string/recharge"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+
+            <android.widget.Button
+                android:id="@+id/backupRecharge"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="10dp"
+                android:layout_weight="1"
+                android:background="@drawable/main_node_bg_spape"
+                android:gravity="center"
+                android:text="@string/backup_recharge"
+                android:textColor="@color/white"
+                android:textSize="17sp" />
+        </LinearLayout>
     </LinearLayout>
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1f8b501..2817d0b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,4 +32,5 @@
     <color name="translucent_bg">#00000000</color>
 
     <color name="ic_taizi_logo_background">#FDFDFD</color>
+    <color name="black_141b21">#141b21</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 10eb004..2250083 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name" >八爪鱼</string>
+    <string name="app_name">八爪鱼</string>
     <string name="app_name_backcn">波斯猫回国加速器</string>
     <string name="app_name_gz">影猫</string>
     <string name="app_name_taizi">太子VPN</string>
@@ -33,6 +33,7 @@
     <string name="verification_success">验证成功！</string>
     <string name="accelerate">加速</string>
     <string name="recharge">充值</string>
+    <string name="backup_recharge">备用充值</string>
     <string name="mine">我的</string>
     <string name="current_node">当前节点</string>
     <string name="node_hongkong">香港节点</string>