diff --git a/@share/components/Video.tsx b/@share/components/Video.tsx
index 7475872..7f74d40 100644
--- a/@share/components/Video.tsx
+++ b/@share/components/Video.tsx
@@ -62,8 +62,6 @@ const VideoBox = ({
return
}
- // 缓存未命中,进行网络请求
- setUrlFinal('')
const webpUrl = await mp4ToWebpUrl({ videoUrl: url!, width, height: width })
// 只有当请求未被取消时才缓存和更新状态
@@ -85,6 +83,7 @@ const VideoBox = ({
}
useEffect(() => {
+ // 每次url变化强制刷新
setUrlFinal('')
if (!url) {
return
@@ -93,7 +92,11 @@ const VideoBox = ({
// 用于标记当前请求是否已过期
let cancelled = false
- setRedirectUrl(() => cancelled, url!)
+ setTimeout(() => {
+ if (!cancelled) {
+ setRedirectUrl(() => cancelled, url)
+ }
+ }, 0)
// 清理函数:当 url 变化或组件卸载时,标记当前请求为已取消
return () => {
@@ -156,8 +159,8 @@ const VideoBox = ({
{/* 占位图层 - 加载完成后隐藏 */}
{showPlaceholder && (
{
-
+
onConnectToggle(device)}
@@ -709,7 +709,7 @@ const GridItem = memo(
}
const imgShow = post.webpPreviewUrl || post.imageUrl
- const placeholderSrc = post.coverUrl
+ const placeholderSrc = null
// console.log('imgShow----------', imgShow)
// 新数据使用webp 旧数据使用mp4
@@ -952,9 +952,10 @@ const TopCircleSection = observer(
)
const GalleryRenderer = memo(({ selectedItem }: { selectedItem: any }) => {
- const url = selectedItem?.webpHighPreviewUrl || selectedItem?.url || selectedItem?.imageUrl
- const placeholderUrl = selectedItem?.coverUrl
- console.log('GalleryRenderer--------------', selectedItem)
+ // 本地和线上都优先使用imageUrl, 本地上传一开始没有 url
+ const url = selectedItem?.webpHighPreviewUrl || selectedItem?.imageUrl || selectedItem?.url
+ const placeholderUrl = selectedItem?.webpPreviewUrl
+ // console.log('GalleryRenderer--------------', selectedItem)
if (!url) return null
diff --git a/app/device.tsx b/app/device.tsx
index 9a3f99a..1a4e248 100644
--- a/app/device.tsx
+++ b/app/device.tsx
@@ -193,8 +193,6 @@ const Device = observer(() => {
// ✅ 显示设备信息(名称、品牌、分辨率、电池电量、内存等)
const renderDeviceInfo = () => {
- const [width, height] = deviceInfo?.size?.split('x') || ['未知', '未知']
-
return (
{/* 标题栏 */}
@@ -209,7 +207,7 @@ const Device = observer(() => {
{deviceInfo?.name && (
设备名称
- {deviceInfo.name}
+ {deviceInfo.name}
)}
@@ -225,9 +223,7 @@ const Device = observer(() => {
{deviceInfo?.size && (
分辨率
-
- {width} × {height}
-
+ {deviceInfo?.size}
)}