refactor: 注释移除 Compose 相关代码,统一入口替换为 HomeActivity
- 注释掉全部 Compose UI 代码(ui/、theme/、NavController、MainActivity、InitActivity 等) - BorderExt、TextExt、ToastUtils、LoadingState 中的 Compose 逻辑全部注释 - LoadingState 保留 show()/hide() 空方法避免编译报错 - 注释 SensorScaleUtils、BaseViewModel、DeviceViewModel 中的 ToastUtils 调用 - BootReceiver、CrashHandler 中 MainActivity 替换为 HomeActivity - UserViewModel、PurchaseOrderActivity 删除残余 Compose import - build.gradle.kts 替换为非 Compose 的 activity-ktx 和 coil 依赖 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -5,9 +5,9 @@ import android.net.Uri
|
||||
import androidx.camera.core.ImageCapture
|
||||
import androidx.camera.core.ImageCaptureException
|
||||
import androidx.camera.view.CameraController
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
//import androidx.compose.runtime.Composable
|
||||
//import androidx.compose.runtime.remember
|
||||
//import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.core.content.ContextCompat
|
||||
import timber.log.Timber
|
||||
import java.io.File
|
||||
@@ -101,21 +101,21 @@ class PhotoCaptureHelper(
|
||||
* @param onError (String) -> Unit 拍照失败回调
|
||||
* @return Pair<PhotoCaptureHelper, () -> Unit> 返回工具类实例和拍照函数
|
||||
*/
|
||||
@Composable
|
||||
fun rememberPhotoCapture(
|
||||
cameraController: CameraController,
|
||||
onSuccess: (Uri) -> Unit = {},
|
||||
onError: (String) -> Unit = {}
|
||||
): Pair<PhotoCaptureHelper, () -> Unit> {
|
||||
val context = LocalContext.current
|
||||
val photoCaptureHelper = remember {
|
||||
PhotoCaptureHelper(
|
||||
context = context,
|
||||
cameraController = cameraController,
|
||||
onSuccess = onSuccess,
|
||||
onError = onError
|
||||
)
|
||||
}
|
||||
|
||||
return Pair(photoCaptureHelper) { photoCaptureHelper.takePhoto() }
|
||||
}
|
||||
//@Composable
|
||||
//fun rememberPhotoCapture(
|
||||
// cameraController: CameraController,
|
||||
// onSuccess: (Uri) -> Unit = {},
|
||||
// onError: (String) -> Unit = {}
|
||||
//): Pair<PhotoCaptureHelper, () -> Unit> {
|
||||
// val context = LocalContext.current
|
||||
// val photoCaptureHelper = remember {
|
||||
// PhotoCaptureHelper(
|
||||
// context = context,
|
||||
// cameraController = cameraController,
|
||||
// onSuccess = onSuccess,
|
||||
// onError = onError
|
||||
// )
|
||||
// }
|
||||
//
|
||||
// return Pair(photoCaptureHelper) { photoCaptureHelper.takePhoto() }
|
||||
//}
|
||||
|
||||
Reference in New Issue
Block a user