bug fix :vpn初始化关闭之后未正常关闭dialog

This commit is contained in:
level 2025-07-21 12:01:01 +08:00
parent 662bfcb252
commit 3729279449
1 changed files with 1 additions and 12 deletions

View File

@ -1,8 +1,6 @@
package com.yingmao.clash.fragment.setting package com.yingmao.clash.fragment.setting
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.AlarmManager
import android.app.PendingIntent
import android.content.ClipData import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
import android.content.Context import android.content.Context
@ -11,8 +9,6 @@ import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Environment import android.os.Environment
import android.os.Handler
import android.os.Looper
import android.provider.Settings import android.provider.Settings
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
@ -43,14 +39,12 @@ import com.google.gson.Gson
import com.hjq.permissions.OnPermissionCallback import com.hjq.permissions.OnPermissionCallback
import com.hjq.permissions.Permission import com.hjq.permissions.Permission
import com.hjq.permissions.XXPermissions import com.hjq.permissions.XXPermissions
import com.jakewharton.processphoenix.ProcessPhoenix
import com.orhanobut.logger.Logger import com.orhanobut.logger.Logger
import com.tencent.mmkv.MMKV import com.tencent.mmkv.MMKV
import com.yingmao.clash.BuildConfig import com.yingmao.clash.BuildConfig
import com.yingmao.clash.R import com.yingmao.clash.R
import com.yingmao.clash.act.AgreementAndPrivacyActivity import com.yingmao.clash.act.AgreementAndPrivacyActivity
import com.yingmao.clash.act.ChangePwdActivity import com.yingmao.clash.act.ChangePwdActivity
import com.yingmao.clash.act.InstallApplicationActivity
import com.yingmao.clash.act.LoginActivity import com.yingmao.clash.act.LoginActivity
import com.yingmao.clash.act.LossPreventionActivity import com.yingmao.clash.act.LossPreventionActivity
import com.yingmao.clash.act.ShareActivity import com.yingmao.clash.act.ShareActivity
@ -62,14 +56,11 @@ import com.yingmao.clash.act.UIMainActivity.Companion.newUuid
import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder import com.yingmao.clash.act.UIMainActivity.Companion.profileBinder
import com.yingmao.clash.act.UIMainActivity.Companion.subUrl import com.yingmao.clash.act.UIMainActivity.Companion.subUrl
import com.yingmao.clash.app.MainApplication import com.yingmao.clash.app.MainApplication
import com.yingmao.clash.base.BaseActivity
import com.yingmao.clash.conf.BZYConstants import com.yingmao.clash.conf.BZYConstants
import com.yingmao.clash.conf.Conf import com.yingmao.clash.conf.Conf
import com.yingmao.clash.entity.CheckLoginRsp import com.yingmao.clash.entity.CheckLoginRsp
import com.yingmao.clash.entity.LanguageInfoEntity import com.yingmao.clash.entity.LanguageInfoEntity
import com.yingmao.clash.fragment.BaseFragment import com.yingmao.clash.fragment.BaseFragment
import com.yingmao.clash.fragment.NewAccFragment
import com.yingmao.clash.fragment.NewAccFragment.Companion
import com.yingmao.clash.fragment.home.HomeFragment import com.yingmao.clash.fragment.home.HomeFragment
import com.yingmao.clash.fragment.home.HomeFragment.Companion.clashRunning import com.yingmao.clash.fragment.home.HomeFragment.Companion.clashRunning
import com.yingmao.clash.net.http.HttpReqType import com.yingmao.clash.net.http.HttpReqType
@ -85,7 +76,6 @@ import com.yingmao.clash.view.RxToast
import com.yingmao.clash.view.adapter.LanguageAdapter import com.yingmao.clash.view.adapter.LanguageAdapter
import com.yingmao.clash.view.dialog.DialogDoMainChoose import com.yingmao.clash.view.dialog.DialogDoMainChoose
import com.yingmao.clash.view.dialog.DialogNotice import com.yingmao.clash.view.dialog.DialogNotice
import com.yingmao.clash.view.dialog.DialogSureRestartChoose
import com.yingmao.clash.view.dialog.RxDialogShapeLoading import com.yingmao.clash.view.dialog.RxDialogShapeLoading
import com.yingmao.clash.vm.MainAtyVM import com.yingmao.clash.vm.MainAtyVM
import com.yingmao.clash.webview.BZYWebViewKeFu import com.yingmao.clash.webview.BZYWebViewKeFu
@ -100,7 +90,6 @@ import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
import java.util.UUID import java.util.UUID
import kotlin.system.exitProcess
class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatchers.IO) { class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatchers.IO) {
@ -335,7 +324,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
RxToast.info(resources.getString(R.string.AccountExpired)) RxToast.info(resources.getString(R.string.AccountExpired))
return@setOnClickListener return@setOnClickListener
} }
if(NewAccFragment.clashRunning){ if(clashRunning){
RxToast.info("请关闭加速后在进行初始化操作") RxToast.info("请关闭加速后在进行初始化操作")
return@setOnClickListener return@setOnClickListener
} }