diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5ac3305..e1b0d34 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,14 +1,8 @@ - - - - (null) } // 新增选择对话框 - var showChoiceDialog by remember { mutableStateOf(false) } + //var showChoiceDialog by remember { mutableStateOf(false) } // 新增大图预览状态 var previewImageUri by remember { mutableStateOf(null) } @@ -130,7 +130,7 @@ fun ImagePicker( } } - + /* if (showChoiceDialog) { AlertDialog( onDismissRequest = { showChoiceDialog = false }, @@ -160,6 +160,7 @@ fun ImagePicker( } ) } + */ // 全屏大图对话框 previewImageUri?.let { uri -> @@ -217,7 +218,10 @@ fun ImagePicker( AddSingleButton( imageHeight = imageHeight, aspectRatio = aspectRatio, - onClick = { showChoiceDialog = true }, + onClick = { + galleryLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) + //showChoiceDialog = true + }, label = addButtonName, ) }else{ @@ -226,7 +230,10 @@ fun ImagePicker( contentAlignment = Alignment.BottomCenter ) { AddButton( - onClick = { showChoiceDialog = true }, + onClick = { + galleryLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) + //showChoiceDialog = true + }, label = addButtonName, ) } diff --git a/app/src/main/java/com/img/rabbit/config/Constants.kt b/app/src/main/java/com/img/rabbit/config/Constants.kt index 0730a06..aee30e6 100644 --- a/app/src/main/java/com/img/rabbit/config/Constants.kt +++ b/app/src/main/java/com/img/rabbit/config/Constants.kt @@ -4,7 +4,7 @@ object Constants { const val RELEASE_BASE_URL = "https://jitutu.batiao8.com" //release const val DEBUG_BASE_URL = "https://jitutu.batiao8.com" //debug const val LOG_REQUEST = "RabbitRequest" - const val agreementUrl = "https://jitutu.batiao8.com/static/policy-jietutu/user.html" //用户协议 + const val agreementUrl = "https://jitutu.batiao8.com/static/policy-jietutu/user_android.html" //用户协议 const val privacyUrl = "https://jitutu.batiao8.com/static/policy-jietutu/provacy.html"//隐私政策 //const val getuiAppId = "40qbPjPkYs7TnVAYCX0Ig6"//个推appid (gradle.properties)