feat: 提交0.4加速版二维码直传与自动配网优化
This commit is contained in:
@@ -11,9 +11,12 @@ import android.hardware.camera2.CaptureRequest
|
||||
import android.net.Network
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.util.Range
|
||||
import android.util.Size
|
||||
import android.view.Gravity
|
||||
import android.view.MotionEvent
|
||||
import android.view.ScaleGestureDetector
|
||||
import android.view.ViewGroup
|
||||
import android.widget.Button
|
||||
import android.widget.FrameLayout
|
||||
@@ -55,10 +58,17 @@ class MainActivity : ComponentActivity() {
|
||||
private var qrLockOverlay: QrLockOverlay? = null
|
||||
private var scannerStatsText: TextView? = null
|
||||
private var scannerLockText: TextView? = null
|
||||
private var scannerZoomText: TextView? = null
|
||||
private var scannerMode = ScannerMode.NONE
|
||||
private var pendingScannerMode = ScannerMode.NONE
|
||||
private val pairConsumed = AtomicBoolean(false)
|
||||
|
||||
private data class CameraFpsPlan(
|
||||
val normalCandidates: List<Range<Int>>,
|
||||
val highestNormalFps: Int,
|
||||
val highestConstrainedHighSpeedFps: Int?,
|
||||
)
|
||||
|
||||
private lateinit var previewView: PreviewView
|
||||
private lateinit var titleText: TextView
|
||||
private lateinit var deviceText: TextView
|
||||
@@ -74,12 +84,20 @@ class MainActivity : ComponentActivity() {
|
||||
private var sendProgress: ProgressBar? = null
|
||||
private var sendButton: Button? = null
|
||||
private var connectingStatusText: TextView? = null
|
||||
private var downloadStatusText: TextView? = null
|
||||
@Volatile private var downloadRunning = false
|
||||
@Volatile private var pairConnectionAttempt = 0L
|
||||
|
||||
private val requestCamera = registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
|
||||
if (granted) startScanner(pendingScannerMode) else showHome("需要相机权限才能扫描 QFT 二维码")
|
||||
}
|
||||
|
||||
private val requestLegacyStorage = registerForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
|
||||
val pair = pendingPair
|
||||
if (granted && pair?.direction == TransferDirection.DOWNLOAD_TO_PHONE) {
|
||||
connectPair(pair)
|
||||
return@registerForActivityResult
|
||||
}
|
||||
if (granted) requestScanner(pendingScannerMode) else showHome("Android 7~9 需要存储权限才能把光学接收文件保存到 Downloads/QFT")
|
||||
}
|
||||
|
||||
@@ -118,6 +136,7 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
private fun showHome(message: String? = null) {
|
||||
pairConnectionAttempt++
|
||||
stopCamera()
|
||||
scannerMode = ScannerMode.NONE
|
||||
pairConsumed.set(false)
|
||||
@@ -125,6 +144,8 @@ class MainActivity : ComponentActivity() {
|
||||
pendingPair = null
|
||||
connectedNetwork = null
|
||||
connectedBaseUrl = null
|
||||
downloadRunning = false
|
||||
downloadStatusText = null
|
||||
selectedFiles.clear()
|
||||
|
||||
val root = pageColumn()
|
||||
@@ -146,10 +167,10 @@ class MainActivity : ComponentActivity() {
|
||||
) { requestScanner(ScannerMode.OPTICAL) })
|
||||
root.addView(space(16))
|
||||
root.addView(modeCard(
|
||||
title = "手机 → 电脑",
|
||||
badge = "扫码直连 · 快速发现 · 8路并行",
|
||||
body = "扫描电脑上的接收二维码,自动请求连接 QFT 临时 Wi-Fi,然后把文件直接上传到电脑指定文件夹。",
|
||||
buttonLabel = "扫码连接电脑",
|
||||
title = "扫码直传",
|
||||
badge = "手机上传 / 电脑下发 · 自动配网 · 快速发现",
|
||||
body = "扫描电脑二维码后自动连接 QFT 本地网络:接收二维码会进入手机选文件上传;下发二维码会自动下载并保存到 Downloads/QFT。",
|
||||
buttonLabel = "扫描电脑二维码",
|
||||
) { requestScanner(ScannerMode.PAIR) })
|
||||
root.addView(space(22))
|
||||
root.addView(text("本机设备:$receiverDeviceLabel", 13f, MUTED))
|
||||
@@ -158,6 +179,10 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
private fun requestScanner(mode: ScannerMode) {
|
||||
if (mode == ScannerMode.PAIR) {
|
||||
pairConnectionAttempt++
|
||||
wifiConnector.release()
|
||||
}
|
||||
pendingScannerMode = mode
|
||||
if (mode == ScannerMode.OPTICAL && Build.VERSION.SDK_INT <= 28 &&
|
||||
checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
|
||||
@@ -181,11 +206,19 @@ class MainActivity : ComponentActivity() {
|
||||
future.addListener({
|
||||
val provider = future.get()
|
||||
cameraProvider = provider
|
||||
val requestedFps = chooseCameraFpsRange()
|
||||
val fpsPlan = chooseCameraFpsPlan()
|
||||
val requestedFps = fpsPlan.normalCandidates.first()
|
||||
Log.i(
|
||||
TAG,
|
||||
"normalRanges=${fpsPlan.normalCandidates.joinToString()} " +
|
||||
"highestNormal=${fpsPlan.highestNormalFps} " +
|
||||
"constrainedHighSpeed=${fpsPlan.highestConstrainedHighSpeedFps} " +
|
||||
"requested=$requestedFps",
|
||||
)
|
||||
|
||||
// CameraX 1.4.x ImageAnalysis.Builder has no public setTargetFrameRate().
|
||||
// Apply a range actually advertised by the selected back camera via
|
||||
// Camera2Interop to both bound use cases.
|
||||
// CameraX exposes no public target-frame-rate setter for
|
||||
// ImageAnalysis. Apply the highest normal Camera2 range to both
|
||||
// bound use cases through the Camera2 interop layer.
|
||||
val previewBuilder = Preview.Builder()
|
||||
Camera2Interop.Extender(previewBuilder).setCaptureRequestOption(
|
||||
CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,
|
||||
@@ -204,7 +237,7 @@ class MainActivity : ComponentActivity() {
|
||||
ScannerMode.NONE -> Unit
|
||||
}
|
||||
},
|
||||
onStats = { cameraFps, decodedFps, distinctFps, decodeMs ->
|
||||
onStats = { cameraFps, decodedFps, distinctFps, attemptedFps, decodeMs ->
|
||||
runOnUiThread {
|
||||
val quality = when (mode) {
|
||||
ScannerMode.PAIR -> when {
|
||||
@@ -221,11 +254,13 @@ class MainActivity : ComponentActivity() {
|
||||
ScannerMode.NONE -> "空闲" to MUTED
|
||||
}
|
||||
scannerStatsText?.text = if (mode == ScannerMode.OPTICAL) {
|
||||
"%s · 相机 %.1f FPS · 解码 %.1f/s · 新帧 %.1f/s · %.1fms/次".format(
|
||||
quality.first, cameraFps, decodedFps, distinctFps, decodeMs
|
||||
"%s · 相机 %.1f FPS · 解码 %.1f/s · 新帧 %.1f/s · 尝试 %.1f/s · %.1fms/次".format(
|
||||
quality.first, cameraFps, decodedFps, distinctFps, attemptedFps, decodeMs
|
||||
)
|
||||
} else {
|
||||
"%s · 相机 %.1f FPS · 解码 %.1f/s · %.1fms/次".format(quality.first, cameraFps, decodedFps, decodeMs)
|
||||
"%s · 相机 %.1f FPS · 解码 %.1f/s · 尝试 %.1f/s · %.1fms/次".format(
|
||||
quality.first, cameraFps, decodedFps, attemptedFps, decodeMs
|
||||
)
|
||||
}
|
||||
scannerStatsText?.setTextColor(quality.second)
|
||||
}
|
||||
@@ -234,15 +269,19 @@ class MainActivity : ComponentActivity() {
|
||||
runOnUiThread {
|
||||
qrLockOverlay?.update(lock)
|
||||
if (mode == ScannerMode.OPTICAL) {
|
||||
if (lock.locked && lock.misses == 0) maybeRefocusLockedQr()
|
||||
if (lock.locked && lock.misses == 0 && lock.stability >= 0.67f) maybeRefocusLockedQr()
|
||||
scannerLockText?.text = if (lock.locked) {
|
||||
val lockHint = if (lock.misses == 0) "稳定锁定" else "保持锁定 · miss ${lock.misses}"
|
||||
val lockHint = when {
|
||||
lock.misses > 0 -> "保持锁定 · miss ${lock.misses}"
|
||||
lock.stability < 0.67f -> "正在稳定取景框"
|
||||
else -> "稳定锁定"
|
||||
}
|
||||
"$lockHint · 仅分析 ${(lock.searchAreaFraction * 100f).toInt().coerceIn(1, 100)}% 画面"
|
||||
} else {
|
||||
"区域锁定:搜索中 · 让单个大二维码占取景框 50% 以上"
|
||||
}
|
||||
scannerLockText?.setTextColor(
|
||||
if (!lock.locked) ACCENT else if (lock.misses == 0) SUCCESS else WARNING
|
||||
if (!lock.locked) ACCENT else if (lock.misses > 0) WARNING else if (lock.stability >= 0.67f) SUCCESS else ACCENT
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -257,10 +296,15 @@ class MainActivity : ComponentActivity() {
|
||||
val analysisBuilder = ImageAnalysis.Builder()
|
||||
.setTargetResolution(targetSize)
|
||||
.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
|
||||
.setImageQueueDepth(1)
|
||||
Camera2Interop.Extender(analysisBuilder).setCaptureRequestOption(
|
||||
CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE,
|
||||
requestedFps,
|
||||
)
|
||||
Camera2Interop.Extender(analysisBuilder).setCaptureRequestOption(
|
||||
CaptureRequest.CONTROL_AF_MODE,
|
||||
CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE,
|
||||
)
|
||||
val analysis = analysisBuilder.build().also { it.setAnalyzer(cameraExecutor, analyzer) }
|
||||
|
||||
provider.unbindAll()
|
||||
@@ -280,6 +324,7 @@ class MainActivity : ComponentActivity() {
|
||||
val fallbackAnalysis = ImageAnalysis.Builder()
|
||||
.setTargetResolution(targetSize)
|
||||
.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
|
||||
.setImageQueueDepth(1)
|
||||
.build().also { it.setAnalyzer(cameraExecutor, analyzer) }
|
||||
scannerStatsText?.text = "设备拒绝显式高帧率请求 · 已回退相机自动 FPS · 等待首帧…"
|
||||
provider.bindToLifecycle(
|
||||
@@ -290,6 +335,7 @@ class MainActivity : ComponentActivity() {
|
||||
)
|
||||
}
|
||||
activeCamera = camera
|
||||
updateScannerZoom(camera.cameraInfo.zoomState.value?.zoomRatio ?: 1f)
|
||||
|
||||
previewView.post {
|
||||
if (previewView.width <= 0 || previewView.height <= 0) return@post
|
||||
@@ -338,24 +384,99 @@ class MainActivity : ComponentActivity() {
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
|
||||
private fun chooseCameraFpsRange(): Range<Int> {
|
||||
private fun adjustScannerZoom(scale: Float) {
|
||||
val camera = activeCamera ?: return
|
||||
val zoom = camera.cameraInfo.zoomState.value ?: return
|
||||
val next = (zoom.zoomRatio * scale).coerceIn(zoom.minZoomRatio, zoom.maxZoomRatio)
|
||||
try {
|
||||
camera.cameraControl.setZoomRatio(next)
|
||||
updateScannerZoom(next)
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
|
||||
private fun updateScannerZoom(ratio: Float) {
|
||||
scannerZoomText?.text = "缩放 %.1fx · 双指缩放,点按二维码处重新聚焦".format(ratio)
|
||||
}
|
||||
|
||||
private fun focusScannerAt(x: Float, y: Float) {
|
||||
val camera = activeCamera ?: return
|
||||
if (previewView.width <= 0 || previewView.height <= 0) return
|
||||
try {
|
||||
val point = previewView.meteringPointFactory.createPoint(x, y)
|
||||
val action = FocusMeteringAction.Builder(
|
||||
point,
|
||||
FocusMeteringAction.FLAG_AF or FocusMeteringAction.FLAG_AE,
|
||||
).setAutoCancelDuration(3, TimeUnit.SECONDS).build()
|
||||
camera.cameraControl.startFocusAndMetering(action)
|
||||
scannerLockText?.text = "已在点按位置重新聚焦"
|
||||
scannerLockText?.setTextColor(ACCENT)
|
||||
} catch (_: Exception) {}
|
||||
}
|
||||
|
||||
private fun installScannerGestures(target: android.view.View) {
|
||||
var downX = 0f
|
||||
var downY = 0f
|
||||
var scaled = false
|
||||
val detector = ScaleGestureDetector(this, object : ScaleGestureDetector.SimpleOnScaleGestureListener() {
|
||||
override fun onScaleBegin(detector: ScaleGestureDetector): Boolean {
|
||||
scaled = true
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onScale(detector: ScaleGestureDetector): Boolean {
|
||||
adjustScannerZoom(detector.scaleFactor)
|
||||
return true
|
||||
}
|
||||
})
|
||||
target.setOnTouchListener { _, event ->
|
||||
detector.onTouchEvent(event)
|
||||
when (event.actionMasked) {
|
||||
MotionEvent.ACTION_DOWN -> {
|
||||
downX = event.x
|
||||
downY = event.y
|
||||
scaled = false
|
||||
}
|
||||
MotionEvent.ACTION_UP -> {
|
||||
val dx = event.x - downX
|
||||
val dy = event.y - downY
|
||||
val tapSlop = dp(12).toFloat()
|
||||
if (!scaled && dx * dx + dy * dy <= tapSlop * tapSlop) {
|
||||
focusScannerAt(event.x, event.y)
|
||||
}
|
||||
}
|
||||
MotionEvent.ACTION_CANCEL -> scaled = false
|
||||
}
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
private fun chooseCameraFpsPlan(): CameraFpsPlan {
|
||||
return try {
|
||||
val manager = getSystemService(android.content.Context.CAMERA_SERVICE) as CameraManager
|
||||
val characteristics = manager.cameraIdList
|
||||
.asSequence()
|
||||
.map { manager.getCameraCharacteristics(it) }
|
||||
.firstOrNull { it.get(CameraCharacteristics.LENS_FACING) == CameraCharacteristics.LENS_FACING_BACK }
|
||||
val ranges = characteristics?.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)
|
||||
?.toList().orEmpty()
|
||||
ranges
|
||||
.filter { it.upper <= 60 && it.lower <= 30 }
|
||||
.maxWithOrNull(compareBy<Range<Int>> { it.upper }.thenBy { it.lower })
|
||||
?: ranges.filter { it.upper <= 60 }
|
||||
.maxWithOrNull(compareBy<Range<Int>> { it.upper }.thenBy { it.lower })
|
||||
?: ranges.maxWithOrNull(compareBy<Range<Int>> { it.upper }.thenBy { it.lower })
|
||||
?: Range(30, 30)
|
||||
val normalRanges = characteristics
|
||||
?.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES)
|
||||
?.filter { it.lower > 0 && it.upper >= it.lower }
|
||||
?.sortedWith(compareByDescending<Range<Int>> { it.upper }.thenByDescending { it.lower })
|
||||
.orEmpty()
|
||||
val highSpeed = characteristics
|
||||
?.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP)
|
||||
?.highSpeedVideoFpsRanges
|
||||
?.maxOfOrNull { it.upper }
|
||||
CameraFpsPlan(
|
||||
normalCandidates = normalRanges.ifEmpty { listOf(Range(30, 30)) },
|
||||
highestNormalFps = normalRanges.maxOfOrNull { it.upper } ?: 30,
|
||||
highestConstrainedHighSpeedFps = highSpeed,
|
||||
)
|
||||
} catch (_: Exception) {
|
||||
Range(30, 30)
|
||||
CameraFpsPlan(
|
||||
normalCandidates = listOf(Range(30, 30)),
|
||||
highestNormalFps = 30,
|
||||
highestConstrainedHighSpeedFps = null,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -368,6 +489,9 @@ class MainActivity : ComponentActivity() {
|
||||
root.addView(previewView, FrameLayout.LayoutParams(-1, -1))
|
||||
qrLockOverlay = QrLockOverlay(this)
|
||||
root.addView(qrLockOverlay, FrameLayout.LayoutParams(-1, -1))
|
||||
// The overlay is above PreviewView, so it owns both gestures: one-finger
|
||||
// tap selects AF/AE, and a two-finger gesture adjusts CameraX zoom.
|
||||
installScannerGestures(qrLockOverlay!!)
|
||||
|
||||
val top = LinearLayout(this).apply {
|
||||
orientation = LinearLayout.HORIZONTAL
|
||||
@@ -404,6 +528,14 @@ class MainActivity : ComponentActivity() {
|
||||
12f, ACCENT
|
||||
)
|
||||
panel.addView(scannerLockText, matchWrap(top = 6))
|
||||
val zoomRow = LinearLayout(this).apply { gravity = Gravity.CENTER_VERTICAL }
|
||||
val zoomOut = button("−").apply { setOnClickListener { adjustScannerZoom(0.80f) } }
|
||||
val zoomIn = button("+").apply { setOnClickListener { adjustScannerZoom(1.25f) } }
|
||||
scannerZoomText = text("缩放 1.0x · 双指缩放,点按二维码处重新聚焦", 12f, MUTED)
|
||||
zoomRow.addView(zoomOut, LinearLayout.LayoutParams(dp(48), dp(42)))
|
||||
zoomRow.addView(scannerZoomText, LinearLayout.LayoutParams(0, -2, 1f).apply { marginStart = dp(8); marginEnd = dp(8) })
|
||||
zoomRow.addView(zoomIn, LinearLayout.LayoutParams(dp(48), dp(42)))
|
||||
panel.addView(zoomRow, matchWrap(top = 6))
|
||||
scannerStatsText = text("相机分析:等待首帧…", 12f, ACCENT)
|
||||
panel.addView(scannerStatsText, matchWrap(top = 4))
|
||||
panel.addView(progress, LinearLayout.LayoutParams(-1, dp(8)).apply { topMargin = dp(12) })
|
||||
@@ -426,7 +558,13 @@ class MainActivity : ComponentActivity() {
|
||||
runOnUiThread {
|
||||
stopCamera()
|
||||
showConnecting(pair, "二维码已识别,正在准备本地连接…")
|
||||
ensureWifiPermissionThenConnect(pair)
|
||||
if (pair.direction == TransferDirection.DOWNLOAD_TO_PHONE && Build.VERSION.SDK_INT <= 28 &&
|
||||
checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
requestLegacyStorage.launch(Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||
} else {
|
||||
ensureWifiPermissionThenConnect(pair)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -444,13 +582,18 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
private fun connectPair(pair: PairingPayload) {
|
||||
val attempt = ++pairConnectionAttempt
|
||||
showConnecting(pair, pair.wifi?.let { "正在请求连接 ${it.ssid}…" } ?: "正在使用当前局域网探测电脑…")
|
||||
wifiConnector.connect(
|
||||
pairing = pair,
|
||||
onStatus = { message -> runOnUiThread { updateConnectingStatus(message) } },
|
||||
onAvailable = { network ->
|
||||
onStatus = { message -> runOnUiThread {
|
||||
if (attempt == pairConnectionAttempt) updateConnectingStatus(message)
|
||||
} },
|
||||
onAvailable = available@{ network ->
|
||||
if (attempt != pairConnectionAttempt) return@available
|
||||
connectedNetwork = network
|
||||
transferExecutor.execute {
|
||||
if (attempt != pairConnectionAttempt) return@execute
|
||||
runOnUiThread { updateConnectingStatus("网络路由已就绪 · 正在 UDP 快速发现电脑…") }
|
||||
val discovered = UploadClient.discoverUdp(
|
||||
network = network,
|
||||
@@ -479,16 +622,35 @@ class MainActivity : ComponentActivity() {
|
||||
subnetEndpoints = subnet,
|
||||
)
|
||||
runOnUiThread {
|
||||
if (attempt != pairConnectionAttempt) return@runOnUiThread
|
||||
if (base == null) {
|
||||
showPairError(pair, "Wi-Fi 已连接,但快速发现、网关探测和当前子网扫描都未找到 QFT 接收服务。请保持 Windows 接收页开启,并在 Windows 防火墙首次弹窗时允许 QFT 访问专用网络。")
|
||||
} else {
|
||||
connectedBaseUrl = base
|
||||
showSendReady(pair, base)
|
||||
if (pair.direction == TransferDirection.DOWNLOAD_TO_PHONE) {
|
||||
startDownloadFromPc(pair, base)
|
||||
} else {
|
||||
showSendReady(pair, base)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
onUnavailable = { message -> runOnUiThread { showPairError(pair, message) } },
|
||||
onUnavailable = { message -> runOnUiThread {
|
||||
if (attempt != pairConnectionAttempt) return@runOnUiThread
|
||||
// Huawei can report onLost while a bound local-only HTTP
|
||||
// socket is unwinding. Let DownloadClient surface its precise
|
||||
// HTTP/timeout cause instead of replacing it with this generic
|
||||
// message mid-retry.
|
||||
if (pair.direction == TransferDirection.DOWNLOAD_TO_PHONE && downloadRunning) {
|
||||
downloadStatusText?.apply {
|
||||
text = "QFT 本地网络已断开,正在结束当前下载请求…"
|
||||
setTextColor(WARNING)
|
||||
}
|
||||
} else {
|
||||
showPairError(pair, message)
|
||||
}
|
||||
} },
|
||||
)
|
||||
}
|
||||
|
||||
@@ -518,6 +680,13 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
private fun showPairError(pair: PairingPayload?, message: String) {
|
||||
// Do not unregister here: Android may still be displaying its
|
||||
// Wi-Fi-selection sheet, and unregistering at that moment produces
|
||||
// "the app cancelled the device selection request". The next attempt
|
||||
// (or returning home) releases the previous request safely.
|
||||
pairConnectionAttempt++
|
||||
connectedNetwork = null
|
||||
connectedBaseUrl = null
|
||||
val root = pageColumn()
|
||||
root.addView(text("连接未完成", 28f, Color.WHITE, true))
|
||||
root.addView(text(message, 15f, WARNING), matchWrap(top = 12))
|
||||
@@ -572,6 +741,65 @@ class MainActivity : ComponentActivity() {
|
||||
renderSelectedFiles()
|
||||
}
|
||||
|
||||
private fun startDownloadFromPc(pair: PairingPayload, baseUrl: String) {
|
||||
val fileName = pair.fileName ?: "qft-download.bin"
|
||||
val total = pair.fileSize ?: 0L
|
||||
val root = pageColumn()
|
||||
root.addView(text("正在接收文件", 28f, Color.WHITE, true))
|
||||
root.addView(text("${pair.pcName} → $receiverDeviceLabel", 16f, ACCENT))
|
||||
root.addView(space(18))
|
||||
root.addView(card().apply {
|
||||
addView(text("扫码配置已完成", 17f, SUCCESS, true))
|
||||
addView(text("电脑已自动确认会话,正在通过本地网络直接传输。", 14f, MUTED), matchWrap(top = 8))
|
||||
addView(text(fileName, 15f, Color.WHITE), matchWrap(top = 12))
|
||||
addView(text(humanBytes(total), 13f, MUTED), matchWrap(top = 4))
|
||||
})
|
||||
root.addView(space(14))
|
||||
val status = text("正在建立文件下载…", 14f, MUTED)
|
||||
downloadStatusText = status
|
||||
val bar = ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal).apply { max = 1000 }
|
||||
root.addView(status)
|
||||
root.addView(bar, LinearLayout.LayoutParams(-1, dp(9)).apply { topMargin = dp(12) })
|
||||
root.addView(space(18))
|
||||
root.addView(button("取消并返回首页").apply { setOnClickListener { showHome() } })
|
||||
setContentView(ScrollView(this).apply { setBackgroundColor(BG); addView(root) })
|
||||
|
||||
downloadRunning = true
|
||||
transferExecutor.execute {
|
||||
try {
|
||||
val startedAt = android.os.SystemClock.elapsedRealtime()
|
||||
val saved = DownloadClient.download(
|
||||
context = this@MainActivity,
|
||||
resolver = contentResolver,
|
||||
network = connectedNetwork,
|
||||
baseUrl = baseUrl,
|
||||
pairing = pair,
|
||||
deviceName = receiverDeviceLabel,
|
||||
) { received, expected ->
|
||||
runOnUiThread {
|
||||
val fraction = if (expected <= 0) 0 else ((received * 1000L) / expected).toInt().coerceIn(0, 1000)
|
||||
val elapsed = (android.os.SystemClock.elapsedRealtime() - startedAt).coerceAtLeast(1L)
|
||||
val rate = received * 1000.0 / elapsed
|
||||
bar.progress = fraction
|
||||
status.text = "${humanBytes(received)} / ${humanBytes(expected)} · ${humanBytes(rate.toLong())}/s"
|
||||
}
|
||||
}
|
||||
runOnUiThread {
|
||||
bar.progress = 1000
|
||||
status.setTextColor(SUCCESS)
|
||||
status.text = "接收完成:已保存到 Downloads/QFT/${saved.name}"
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
runOnUiThread {
|
||||
downloadRunning = false
|
||||
showPairError(pair, "从电脑接收失败:${e.message}")
|
||||
}
|
||||
} finally {
|
||||
downloadRunning = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun renderSelectedFiles() {
|
||||
val total = selectedFiles.sumOf { it.size }
|
||||
sendFilesText?.text = if (selectedFiles.isEmpty()) {
|
||||
@@ -671,6 +899,7 @@ class MainActivity : ComponentActivity() {
|
||||
qrLockOverlay = null
|
||||
scannerStatsText = null
|
||||
scannerLockText = null
|
||||
scannerZoomText = null
|
||||
scannerMode = ScannerMode.NONE
|
||||
}
|
||||
|
||||
@@ -762,6 +991,7 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val TAG = "QftCamera"
|
||||
private const val BG = 0xFF0B0E13.toInt()
|
||||
private const val CARD = 0xFF151A22.toInt()
|
||||
private const val MUTED = 0xFF9AA4B2.toInt()
|
||||
|
||||
Reference in New Issue
Block a user