androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
cyh 2025-07-21 12:26:08 +08:00
parent 3a3bab6909 dd4069538c
commit ef0c75737d
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt
View File

@ -569,20 +569,17 @@ class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatcher
stateChanged(Clash_Starting, true)
context?.startClashService()
mainAtyVM.appStartupStatus()
withContext(Dispatchers.Main) {
hideLoading()
}
}
} else {
mainAtyVM.appStartupStatus()
withContext(Dispatchers.Main) {
hideLoading()
}
}
} catch (e: Exception) {
stopUpLoadTimer()
e.printStackTrace()
}
withContext(Dispatchers.Main) {
hideLoading()
}
}
}

13
app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt
View File

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