File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -48,8 +48,8 @@ class SplashActivity : AppCompatActivity() {
4848 setContentView(binding.root)
4949
5050 // 1. Kiểm tra nếu script đã chạy hoặc đang chạy thì vào thẳng Home
51- if ( ScriptEnvironmen .isInited() && isTaskRoot &&
52- ! intent.getBooleanExtra( " force_reset " , false ) ) {
51+ forceReset = intent.getBooleanExtra( " force_reset " , false )
52+ if ( ! forceReset && ScriptEnvironmen .isInited() && isTaskRoot ) {
5353 gotoHome()
5454 return
5555 }
@@ -170,7 +170,7 @@ class SplashActivity : AppCompatActivity() {
170170 binding.startStateText.text = getString(R .string.pop_started)
171171 val config = KrScriptConfig ().init (this )
172172
173- if (config.beforeStartSh.isNotEmpty()) {
173+ if (config.beforeStartSh.isNotEmpty() || forceReset ) {
174174 runBeforeStartSh(config, hasRoot)
175175 } else {
176176 gotoHome()
Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<shape xmlns : android =" http://schemas.android.com/apk/res/android"
33 android : shape =" rectangle" >
4- <solid android : color =" #33a0a0a0 " />
4+ <solid android : color =" #80C7C7C7 " />
55 <!-- 设置按钮的四个角为弧形 -->
66 <!-- android:radius 弧形的半径 -->
77 <corners android : radius =" 25dp" />
Original file line number Diff line number Diff line change 22<shape xmlns : android =" http://schemas.android.com/apk/res/android"
33 android : shape =" rectangle" >
44 <!-- 填充的颜色:这里设置背景透明 -->
5- <solid android : color =" #66888888 " />
5+ <solid android : color =" #7F888888 " />
66 <!-- 边框的颜色 :不能和窗口背景色一样-->
77 <stroke
88 android : width =" 1dp"
Original file line number Diff line number Diff line change 22<shape xmlns : android =" http://schemas.android.com/apk/res/android"
33 android : shape =" rectangle" >
44 <!-- 填充的颜色:这里设置背景透明 -->
5- <solid android : color =" #5888 " />
5+ <solid android : color =" #68888888 " />
66 <!-- 边框的颜色 :不能和窗口背景色一样-->
77 <stroke
88 android : width =" 1dp"
9- android : color =" #888 " />
9+ android : color =" #888888 " />
1010 <!-- 设置按钮的四个角为弧形 -->
1111 <!-- android:radius 弧形的半径 -->
1212 <corners android : radius =" 25dp" />
You can’t perform that action at this time.
0 commit comments