parent
367c7e48f0
commit
3dfc94b180
|
|
@ -769,7 +769,7 @@ private fun dealUniMpDownloadLaunch(
|
|||
val uniMpId = uniMp.unimp_id
|
||||
// 处理点击事件,微信模拟器
|
||||
if (UniAppUtils.isDownloadUniMp(uniMp)) {
|
||||
//强制更新(更新释放新版本并启动)
|
||||
//没有下载或者强制更新(更新释放新版本并启动)
|
||||
UniAppUtils.downloadWGT(
|
||||
context,
|
||||
scope,
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
package com.img.rabbit.pages.screen.make
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import android.util.Log
|
||||
import androidx.activity.compose.ManagedActivityResultLauncher
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
|
|
@ -57,6 +57,9 @@ import kotlinx.coroutines.Dispatchers
|
|||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import androidx.compose.ui.graphics.asAndroidBitmap
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.img.rabbit.R
|
||||
import com.img.rabbit.components.CenterToast
|
||||
import io.moyuru.cropify.Cropify
|
||||
import io.moyuru.cropify.CropifyOption
|
||||
|
|
@ -98,14 +101,6 @@ fun LongImageScreen(navController: NavController) {
|
|||
.fillMaxSize()
|
||||
.background(Color(0xFFF4F4F4))
|
||||
.navigationBarsPadding()
|
||||
.clickable(
|
||||
indication = null,
|
||||
interactionSource = remember { MutableInteractionSource() }
|
||||
){
|
||||
if(imageItems.isEmpty()){
|
||||
openMediaPicker(mediaPickerLauncher)
|
||||
}
|
||||
}
|
||||
) {
|
||||
TitleBar(
|
||||
navController = navController,
|
||||
|
|
@ -121,6 +116,7 @@ fun LongImageScreen(navController: NavController) {
|
|||
}
|
||||
}
|
||||
|
||||
if(imageItems.isNotEmpty()){
|
||||
// 2. 预览列表(支持每张图独立缩放)
|
||||
LazyColumn(
|
||||
modifier = Modifier.weight(1f).padding(start = 30.dp, end = 30.dp, bottom = 30.dp)
|
||||
|
|
@ -146,6 +142,38 @@ fun LongImageScreen(navController: NavController) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
Box(modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(start = 15.dp, end = 15.dp, bottom = 60.dp)
|
||||
.background(Color(0xFFFFFFFF))
|
||||
.border(1.dp, Color(0xFFD8D8D8))
|
||||
.clickable(
|
||||
interactionSource = remember { MutableInteractionSource() },
|
||||
indication = null
|
||||
) {
|
||||
openMediaPicker(mediaPickerLauncher)
|
||||
}
|
||||
){
|
||||
// 空状态
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.align(Alignment.Center)
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(id = R.mipmap.ic_image_empty_pld),
|
||||
contentDescription = "拼图",
|
||||
)
|
||||
Text(
|
||||
text = "点击选择图片",
|
||||
color = Color(0xFFD8D8D8),
|
||||
fontSize = 12.sp,
|
||||
modifier = Modifier.align(Alignment.CenterHorizontally)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
editingIndex?.let { index ->
|
||||
FullScreenCropDialog(
|
||||
item = imageItems[index],
|
||||
|
|
|
|||
Loading…
Reference in New Issue