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" > - - { 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 0000000..14a5130 Binary files /dev/null and b/msl.jks differ diff --git a/octopus_clash.jks b/octopus_clash.jks deleted file mode 100644 index c4d802a..0000000 Binary files a/octopus_clash.jks and /dev/null differ 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