From dd415640df8216e30e8863e335737e8b45fde265 Mon Sep 17 00:00:00 2001
From: level <1364007522@qq.com>
Date: Thu, 15 May 2025 15:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=AC=E4=B8=8A=E8=BF=9E=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D=E5=92=8C=E7=AD=BE=E5=90=8D=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yingmao/clash/fragment/NewAccFragment.kt    |  16 +---------------
 app/src/main/res/layout/fragment_accelerate.xml |   8 --------
 build.gradle.kts                                |   6 +++---
 msl.jks                                         | Bin 0 -> 2626 bytes
 octopus_clash.jks                               | Bin 2500 -> 0 bytes
 signing.properties                              |   8 ++++----
 6 files changed, 8 insertions(+), 30 deletions(-)
 create mode 100644 msl.jks
 delete mode 100644 octopus_clash.jks

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 6770e14..c1f318d 100644
--- a/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
+++ b/app/src/main/java/com/yingmao/clash/fragment/NewAccFragment.kt
@@ -89,8 +89,6 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
     private  lateinit var  clickOnLink: ConstraintLayout
     private  lateinit var  InTheLink: AppCompatImageView
     private  lateinit var  ClickTheLink: TextView
-
-    private  lateinit var  lottieView: LottieAnimationView
     override fun init(
         titleBarRl: RelativeLayout,
         backIv: ImageView,
@@ -150,9 +148,6 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
         clickOnLink=view.findViewById(R.id.clickOnLink)
         InTheLink=view.findViewById(R.id.InTheLink)
         ClickTheLink=view.findViewById(R.id.ClickTheLink)
-        lottieView=view.findViewById(R.id.lottieView)
-        lottieView.setAnimation(R.raw.mylinek)
-        lottieView.pauseAnimation()
         clickOnLink.setOnClickListener {
             if (clashRunning) {
                 val rxDialogSureCancel = RxDialogSureCancel(activity)
@@ -174,7 +169,6 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
                     if(connectId!=-1){
                         accelerateViewModel.appStopStatus(connectId)
                     }
-                    lottieView.pauseAnimation()
                 }
                 rxDialogSureCancel.show()
 
@@ -252,18 +246,13 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
                             InTheLink.setImageResource(R.mipmap.ic_click)
                             ClickTheLink.text=requireActivity().resources.getString(R.string.CloseConnection)
                         }
-                        launch(Dispatchers.Main){
-                            lottieView.playAnimation()
-                        }
 
                     }else{
                         clickOnLink.setBackgroundResource(R.drawable.home_circle_connecting)
                         InTheLink.setImageResource(R.mipmap.ic_click)
                         ClickTheLink.text=requireActivity().resources.getString(R.string.CloseConnection)
                         accelerateViewModel.appStartupStatus()
-                        launch(Dispatchers.Main){
-                            lottieView.playAnimation()
-                        }
+
                     }
                 } catch (e: Exception) {
                     stop_u_timer()
@@ -276,9 +265,6 @@ class NewAccFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatch
                 InTheLink.setImageResource(R.mipmap.ic_click)
                 ClickTheLink.text=requireActivity().resources.getString(R.string.CloseConnection)
                 clickOnLink.setBackgroundResource(R.drawable.home_circle_connecting)
-                launch(Dispatchers.Main){
-                    lottieView.playAnimation()
-                }
             }
 
         }
diff --git a/app/src/main/res/layout/fragment_accelerate.xml b/app/src/main/res/layout/fragment_accelerate.xml
index 62faf51..1a75269 100644
--- a/app/src/main/res/layout/fragment_accelerate.xml
+++ b/app/src/main/res/layout/fragment_accelerate.xml
@@ -21,14 +21,6 @@
         android:layout_marginStart="50dp"
         android:layout_marginEnd="50dp"
         >
-        <com.airbnb.lottie.LottieAnimationView
-            android:id="@+id/lottieView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:lottie_autoPlay="true"
-            app:lottie_loop="true"
-            />
-
         <TextView
             android:id="@+id/ClickTheLink"
             android:layout_width="0dp"
diff --git a/build.gradle.kts b/build.gradle.kts
index 4fbfaa4..a86f34d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -58,7 +58,7 @@ subprojects {
     extensions.configure<BaseExtension> {
         defaultConfig {
             if (isApp) {
-                applicationId = "com.yingmao.clash"
+                applicationId = "com.jsq.mashanglian"
                 namespace = "com.yingmao.clash"
             }
 //            if (isTZ){
@@ -107,7 +107,7 @@ subprojects {
                 buildConfigField("boolean", "is_back_cn", "false")
                 buildConfigField("boolean", "is_ym", "true")
                 buildConfigField("boolean", "is_tz", "false")
-                buildConfigField("String", "applicationId", "\"com.yingmao.clash\"")
+                buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"")
                 buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"")
                 buildConfigField("boolean", "is_free", "false")
                 buildConfigField("String", "productId", "\"9972\"")
@@ -133,7 +133,7 @@ subprojects {
                     val prop = Properties().apply {
                         keystore.inputStream().use(this::load)
                     }
-                    storeFile = rootProject.file("octopus_clash.jks")
+                    storeFile = rootProject.file("msl.jks")
                     storePassword = prop.getProperty("keystore.password")!!
                     keyAlias = prop.getProperty("key.alias")!!
                     keyPassword = prop.getProperty("key.password")!!
diff --git a/msl.jks b/msl.jks
new file mode 100644
index 0000000000000000000000000000000000000000..14a51303452a7e5226414eaf43d6837291a27b07
GIT binary patch
literal 2626
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
Gl<-fb=CPvy

literal 0
HcmV?d00001

diff --git a/octopus_clash.jks b/octopus_clash.jks
deleted file mode 100644
index c4d802a291740d2e7720b87d7098dd05d7f84da1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2500
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

diff --git a/signing.properties b/signing.properties
index f94ab4d..ef5d252 100644
--- a/signing.properties
+++ b/signing.properties
@@ -1,4 +1,4 @@
-keystore.path=/Users/pc/open_v/v_clash_android/octopus_clash.jks
-keystore.password=123456
-key.alias=key0
-key.password=123456
\ No newline at end of file
+keystore.path=/Users/pc/open_v/v_clash_android/msl.jks
+keystore.password=msl136400
+key.alias=key
+key.password=msl136400
\ No newline at end of file