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

新增初始化修复

This commit is contained in:
level 2025-08-12 16:58:24 +08:00
parent be818f7aa2
commit 39fe37b817
2 changed files with 120 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/com/yingmao/clash/act/SettingActivity.kt
View File

@ -41,6 +41,7 @@ import com.yingmao.clash.BuildConfig
import com.yingmao.clash.R import com.yingmao.clash.R
import com.yingmao.clash.act.NewMainActivity.Companion.newUuid import com.yingmao.clash.act.NewMainActivity.Companion.newUuid
import com.yingmao.clash.act.NewMainActivity.Companion.profileBinder import com.yingmao.clash.act.NewMainActivity.Companion.profileBinder
import com.yingmao.clash.act.NewMainActivity.Companion.subUrl
import com.yingmao.clash.app.MainApplication import com.yingmao.clash.app.MainApplication
import com.yingmao.clash.base.BaseActivity import com.yingmao.clash.base.BaseActivity
import com.yingmao.clash.conf.BZYConstants import com.yingmao.clash.conf.BZYConstants
@ -83,6 +84,7 @@ class SettingActivity : BaseActivity() {
private lateinit var ll_yszc:ConstraintLayout private lateinit var ll_yszc:ConstraintLayout
private lateinit var ll_fwtk:ConstraintLayout private lateinit var ll_fwtk:ConstraintLayout
private lateinit var clSwitch:ConstraintLayout private lateinit var clSwitch:ConstraintLayout
private lateinit var clInit:ConstraintLayout
private lateinit var mainAtyVM: MainAtyVM private lateinit var mainAtyVM: MainAtyVM
private lateinit var ivBack: AppCompatImageView private lateinit var ivBack: AppCompatImageView
private lateinit var tvYYModel:TextView private lateinit var tvYYModel:TextView
@ -118,6 +120,31 @@ class SettingActivity : BaseActivity() {
clVersion=findViewById(R.id.clVersion) clVersion=findViewById(R.id.clVersion)
versionTv=findViewById(R.id.VersionTv) versionTv=findViewById(R.id.VersionTv)
clSwitch=findViewById(R.id.clSwitch) clSwitch=findViewById(R.id.clSwitch)
clInit=findViewById(R.id.clInit)
clInit.setOnClickListener {
if (TextUtils.isEmpty(subUrl)){
showLoading(resources.getString(R.string.tooFast), this@SettingActivity)
return@setOnClickListener
}
showLoading(resources.getString(R.string.UnderRepair), this@SettingActivity)
cleanNodeMmkv()
launch(Dispatchers.IO) {
profileBinder?.let { pm ->
pm.queryAll().forEach { profile ->
Log.d("setting profile delete ==>${profile.name}")
pm.delete(profile.uuid)
}
delay(1000)
if (subUrl?.isNotEmpty() == true) {
startTimer()
setSub2(subUrl!!,pm)
}
}
}
}
clSwitch.setOnClickListener { clSwitch.setOnClickListener {
android.util.Log.i("SourceSwitching","clashRunning::"+clashRunning) android.util.Log.i("SourceSwitching","clashRunning::"+clashRunning)
if(clashRunning){ if(clashRunning){

107
app/src/main/res/layout/activity_setting.xml
View File

@ -52,7 +52,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="20dp" android:layout_marginTop="10dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:background="@drawable/setting_bg_color" android:background="@drawable/setting_bg_color"
@ -66,7 +66,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
> >
<LinearLayout <LinearLayout
android:id="@+id/llYYModel" android:id="@+id/llYYModel"
@ -77,7 +77,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="20dp" android:layout_marginTop="10dp"
> >
<TextView <TextView
android:id="@+id/TVApplicationModeTxt" android:id="@+id/TVApplicationModeTxt"
@ -134,7 +134,7 @@
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
> >
<LinearLayout <LinearLayout
android:id="@+id/llYYControl" android:id="@+id/llYYControl"
@ -203,7 +203,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
> >
<LinearLayout <LinearLayout
android:id="@+id/llTermsService" android:id="@+id/llTermsService"
@ -215,7 +215,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
> >
<TextView <TextView
@ -257,7 +257,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -270,7 +270,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -323,7 +323,7 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="5dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
> >
<LinearLayout <LinearLayout
@ -358,17 +358,28 @@
android:src="@drawable/ic_xz" android:src="@drawable/ic_xz"
/> />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/TkLineOne"
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clLanguageChange"
android:background="#FFF"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
/>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clSwitch" android:id="@+id/clSwitch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clLanguageChange" app:layout_constraintTop_toBottomOf="@+id/TkLineOne"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="5dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
> >
<LinearLayout <LinearLayout
@ -403,17 +414,85 @@
android:src="@drawable/ic_xz" android:src="@drawable/ic_xz"
/> />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/TkLinThree"
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clSwitch"
android:background="#FFF"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clInit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/TkLinThree"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="20dp"
>
<LinearLayout
android:id="@+id/llInit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="20dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/InitializationRepair"
android:textSize="18sp"
android:textColor="#FFF"
android:textStyle="bold"
/>
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/llInit"
app:layout_constraintBottom_toBottomOf="@+id/llInit"
android:layout_marginEnd="20dp"
android:tint="#FFF"
android:src="@drawable/ic_xz"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/TkLintwo"
android:layout_width="match_parent"
android:layout_height="1dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clInit"
android:background="#FFF"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
/>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clVersion" android:id="@+id/clVersion"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clSwitch" app:layout_constraintTop_toBottomOf="@+id/TkLintwo"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="20dp" android:layout_marginTop="5dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
> >
<LinearLayout <LinearLayout