diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e73b59f..62ba0ec 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,6 +59,11 @@ android:screenOrientation="portrait" tools:ignore="DiscouragedApi,LockedOrientationActivity" /> + + () - // 延迟到下一帧 finish,避免与 LaunchActivityItem 事务竞态导致 - // "Activity client record must not be null" 偶发崩溃 - window.decorView.post { finish() } - return@launch - } - // 主设备:走原有路由逻辑 - when (SpTool.cookMode) { - 0 -> { - startActivity() - } - - 1 -> { - goSampling() - } - - else -> { - startActivity() - } - } +// if (GlobalData.deviceRole == DeviceRole.SLAVE) { +// startActivity() +// // 延迟到下一帧 finish,避免与 LaunchActivityItem 事务竞态导致 +// // "Activity client record must not be null" 偶发崩溃 +// window.decorView.post { finish() } +// return@launch +// } +// // 主设备:走原有路由逻辑 +// when (SpTool.cookMode) { +// 0 -> { +// startActivity() +// } +// +// 1 -> { +// goSampling() +// } +// +// else -> { +// startActivity() +// } +// } + startActivity() // 延迟到下一帧 finish,避免与 LaunchActivityItem 事务竞态导致 // "Activity client record must not be null" 偶发崩溃 window.decorView.post { finish() } diff --git a/app/src/main/res/drawable/bg_gradient_blue_btn.xml b/app/src/main/res/drawable/bg_gradient_blue_btn.xml new file mode 100644 index 0000000..af78694 --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_blue_btn.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_gradient_orange_btn.xml b/app/src/main/res/drawable/bg_gradient_orange_btn.xml new file mode 100644 index 0000000..0770e4f --- /dev/null +++ b/app/src/main/res/drawable/bg_gradient_orange_btn.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_home_v2.xml b/app/src/main/res/layout/activity_home_v2.xml new file mode 100644 index 0000000..e8acf46 --- /dev/null +++ b/app/src/main/res/layout/activity_home_v2.xml @@ -0,0 +1,46 @@ + + + + + + + + + +