Compare commits
30
Commits
main
...
f6c477c9be
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6c477c9be | ||
|
|
1246e41e4b | ||
|
|
26574808df | ||
|
|
d4c7d7180e | ||
|
|
4a85b9f83e | ||
|
|
e4057c3d6a | ||
|
|
90e8966528 | ||
|
|
c8a7494344 | ||
|
|
02614c2817 | ||
|
|
9f49f73a31 | ||
|
|
da2e69b014 | ||
|
|
f6347e99cd | ||
|
|
d40c13d802 | ||
|
|
23319cfddb | ||
|
|
6d93c1c8dd | ||
|
|
c9323f26a7 | ||
|
|
7dafd61314 | ||
|
|
d056d28d83 | ||
|
|
8570486798 | ||
|
|
208920dfea | ||
|
|
88d8dfda04 | ||
|
|
d39d85cd99 | ||
|
|
c01ce1dca0 | ||
|
|
25ac9c4c35 | ||
|
|
a3a02e623f | ||
|
|
7a654d54f0 | ||
|
|
de2aacca90 | ||
|
|
cf1c2d7d0e | ||
|
|
13cb3bfd7b | ||
|
|
bcd2162cd7 |
@@ -19,6 +19,7 @@ pubspec.lock
|
|||||||
*.iws
|
*.iws
|
||||||
.idea/
|
.idea/
|
||||||
.cursor
|
.cursor
|
||||||
|
Podfile.lock
|
||||||
|
|
||||||
# The .vscode folder contains launch configuration and tasks you configure in
|
# The .vscode folder contains launch configuration and tasks you configure in
|
||||||
# VS Code which you may wish to be included in version control, so this line
|
# VS Code which you may wish to be included in version control, so this line
|
||||||
@@ -47,3 +48,4 @@ app.*.map.json
|
|||||||
/android/app/release
|
/android/app/release
|
||||||
/android/.kotlin
|
/android/.kotlin
|
||||||
|
|
||||||
|
CLAUDE.md
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id("dev.flutter.flutter-gradle-plugin")
|
id("dev.flutter.flutter-gradle-plugin")
|
||||||
}
|
}
|
||||||
|
|
||||||
val appPackageName = "com.qxy.dronex"
|
val appPackageName = "com.dronex.rec"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = appPackageName
|
namespace = appPackageName
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.qxy.dronex">
|
package="com.dronex.rec">
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
@@ -10,7 +10,6 @@
|
|||||||
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
|
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
|
||||||
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
|
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||||
android:maxSdkVersion="28" />
|
android:maxSdkVersion="28" />
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.dronex.rec
|
||||||
|
|
||||||
|
object AppConstants {
|
||||||
|
private const val CHANNEL_NAMESPACE = "app.record_tool"
|
||||||
|
const val PLATFORM_INFO_CHANNEL = "$CHANNEL_NAMESPACE/platform_info"
|
||||||
|
const val RECORDING_METHOD_CHANNEL = "$CHANNEL_NAMESPACE/recording"
|
||||||
|
const val RECORDING_EVENT_CHANNEL = "$CHANNEL_NAMESPACE/recording_events"
|
||||||
|
const val RECORDING_ACTION_START = "$CHANNEL_NAMESPACE.recording.START"
|
||||||
|
const val RECORDING_ACTION_STOP = "$CHANNEL_NAMESPACE.recording.STOP"
|
||||||
|
}
|
||||||
+4
-3
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex
|
package com.dronex.rec
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.pm.ApplicationInfo
|
import android.content.pm.ApplicationInfo
|
||||||
@@ -7,8 +7,8 @@ import android.os.Build
|
|||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
import android.os.StatFs
|
import android.os.StatFs
|
||||||
import androidx.camera.view.PreviewView
|
import androidx.camera.view.PreviewView
|
||||||
import com.qxy.dronex.recording.RecordingPlatformHandler
|
import com.dronex.rec.recording.RecordingPlatformHandler
|
||||||
import com.qxy.dronex.recording.RecordingPreviewFactory
|
import com.dronex.rec.recording.RecordingPreviewFactory
|
||||||
import io.flutter.embedding.android.FlutterActivity
|
import io.flutter.embedding.android.FlutterActivity
|
||||||
import io.flutter.embedding.engine.FlutterEngine
|
import io.flutter.embedding.engine.FlutterEngine
|
||||||
import io.flutter.plugin.common.MethodChannel
|
import io.flutter.plugin.common.MethodChannel
|
||||||
@@ -114,6 +114,7 @@ class MainActivity : FlutterActivity() {
|
|||||||
"brand" to Build.BRAND,
|
"brand" to Build.BRAND,
|
||||||
"model" to Build.MODEL,
|
"model" to Build.MODEL,
|
||||||
"systemVersion" to Build.VERSION.RELEASE,
|
"systemVersion" to Build.VERSION.RELEASE,
|
||||||
|
"sdkInt" to Build.VERSION.SDK_INT,
|
||||||
"isPhysicalDevice" to !isEmulator,
|
"isPhysicalDevice" to !isEmulator,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.app.NotificationManager
|
import android.app.NotificationManager
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.app.Notification
|
import android.app.Notification
|
||||||
import android.app.NotificationChannel
|
import android.app.NotificationChannel
|
||||||
@@ -14,8 +14,8 @@ import android.os.PowerManager
|
|||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.lifecycle.LifecycleService
|
import androidx.lifecycle.LifecycleService
|
||||||
import com.qxy.dronex.AppConstants
|
import com.dronex.rec.AppConstants
|
||||||
import com.qxy.dronex.MainActivity
|
import com.dronex.rec.MainActivity
|
||||||
|
|
||||||
class RecordingForegroundService : LifecycleService() {
|
class RecordingForegroundService : LifecycleService() {
|
||||||
private var wakeLock: PowerManager.WakeLock? = null
|
private var wakeLock: PowerManager.WakeLock? = null
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
|
import android.content.ContentValues
|
||||||
|
import android.content.Context
|
||||||
|
import android.os.Build
|
||||||
|
import android.provider.MediaStore
|
||||||
|
import androidx.camera.video.FileOutputOptions
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileInputStream
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
|
object RecordingOutputFactory {
|
||||||
|
private const val RELATIVE_PATH = "Movies/飞行极控录像工作台"
|
||||||
|
private const val MIME_TYPE = "video/mp4"
|
||||||
|
|
||||||
|
fun buildSegmentOutputOptions(segmentFile: File): FileOutputOptions {
|
||||||
|
return FileOutputOptions.Builder(segmentFile).build()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createSegmentFile(
|
||||||
|
context: Context,
|
||||||
|
displayName: String?,
|
||||||
|
index: Int,
|
||||||
|
): File {
|
||||||
|
val directory = File(context.cacheDir, "recording_segments")
|
||||||
|
if (!directory.exists()) {
|
||||||
|
directory.mkdirs()
|
||||||
|
}
|
||||||
|
val baseName = resolveFileName(displayName).removeSuffix(".mp4")
|
||||||
|
return File(directory, "${baseName}_${System.currentTimeMillis()}_part$index.mp4")
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createMergeFile(context: Context, displayName: String?): File {
|
||||||
|
val directory = File(context.cacheDir, "recording_segments")
|
||||||
|
if (!directory.exists()) {
|
||||||
|
directory.mkdirs()
|
||||||
|
}
|
||||||
|
val baseName = resolveFileName(displayName).removeSuffix(".mp4")
|
||||||
|
return File(directory, "${baseName}_${System.currentTimeMillis()}_merged.mp4")
|
||||||
|
}
|
||||||
|
|
||||||
|
fun publishToMediaStore(
|
||||||
|
context: Context,
|
||||||
|
displayName: String?,
|
||||||
|
sourceFile: File,
|
||||||
|
): String? {
|
||||||
|
val fileName = resolveFileName(displayName)
|
||||||
|
val contentValues =
|
||||||
|
ContentValues().apply {
|
||||||
|
put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
|
||||||
|
put(MediaStore.MediaColumns.MIME_TYPE, MIME_TYPE)
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
put(MediaStore.Video.Media.RELATIVE_PATH, RELATIVE_PATH)
|
||||||
|
put(MediaStore.Video.Media.IS_PENDING, 1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val resolver = context.contentResolver
|
||||||
|
val uri =
|
||||||
|
resolver.insert(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, contentValues)
|
||||||
|
?: return null
|
||||||
|
try {
|
||||||
|
val outputStream =
|
||||||
|
resolver.openOutputStream(uri)
|
||||||
|
?: throw IllegalStateException("Cannot open MediaStore output stream")
|
||||||
|
outputStream.use { output ->
|
||||||
|
FileInputStream(sourceFile).use { input -> input.copyTo(output) }
|
||||||
|
}
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||||
|
val publishedValues =
|
||||||
|
ContentValues().apply { put(MediaStore.Video.Media.IS_PENDING, 0) }
|
||||||
|
resolver.update(uri, publishedValues, null, null)
|
||||||
|
}
|
||||||
|
return uri.toString()
|
||||||
|
} catch (error: Exception) {
|
||||||
|
resolver.delete(uri, null, null)
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun publishPartToMediaStore(
|
||||||
|
context: Context,
|
||||||
|
displayName: String?,
|
||||||
|
sourceFile: File,
|
||||||
|
partIndex: Int,
|
||||||
|
): String? {
|
||||||
|
val resolvedName = resolveFileName(displayName)
|
||||||
|
val partName = resolvedName.replace(".mp4", "_part$partIndex.mp4")
|
||||||
|
return publishToMediaStore(context, partName, sourceFile)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun resolveFileName(displayName: String?): String {
|
||||||
|
val trimmed = displayName?.trim().orEmpty()
|
||||||
|
if (trimmed.isNotEmpty()) {
|
||||||
|
return if (trimmed.lowercase(Locale.US).endsWith(".mp4")) {
|
||||||
|
trimmed
|
||||||
|
} else {
|
||||||
|
"$trimmed.mp4"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
|
||||||
|
return "REC_$timestamp.mp4"
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
-7
@@ -1,12 +1,12 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import androidx.core.view.WindowCompat
|
import androidx.core.view.WindowCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.core.view.WindowInsetsControllerCompat
|
import androidx.core.view.WindowInsetsControllerCompat
|
||||||
import com.qxy.dronex.AppConstants
|
import com.dronex.rec.AppConstants
|
||||||
import com.qxy.dronex.MainActivity
|
import com.dronex.rec.MainActivity
|
||||||
import io.flutter.plugin.common.BinaryMessenger
|
import io.flutter.plugin.common.BinaryMessenger
|
||||||
import io.flutter.plugin.common.EventChannel
|
import io.flutter.plugin.common.EventChannel
|
||||||
import io.flutter.plugin.common.MethodCall
|
import io.flutter.plugin.common.MethodCall
|
||||||
@@ -50,6 +50,11 @@ class RecordingPlatformHandler(
|
|||||||
startRecording(withAudio, enableDnd, displayName, result)
|
startRecording(withAudio, enableDnd, displayName, result)
|
||||||
}
|
}
|
||||||
"stopRecording" -> stopRecording(result)
|
"stopRecording" -> stopRecording(result)
|
||||||
|
"getZoomCapabilities" -> result.success(controller.zoomCapabilitiesMap())
|
||||||
|
"setZoomRatio" -> {
|
||||||
|
val ratio = call.argument<Double>("zoomRatio") ?: 1.0
|
||||||
|
setZoomRatio(ratio, result)
|
||||||
|
}
|
||||||
"disposePreview" -> {
|
"disposePreview" -> {
|
||||||
controller.unbind()
|
controller.unbind()
|
||||||
result.success(null)
|
result.success(null)
|
||||||
@@ -172,16 +177,29 @@ class RecordingPlatformHandler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun setZoomRatio(ratio: Double, result: MethodChannel.Result) {
|
||||||
|
controller.setZoomRatio(ratio) { success, capabilities, message ->
|
||||||
|
mainHandler.post {
|
||||||
|
if (success) {
|
||||||
|
result.success(capabilities)
|
||||||
|
} else {
|
||||||
|
result.error("ZOOM_FAILED", message ?: "Failed to set camera zoom", null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun deliverStopResult(result: MethodChannel.Result, path: String?) {
|
private fun deliverStopResult(result: MethodChannel.Result, path: String?) {
|
||||||
val gallerySaved = path != null && controller.status.state != RecordingState.ERROR
|
val fileSaved = path != null && controller.status.state != RecordingState.ERROR
|
||||||
val payload =
|
val payload =
|
||||||
mutableMapOf<String, Any?>(
|
mutableMapOf<String, Any?>(
|
||||||
"outputPath" to path,
|
"outputPath" to path,
|
||||||
"status" to controller.status.toMap(),
|
"status" to controller.status.toMap(),
|
||||||
"gallerySaved" to gallerySaved,
|
"fileSaved" to fileSaved,
|
||||||
|
"segmentOutputPaths" to controller.segmentOutputPaths(),
|
||||||
)
|
)
|
||||||
if (!gallerySaved) {
|
if (!fileSaved) {
|
||||||
payload["galleryErrorMessage"] = controller.status.message ?: "保存到相册失败"
|
payload["fileErrorMessage"] = controller.status.message ?: "保存到文件夹失败"
|
||||||
}
|
}
|
||||||
result.success(payload)
|
result.success(payload)
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.camera.view.PreviewView
|
import androidx.camera.view.PreviewView
|
||||||
import com.qxy.dronex.MainActivity
|
import com.dronex.rec.MainActivity
|
||||||
import io.flutter.plugin.common.StandardMessageCodec
|
import io.flutter.plugin.common.StandardMessageCodec
|
||||||
import io.flutter.plugin.platform.PlatformView
|
import io.flutter.plugin.platform.PlatformView
|
||||||
import io.flutter.plugin.platform.PlatformViewFactory
|
import io.flutter.plugin.platform.PlatformViewFactory
|
||||||
@@ -0,0 +1,174 @@
|
|||||||
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
|
import android.media.MediaCodec
|
||||||
|
import android.media.MediaExtractor
|
||||||
|
import android.media.MediaFormat
|
||||||
|
import android.media.MediaMuxer
|
||||||
|
import java.io.File
|
||||||
|
import java.io.FileInputStream
|
||||||
|
import java.io.FileOutputStream
|
||||||
|
import java.nio.ByteBuffer
|
||||||
|
|
||||||
|
object RecordingSegmentMuxer {
|
||||||
|
fun mergeOrCopy(
|
||||||
|
segments: List<File>,
|
||||||
|
outputFile: File,
|
||||||
|
) {
|
||||||
|
val validSegments = segments.filter { it.exists() && it.length() > 0L }
|
||||||
|
require(validSegments.isNotEmpty()) { "No recording segments were generated" }
|
||||||
|
if (validSegments.size == 1) {
|
||||||
|
copyFile(validSegments.first(), outputFile)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
MediaMuxer(outputFile.absolutePath, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4).use {
|
||||||
|
muxer ->
|
||||||
|
val firstTracks = readTrackFormats(validSegments.first())
|
||||||
|
val videoTrack = firstTracks.video?.let { muxer.addTrack(it) }
|
||||||
|
val audioTrack = firstTracks.audio?.let { muxer.addTrack(it) }
|
||||||
|
require(videoTrack != null) { "No video track in recording segment" }
|
||||||
|
|
||||||
|
muxer.start()
|
||||||
|
var offsetUs = 0L
|
||||||
|
validSegments.forEach { segment ->
|
||||||
|
val durationUs =
|
||||||
|
copySegmentTracks(
|
||||||
|
segment = segment,
|
||||||
|
muxer = muxer,
|
||||||
|
videoOutputTrack = videoTrack,
|
||||||
|
audioOutputTrack = audioTrack,
|
||||||
|
offsetUs = offsetUs,
|
||||||
|
)
|
||||||
|
offsetUs += durationUs + 1L
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun copyFile(source: File, target: File) {
|
||||||
|
FileInputStream(source).use { input ->
|
||||||
|
FileOutputStream(target).use { output -> input.copyTo(output) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readTrackFormats(file: File): TrackFormats {
|
||||||
|
val extractor = MediaExtractor()
|
||||||
|
extractor.setDataSource(file.absolutePath)
|
||||||
|
try {
|
||||||
|
var video: MediaFormat? = null
|
||||||
|
var audio: MediaFormat? = null
|
||||||
|
for (index in 0 until extractor.trackCount) {
|
||||||
|
val format = extractor.getTrackFormat(index)
|
||||||
|
val mime = format.getString(MediaFormat.KEY_MIME).orEmpty()
|
||||||
|
when {
|
||||||
|
mime.startsWith("video/") && video == null -> video = format
|
||||||
|
mime.startsWith("audio/") && audio == null -> audio = format
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return TrackFormats(video = video, audio = audio)
|
||||||
|
} finally {
|
||||||
|
extractor.release()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun copySegmentTracks(
|
||||||
|
segment: File,
|
||||||
|
muxer: MediaMuxer,
|
||||||
|
videoOutputTrack: Int,
|
||||||
|
audioOutputTrack: Int?,
|
||||||
|
offsetUs: Long,
|
||||||
|
): Long {
|
||||||
|
var segmentDurationUs = 0L
|
||||||
|
segmentDurationUs =
|
||||||
|
maxOf(
|
||||||
|
segmentDurationUs,
|
||||||
|
copyTrack(segment, muxer, "video/", videoOutputTrack, offsetUs),
|
||||||
|
)
|
||||||
|
if (audioOutputTrack != null) {
|
||||||
|
segmentDurationUs =
|
||||||
|
maxOf(
|
||||||
|
segmentDurationUs,
|
||||||
|
copyTrack(segment, muxer, "audio/", audioOutputTrack, offsetUs),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return segmentDurationUs
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun copyTrack(
|
||||||
|
segment: File,
|
||||||
|
muxer: MediaMuxer,
|
||||||
|
mimePrefix: String,
|
||||||
|
outputTrack: Int,
|
||||||
|
offsetUs: Long,
|
||||||
|
): Long {
|
||||||
|
val extractor = MediaExtractor()
|
||||||
|
extractor.setDataSource(segment.absolutePath)
|
||||||
|
try {
|
||||||
|
val inputTrack = findTrack(extractor, mimePrefix) ?: return 0L
|
||||||
|
extractor.selectTrack(inputTrack)
|
||||||
|
val bufferSize = trackBufferSize(extractor.getTrackFormat(inputTrack))
|
||||||
|
val buffer = ByteBuffer.allocate(bufferSize)
|
||||||
|
val info = MediaCodec.BufferInfo()
|
||||||
|
var firstSampleTimeUs: Long? = null
|
||||||
|
var lastSampleTimeUs = 0L
|
||||||
|
|
||||||
|
while (true) {
|
||||||
|
buffer.clear()
|
||||||
|
val sampleSize = extractor.readSampleData(buffer, 0)
|
||||||
|
if (sampleSize < 0) break
|
||||||
|
|
||||||
|
val sampleTimeUs = extractor.sampleTime
|
||||||
|
val baseTimeUs = firstSampleTimeUs ?: sampleTimeUs.also { firstSampleTimeUs = it }
|
||||||
|
val normalizedTimeUs = (sampleTimeUs - baseTimeUs).coerceAtLeast(0L)
|
||||||
|
info.set(
|
||||||
|
0,
|
||||||
|
sampleSize,
|
||||||
|
offsetUs + normalizedTimeUs,
|
||||||
|
extractor.sampleFlags,
|
||||||
|
)
|
||||||
|
muxer.writeSampleData(outputTrack, buffer, info)
|
||||||
|
lastSampleTimeUs = normalizedTimeUs
|
||||||
|
extractor.advance()
|
||||||
|
}
|
||||||
|
return lastSampleTimeUs
|
||||||
|
} finally {
|
||||||
|
extractor.release()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun findTrack(extractor: MediaExtractor, mimePrefix: String): Int? {
|
||||||
|
for (index in 0 until extractor.trackCount) {
|
||||||
|
val mime = extractor.getTrackFormat(index).getString(MediaFormat.KEY_MIME).orEmpty()
|
||||||
|
if (mime.startsWith(mimePrefix)) {
|
||||||
|
return index
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun trackBufferSize(format: MediaFormat): Int {
|
||||||
|
return if (format.containsKey(MediaFormat.KEY_MAX_INPUT_SIZE)) {
|
||||||
|
format.getInteger(MediaFormat.KEY_MAX_INPUT_SIZE).coerceAtLeast(DEFAULT_BUFFER_SIZE)
|
||||||
|
} else {
|
||||||
|
DEFAULT_BUFFER_SIZE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private data class TrackFormats(
|
||||||
|
val video: MediaFormat?,
|
||||||
|
val audio: MediaFormat?,
|
||||||
|
)
|
||||||
|
|
||||||
|
private const val DEFAULT_BUFFER_SIZE = 2 * 1024 * 1024
|
||||||
|
}
|
||||||
|
|
||||||
|
private inline fun MediaMuxer.use(block: (MediaMuxer) -> Unit) {
|
||||||
|
try {
|
||||||
|
block(this)
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
stop()
|
||||||
|
} catch (_: Exception) {
|
||||||
|
}
|
||||||
|
release()
|
||||||
|
}
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.lifecycle.LifecycleService
|
import androidx.lifecycle.LifecycleService
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.qxy.dronex.recording
|
package com.dronex.rec.recording
|
||||||
|
|
||||||
enum class RecordingState {
|
enum class RecordingState {
|
||||||
IDLE,
|
IDLE,
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
package com.qxy.dronex
|
|
||||||
|
|
||||||
object AppConstants {
|
|
||||||
const val PACKAGE_NAME = "com.qxy.dronex"
|
|
||||||
const val PLATFORM_INFO_CHANNEL = "$PACKAGE_NAME/platform_info"
|
|
||||||
const val RECORDING_METHOD_CHANNEL = "$PACKAGE_NAME/recording"
|
|
||||||
const val RECORDING_EVENT_CHANNEL = "$PACKAGE_NAME/recording_events"
|
|
||||||
const val RECORDING_ACTION_START = "$PACKAGE_NAME.recording.START"
|
|
||||||
const val RECORDING_ACTION_STOP = "$PACKAGE_NAME.recording.STOP"
|
|
||||||
}
|
|
||||||
@@ -1,248 +0,0 @@
|
|||||||
package com.qxy.dronex.recording
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.util.Log
|
|
||||||
import androidx.camera.core.CameraSelector
|
|
||||||
import androidx.camera.core.Preview
|
|
||||||
import androidx.camera.lifecycle.ProcessCameraProvider
|
|
||||||
import androidx.camera.video.Quality
|
|
||||||
import androidx.camera.video.QualitySelector
|
|
||||||
import androidx.camera.video.Recorder
|
|
||||||
import androidx.camera.video.Recording
|
|
||||||
import androidx.camera.video.VideoCapture
|
|
||||||
import androidx.camera.video.VideoRecordEvent
|
|
||||||
import androidx.camera.view.PreviewView
|
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import androidx.lifecycle.LifecycleOwner
|
|
||||||
import java.util.concurrent.Executor
|
|
||||||
|
|
||||||
class RecordingCameraController(
|
|
||||||
private val appContext: Context,
|
|
||||||
) {
|
|
||||||
private val mainExecutor: Executor = ContextCompat.getMainExecutor(appContext)
|
|
||||||
|
|
||||||
private var cameraProvider: ProcessCameraProvider? = null
|
|
||||||
private var preview: Preview? = null
|
|
||||||
private var videoCapture: VideoCapture<Recorder>? = null
|
|
||||||
private var activeRecording: Recording? = null
|
|
||||||
private var boundLifecycleOwner: LifecycleOwner? = null
|
|
||||||
|
|
||||||
var status: RecordingStatus = RecordingStatus(RecordingState.IDLE)
|
|
||||||
private set
|
|
||||||
|
|
||||||
var statusListener: ((RecordingStatus) -> Unit)? = null
|
|
||||||
|
|
||||||
private var recordingStartedAt: Long = 0L
|
|
||||||
private var latestOutputPath: String? = null
|
|
||||||
private var pendingStopCallback: ((String?) -> Unit)? = null
|
|
||||||
|
|
||||||
fun bindPreview(
|
|
||||||
lifecycleOwner: LifecycleOwner,
|
|
||||||
previewView: PreviewView,
|
|
||||||
onReady: (Boolean) -> Unit,
|
|
||||||
) {
|
|
||||||
val future = ProcessCameraProvider.getInstance(appContext)
|
|
||||||
future.addListener(
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
val provider = future.get()
|
|
||||||
cameraProvider = provider
|
|
||||||
boundLifecycleOwner = lifecycleOwner
|
|
||||||
|
|
||||||
preview =
|
|
||||||
Preview.Builder().build().also {
|
|
||||||
it.surfaceProvider = previewView.surfaceProvider
|
|
||||||
}
|
|
||||||
|
|
||||||
val recorder =
|
|
||||||
Recorder.Builder()
|
|
||||||
.setQualitySelector(QualitySelector.from(Quality.HD))
|
|
||||||
.build()
|
|
||||||
videoCapture = VideoCapture.withOutput(recorder)
|
|
||||||
|
|
||||||
provider.unbindAll()
|
|
||||||
provider.bindToLifecycle(
|
|
||||||
lifecycleOwner,
|
|
||||||
CameraSelector.DEFAULT_BACK_CAMERA,
|
|
||||||
preview,
|
|
||||||
videoCapture,
|
|
||||||
)
|
|
||||||
|
|
||||||
updateStatus(RecordingStatus(RecordingState.PREVIEWING))
|
|
||||||
onReady(true)
|
|
||||||
} catch (error: Exception) {
|
|
||||||
Log.e(TAG, "bindPreview failed", error)
|
|
||||||
updateStatus(
|
|
||||||
RecordingStatus(
|
|
||||||
RecordingState.ERROR,
|
|
||||||
message = error.message,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
onReady(false)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mainExecutor,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun rebindForRecording(
|
|
||||||
lifecycleOwner: LifecycleOwner,
|
|
||||||
previewView: PreviewView,
|
|
||||||
onReady: (Boolean) -> Unit,
|
|
||||||
) {
|
|
||||||
val provider = cameraProvider
|
|
||||||
if (provider == null) {
|
|
||||||
bindPreview(lifecycleOwner, previewView, onReady)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
boundLifecycleOwner === lifecycleOwner &&
|
|
||||||
preview != null &&
|
|
||||||
videoCapture != null
|
|
||||||
) {
|
|
||||||
onReady(true)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
boundLifecycleOwner = lifecycleOwner
|
|
||||||
provider.unbindAll()
|
|
||||||
provider.bindToLifecycle(
|
|
||||||
lifecycleOwner,
|
|
||||||
CameraSelector.DEFAULT_BACK_CAMERA,
|
|
||||||
preview,
|
|
||||||
videoCapture,
|
|
||||||
)
|
|
||||||
onReady(true)
|
|
||||||
} catch (error: Exception) {
|
|
||||||
Log.e(TAG, "rebindForRecording failed", error)
|
|
||||||
onReady(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun startRecording(
|
|
||||||
withAudio: Boolean,
|
|
||||||
displayName: String?,
|
|
||||||
onStarted: (Boolean, String?) -> Unit,
|
|
||||||
) {
|
|
||||||
val capture = videoCapture
|
|
||||||
if (capture == null || boundLifecycleOwner == null) {
|
|
||||||
onStarted(false, "Camera not ready")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (activeRecording != null) {
|
|
||||||
onStarted(false, "Already recording")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val outputOptions =
|
|
||||||
RecordingOutputFactory.buildMediaStoreOutputOptions(
|
|
||||||
appContext,
|
|
||||||
displayName,
|
|
||||||
)
|
|
||||||
latestOutputPath = null
|
|
||||||
|
|
||||||
val pending =
|
|
||||||
capture.output.prepareRecording(appContext, outputOptions).apply {
|
|
||||||
if (withAudio) {
|
|
||||||
val granted =
|
|
||||||
ContextCompat.checkSelfPermission(
|
|
||||||
appContext,
|
|
||||||
android.Manifest.permission.RECORD_AUDIO,
|
|
||||||
) == android.content.pm.PackageManager.PERMISSION_GRANTED
|
|
||||||
if (granted) {
|
|
||||||
withAudioEnabled()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
recordingStartedAt = System.currentTimeMillis()
|
|
||||||
updateStatus(
|
|
||||||
RecordingStatus(
|
|
||||||
RecordingState.RECORDING,
|
|
||||||
outputPath = latestOutputPath,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
activeRecording =
|
|
||||||
pending.start(mainExecutor) { event ->
|
|
||||||
when (event) {
|
|
||||||
is VideoRecordEvent.Start -> Unit
|
|
||||||
is VideoRecordEvent.Finalize -> {
|
|
||||||
activeRecording = null
|
|
||||||
if (event.hasError()) {
|
|
||||||
updateStatus(
|
|
||||||
RecordingStatus(
|
|
||||||
RecordingState.ERROR,
|
|
||||||
message = event.cause?.message
|
|
||||||
?: "Recording failed",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
latestOutputPath = event.outputResults.outputUri.toString()
|
|
||||||
updateStatus(
|
|
||||||
RecordingStatus(
|
|
||||||
RecordingState.PREVIEWING,
|
|
||||||
outputPath = latestOutputPath,
|
|
||||||
elapsedMillis =
|
|
||||||
System.currentTimeMillis() -
|
|
||||||
recordingStartedAt,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
val stopCallback = pendingStopCallback
|
|
||||||
pendingStopCallback = null
|
|
||||||
stopCallback?.invoke(latestOutputPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onStarted(true, latestOutputPath ?: "recording")
|
|
||||||
}
|
|
||||||
|
|
||||||
fun stopRecording(onStopped: (String?) -> Unit) {
|
|
||||||
val recording = activeRecording
|
|
||||||
if (recording == null) {
|
|
||||||
onStopped(latestOutputPath)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
pendingStopCallback = onStopped
|
|
||||||
updateStatus(
|
|
||||||
RecordingStatus(
|
|
||||||
RecordingState.STOPPING,
|
|
||||||
outputPath = latestOutputPath,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
recording.stop()
|
|
||||||
activeRecording = null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun unbind() {
|
|
||||||
activeRecording?.stop()
|
|
||||||
activeRecording = null
|
|
||||||
cameraProvider?.unbindAll()
|
|
||||||
cameraProvider = null
|
|
||||||
preview = null
|
|
||||||
videoCapture = null
|
|
||||||
boundLifecycleOwner = null
|
|
||||||
updateStatus(RecordingStatus(RecordingState.IDLE))
|
|
||||||
}
|
|
||||||
|
|
||||||
fun elapsedMillis(): Long {
|
|
||||||
if (status.state != RecordingState.RECORDING) return 0L
|
|
||||||
return System.currentTimeMillis() - recordingStartedAt
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateStatus(next: RecordingStatus) {
|
|
||||||
status = next
|
|
||||||
statusListener?.invoke(next)
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
private const val TAG = "RecordingCamera"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package com.qxy.dronex.recording
|
|
||||||
|
|
||||||
import android.content.ContentValues
|
|
||||||
import android.content.Context
|
|
||||||
import android.os.Build
|
|
||||||
import android.provider.MediaStore
|
|
||||||
import androidx.camera.video.MediaStoreOutputOptions
|
|
||||||
import java.text.SimpleDateFormat
|
|
||||||
import java.util.Date
|
|
||||||
import java.util.Locale
|
|
||||||
|
|
||||||
object RecordingOutputFactory {
|
|
||||||
private const val RELATIVE_PATH = "Movies/飞行极控录像工作台"
|
|
||||||
private const val MIME_TYPE = "video/mp4"
|
|
||||||
|
|
||||||
fun buildMediaStoreOutputOptions(
|
|
||||||
context: Context,
|
|
||||||
displayName: String?,
|
|
||||||
): MediaStoreOutputOptions {
|
|
||||||
val fileName = resolveFileName(displayName)
|
|
||||||
val contentValues =
|
|
||||||
ContentValues().apply {
|
|
||||||
put(MediaStore.MediaColumns.DISPLAY_NAME, fileName)
|
|
||||||
put(MediaStore.MediaColumns.MIME_TYPE, MIME_TYPE)
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
|
||||||
put(MediaStore.Video.Media.RELATIVE_PATH, RELATIVE_PATH)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return MediaStoreOutputOptions.Builder(
|
|
||||||
context.contentResolver,
|
|
||||||
MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
|
|
||||||
)
|
|
||||||
.setContentValues(contentValues)
|
|
||||||
.build()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun resolveFileName(displayName: String?): String {
|
|
||||||
val trimmed = displayName?.trim().orEmpty()
|
|
||||||
if (trimmed.isNotEmpty()) {
|
|
||||||
return if (trimmed.lowercase(Locale.US).endsWith(".mp4")) {
|
|
||||||
trimmed
|
|
||||||
} else {
|
|
||||||
"$trimmed.mp4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date())
|
|
||||||
return "REC_$timestamp.mp4"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"name": "xcode build server",
|
||||||
|
"version": "1.3.0",
|
||||||
|
"bspVersion": "2.2.0",
|
||||||
|
"languages": [
|
||||||
|
"c",
|
||||||
|
"cpp",
|
||||||
|
"objective-c",
|
||||||
|
"objective-cpp",
|
||||||
|
"swift"
|
||||||
|
],
|
||||||
|
"argv": [
|
||||||
|
"/opt/homebrew/bin/xcode-build-server"
|
||||||
|
],
|
||||||
|
"workspace": "/Users/ZhuanZ/Documents/gdfw/record-tool/ios/Runner.xcworkspace",
|
||||||
|
"build_root": "/Users/ZhuanZ/Library/Developer/Xcode/DerivedData/Runner-ckjfuyjdkgumnpbnnftroxddsppq",
|
||||||
|
"scheme": "Runner",
|
||||||
|
"kind": "xcode"
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
flutter clean
|
||||||
|
flutter pub get
|
||||||
|
rm -rf ios/Pods
|
||||||
|
rm -rf ios/Podfile.lock
|
||||||
|
cd ios
|
||||||
|
pod install
|
||||||
|
cd ..
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
|
||||||
#include "Generated.xcconfig"
|
#include "Generated.xcconfig"
|
||||||
|
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}"
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
|
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
|
||||||
#include "Generated.xcconfig"
|
#include "Generated.xcconfig"
|
||||||
|
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}"
|
||||||
|
|||||||
+27
-2
@@ -45,9 +45,34 @@ post_install do |installer|
|
|||||||
'$(inherited)',
|
'$(inherited)',
|
||||||
'PERMISSION_CAMERA=1',
|
'PERMISSION_CAMERA=1',
|
||||||
'PERMISSION_MICROPHONE=1',
|
'PERMISSION_MICROPHONE=1',
|
||||||
'PERMISSION_PHOTOS=1',
|
|
||||||
'PERMISSION_PHOTOS_ADD_ONLY=1',
|
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
pods_runner_dir = File.join(
|
||||||
|
installer.sandbox.root,
|
||||||
|
'Target Support Files',
|
||||||
|
'Pods-Runner'
|
||||||
|
)
|
||||||
|
Dir.glob(File.join(pods_runner_dir, 'Pods-Runner.*.xcconfig')).each do |config_path|
|
||||||
|
config = File.read(config_path)
|
||||||
|
config.gsub!(
|
||||||
|
'FRAMEWORK_SEARCH_PATHS = $(inherited)',
|
||||||
|
'FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}"'
|
||||||
|
)
|
||||||
|
File.write(config_path, config)
|
||||||
|
end
|
||||||
|
|
||||||
|
Dir.glob(File.join(pods_runner_dir, 'Pods-Runner-frameworks-*input-files.xcfilelist')).each do |file_list_path|
|
||||||
|
file_list = File.read(file_list_path)
|
||||||
|
file_list.gsub!('${BUILT_PRODUCTS_DIR}/', '${PODS_CONFIGURATION_BUILD_DIR}/')
|
||||||
|
File.write(file_list_path, file_list)
|
||||||
|
end
|
||||||
|
|
||||||
|
frameworks_script = File.join(pods_runner_dir, 'Pods-Runner-frameworks.sh')
|
||||||
|
if File.exist?(frameworks_script)
|
||||||
|
script = File.read(frameworks_script)
|
||||||
|
script.gsub!('${BUILT_PRODUCTS_DIR}/', '${PODS_CONFIGURATION_BUILD_DIR}/')
|
||||||
|
File.write(frameworks_script, script)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+1
-8
@@ -2,9 +2,6 @@ PODS:
|
|||||||
- connectivity_plus (0.0.1):
|
- connectivity_plus (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- Flutter (1.0.0)
|
- Flutter (1.0.0)
|
||||||
- path_provider_foundation (0.0.1):
|
|
||||||
- Flutter
|
|
||||||
- FlutterMacOS
|
|
||||||
- permission_handler_apple (9.4.8):
|
- permission_handler_apple (9.4.8):
|
||||||
- Flutter
|
- Flutter
|
||||||
- shared_preferences_foundation (0.0.1):
|
- shared_preferences_foundation (0.0.1):
|
||||||
@@ -19,7 +16,6 @@ PODS:
|
|||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
|
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
|
||||||
- Flutter (from `Flutter`)
|
- Flutter (from `Flutter`)
|
||||||
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
|
|
||||||
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
|
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
|
||||||
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
|
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
|
||||||
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
|
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
|
||||||
@@ -30,8 +26,6 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/connectivity_plus/ios"
|
:path: ".symlinks/plugins/connectivity_plus/ios"
|
||||||
Flutter:
|
Flutter:
|
||||||
:path: Flutter
|
:path: Flutter
|
||||||
path_provider_foundation:
|
|
||||||
:path: ".symlinks/plugins/path_provider_foundation/darwin"
|
|
||||||
permission_handler_apple:
|
permission_handler_apple:
|
||||||
:path: ".symlinks/plugins/permission_handler_apple/ios"
|
:path: ".symlinks/plugins/permission_handler_apple/ios"
|
||||||
shared_preferences_foundation:
|
shared_preferences_foundation:
|
||||||
@@ -44,12 +38,11 @@ EXTERNAL SOURCES:
|
|||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
|
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
|
||||||
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
|
||||||
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
|
|
||||||
permission_handler_apple: 92d754bbaa7361d436db2d6c3c1c2a0fdcec462e
|
permission_handler_apple: 92d754bbaa7361d436db2d6c3c1c2a0fdcec462e
|
||||||
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
|
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
|
||||||
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
|
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
|
||||||
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
|
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
|
||||||
|
|
||||||
PODFILE CHECKSUM: 5a82b772179df87e6518bddc6f9bb8b4053ce48b
|
PODFILE CHECKSUM: 858401fbd980bedce6ecd2f9b429bf271f11f74b
|
||||||
|
|
||||||
COCOAPODS: 1.16.2
|
COCOAPODS: 1.16.2
|
||||||
|
|||||||
@@ -495,16 +495,22 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
|
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||||
|
CODE_SIGN_STYLE = Manual;
|
||||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||||
DEVELOPMENT_TEAM = 35634V629S;
|
DEVELOPMENT_TEAM = "";
|
||||||
|
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = MT26BPCKF6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxy.dronex;
|
PRODUCT_BUNDLE_IDENTIFIER = com.dronex.rec;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "dev-profile-dronex";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
VERSIONING_SYSTEM = "apple-generic";
|
VERSIONING_SYSTEM = "apple-generic";
|
||||||
@@ -678,16 +684,22 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
|
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||||
|
CODE_SIGN_STYLE = Manual;
|
||||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||||
DEVELOPMENT_TEAM = 35634V629S;
|
DEVELOPMENT_TEAM = "";
|
||||||
|
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = MT26BPCKF6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxy.dronex;
|
PRODUCT_BUNDLE_IDENTIFIER = com.dronex.rec;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "dev-profile-dronex";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
@@ -701,16 +713,22 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_MODULES = YES;
|
CLANG_ENABLE_MODULES = YES;
|
||||||
|
CODE_SIGN_IDENTITY = "Apple Development";
|
||||||
|
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||||
|
CODE_SIGN_STYLE = Manual;
|
||||||
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
|
||||||
DEVELOPMENT_TEAM = 35634V629S;
|
DEVELOPMENT_TEAM = "";
|
||||||
|
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = MT26BPCKF6;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
INFOPLIST_FILE = Runner/Info.plist;
|
INFOPLIST_FILE = Runner/Info.plist;
|
||||||
LD_RUNPATH_SEARCH_PATHS = (
|
LD_RUNPATH_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.qxy.dronex;
|
PRODUCT_BUNDLE_IDENTIFIER = com.dronex.rec;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
|
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||||
|
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "dev-profile-dronex";
|
||||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||||
SWIFT_VERSION = 5.0;
|
SWIFT_VERSION = 5.0;
|
||||||
VERSIONING_SYSTEM = "apple-generic";
|
VERSIONING_SYSTEM = "apple-generic";
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "startup_background.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 262 KiB |
@@ -16,13 +16,15 @@
|
|||||||
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
|
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="StartupBackground" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
|
||||||
</imageView>
|
</imageView>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
|
<constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="1a2-6s-vTC"/>
|
||||||
<constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
|
<constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="4X2-HB-R7a"/>
|
||||||
|
<constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="E8f-e3-JEx"/>
|
||||||
|
<constraint firstItem="YRO-k0-Ey4" firstAttribute="trailing" secondItem="Ze5-6b-2t3" secondAttribute="trailing" id="rwG-Bh-0uU"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
</view>
|
</view>
|
||||||
</viewController>
|
</viewController>
|
||||||
@@ -32,6 +34,6 @@
|
|||||||
</scene>
|
</scene>
|
||||||
</scenes>
|
</scenes>
|
||||||
<resources>
|
<resources>
|
||||||
<image name="LaunchImage" width="168" height="185"/>
|
<image name="StartupBackground" width="750" height="1624"/>
|
||||||
</resources>
|
</resources>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
|
||||||
|
<device id="retina6_12" orientation="portrait" appearance="light"/>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<deployment identifier="iOS"/>
|
<deployment identifier="iOS"/>
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
|
||||||
|
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<scenes>
|
<scenes>
|
||||||
<!--Flutter View Controller-->
|
<!--Flutter View Controller-->
|
||||||
@@ -14,13 +16,28 @@
|
|||||||
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
|
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
|
||||||
</layoutGuides>
|
</layoutGuides>
|
||||||
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
|
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
|
<subviews>
|
||||||
|
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="StartupBackground" translatesAutoresizingMaskIntoConstraints="NO" id="YQm-Ov-qw7">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
|
||||||
|
</imageView>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
|
<constraints>
|
||||||
|
<constraint firstItem="YQm-Ov-qw7" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="7pp-OK-Dgk"/>
|
||||||
|
<constraint firstItem="YQm-Ov-qw7" firstAttribute="bottom" secondItem="8bC-Xf-vdC" secondAttribute="bottom" id="Hbf-gY-rbf"/>
|
||||||
|
<constraint firstItem="YQm-Ov-qw7" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="WPc-7k-20p"/>
|
||||||
|
<constraint firstItem="YQm-Ov-qw7" firstAttribute="trailing" secondItem="8bC-Xf-vdC" secondAttribute="trailing" id="w1G-WA-3QR"/>
|
||||||
|
</constraints>
|
||||||
</view>
|
</view>
|
||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
|
||||||
</objects>
|
</objects>
|
||||||
|
<point key="canvasLocation" x="139" y="122"/>
|
||||||
</scene>
|
</scene>
|
||||||
</scenes>
|
</scenes>
|
||||||
|
<resources>
|
||||||
|
<image name="StartupBackground" width="750" height="1624"/>
|
||||||
|
</resources>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
@@ -30,8 +30,10 @@
|
|||||||
<string>需要访问相机以显示预览并录制视频。</string>
|
<string>需要访问相机以显示预览并录制视频。</string>
|
||||||
<key>NSMicrophoneUsageDescription</key>
|
<key>NSMicrophoneUsageDescription</key>
|
||||||
<string>需要访问麦克风以录制视频声音;未授权时将静音录制。</string>
|
<string>需要访问麦克风以录制视频声音;未授权时将静音录制。</string>
|
||||||
<key>NSPhotoLibraryAddUsageDescription</key>
|
<key>UIFileSharingEnabled</key>
|
||||||
<string>需要将录制的视频保存到相册。</string>
|
<true/>
|
||||||
|
<key>LSSupportsOpeningDocumentsInPlace</key>
|
||||||
|
<true/>
|
||||||
<key>UIApplicationSceneManifest</key>
|
<key>UIApplicationSceneManifest</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>UIApplicationSupportsMultipleScenes</key>
|
<key>UIApplicationSupportsMultipleScenes</key>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import UIKit
|
|||||||
final class PlatformInfoPlugin: NSObject, FlutterPlugin {
|
final class PlatformInfoPlugin: NSObject, FlutterPlugin {
|
||||||
static func register(with registrar: FlutterPluginRegistrar) {
|
static func register(with registrar: FlutterPluginRegistrar) {
|
||||||
let channel = FlutterMethodChannel(
|
let channel = FlutterMethodChannel(
|
||||||
name: "com.qxy.dronex/platform_info",
|
name: "app.record_tool/platform_info",
|
||||||
binaryMessenger: registrar.messenger()
|
binaryMessenger: registrar.messenger()
|
||||||
)
|
)
|
||||||
let plugin = PlatformInfoPlugin()
|
let plugin = PlatformInfoPlugin()
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import AVFoundation
|
import AVFoundation
|
||||||
import Flutter
|
import Flutter
|
||||||
import Photos
|
|
||||||
import UIKit
|
import UIKit
|
||||||
|
|
||||||
private enum RecordingState: String {
|
private enum RecordingState: String {
|
||||||
@@ -110,12 +109,13 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
private var audioInput: AVCaptureDeviceInput?
|
private var audioInput: AVCaptureDeviceInput?
|
||||||
private var configured = false
|
private var configured = false
|
||||||
private var latestOutputPath: String?
|
private var latestOutputPath: String?
|
||||||
private var latestGallerySaved = true
|
private var latestFileSaved = true
|
||||||
private var latestGalleryErrorMessage: String?
|
private var latestFileErrorMessage: String?
|
||||||
private var pendingDisplayName: String?
|
private var pendingDisplayName: String?
|
||||||
private var recordingStartedAt: Date?
|
private var recordingStartedAt: Date?
|
||||||
private var elapsedTimer: Timer?
|
private var elapsedTimer: Timer?
|
||||||
private var pendingStopResult: FlutterResult?
|
private var pendingStopResult: FlutterResult?
|
||||||
|
private var currentZoomRatio: CGFloat = 1.0
|
||||||
|
|
||||||
private(set) var status = RecordingStatus(state: .idle) {
|
private(set) var status = RecordingStatus(state: .idle) {
|
||||||
didSet {
|
didSet {
|
||||||
@@ -215,10 +215,10 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
}
|
}
|
||||||
|
|
||||||
self.pendingDisplayName = displayName
|
self.pendingDisplayName = displayName
|
||||||
self.latestGallerySaved = true
|
self.latestFileSaved = true
|
||||||
self.latestGalleryErrorMessage = nil
|
self.latestFileErrorMessage = nil
|
||||||
let outputURL = try self.createOutputURL(displayName: displayName)
|
let outputURL = try self.createOutputURL(displayName: displayName)
|
||||||
self.latestOutputPath = outputURL.lastPathComponent
|
self.latestOutputPath = outputURL.path
|
||||||
self.recordingStartedAt = Date()
|
self.recordingStartedAt = Date()
|
||||||
self.updateStatus(RecordingStatus(state: .recording, outputPath: outputURL.path))
|
self.updateStatus(RecordingStatus(state: .recording, outputPath: outputURL.path))
|
||||||
self.movieOutput.startRecording(to: outputURL, recordingDelegate: self)
|
self.movieOutput.startRecording(to: outputURL, recordingDelegate: self)
|
||||||
@@ -254,11 +254,11 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
var payload: [String: Any] = [
|
var payload: [String: Any] = [
|
||||||
"outputPath": self.latestOutputPath as Any,
|
"outputPath": self.latestOutputPath as Any,
|
||||||
"status": self.currentStatusMap(),
|
"status": self.currentStatusMap(),
|
||||||
"gallerySaved": self.latestGallerySaved,
|
"fileSaved": self.latestFileSaved,
|
||||||
]
|
]
|
||||||
if !self.latestGallerySaved {
|
if !self.latestFileSaved {
|
||||||
payload["galleryErrorMessage"] =
|
payload["fileErrorMessage"] =
|
||||||
self.latestGalleryErrorMessage ?? "保存到相册失败"
|
self.latestFileErrorMessage ?? "保存到文件夹失败"
|
||||||
}
|
}
|
||||||
result(payload)
|
result(payload)
|
||||||
}
|
}
|
||||||
@@ -291,6 +291,7 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
self.session.commitConfiguration()
|
self.session.commitConfiguration()
|
||||||
self.videoInput = nil
|
self.videoInput = nil
|
||||||
self.audioInput = nil
|
self.audioInput = nil
|
||||||
|
self.currentZoomRatio = 1.0
|
||||||
self.configured = false
|
self.configured = false
|
||||||
self.updateStatus(RecordingStatus(state: .idle))
|
self.updateStatus(RecordingStatus(state: .idle))
|
||||||
|
|
||||||
@@ -312,6 +313,54 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
return status.toMap()
|
return status.toMap()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func zoomCapabilities(result: @escaping FlutterResult) {
|
||||||
|
sessionQueue.async { [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
let capabilities = self.currentZoomCapabilitiesMap()
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
result(capabilities)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func setZoomRatio(_ ratio: CGFloat, result: @escaping FlutterResult) {
|
||||||
|
sessionQueue.async { [weak self] in
|
||||||
|
guard let self else { return }
|
||||||
|
guard let device = self.videoInput?.device else {
|
||||||
|
self.currentZoomRatio = max(1.0, ratio)
|
||||||
|
let capabilities = self.currentZoomCapabilitiesMap()
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
result(capabilities)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
do {
|
||||||
|
// 入参是显示倍率(1.0x = 主摄),按 S 基准换算回设备 zoomFactor。
|
||||||
|
let baseline = self.mainBaselineFactor(for: device)
|
||||||
|
let nextZoom = self.clampedZoomRatio(ratio * baseline, for: device)
|
||||||
|
try device.lockForConfiguration()
|
||||||
|
device.videoZoomFactor = nextZoom
|
||||||
|
device.unlockForConfiguration()
|
||||||
|
self.currentZoomRatio = nextZoom
|
||||||
|
let capabilities = self.currentZoomCapabilitiesMap()
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
result(capabilities)
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
result(
|
||||||
|
FlutterError(
|
||||||
|
code: "ZOOM_FAILED",
|
||||||
|
message: error.localizedDescription,
|
||||||
|
details: nil
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func fileOutput(
|
func fileOutput(
|
||||||
_ output: AVCaptureFileOutput,
|
_ output: AVCaptureFileOutput,
|
||||||
didFinishRecordingTo outputFileURL: URL,
|
didFinishRecordingTo outputFileURL: URL,
|
||||||
@@ -322,8 +371,8 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
pendingStopResult = nil
|
pendingStopResult = nil
|
||||||
|
|
||||||
if let error {
|
if let error {
|
||||||
latestGallerySaved = false
|
latestFileSaved = false
|
||||||
latestGalleryErrorMessage = error.localizedDescription
|
latestFileErrorMessage = error.localizedDescription
|
||||||
updateStatus(
|
updateStatus(
|
||||||
RecordingStatus(
|
RecordingStatus(
|
||||||
state: .error, outputPath: latestOutputPath, message: error.localizedDescription))
|
state: .error, outputPath: latestOutputPath, message: error.localizedDescription))
|
||||||
@@ -331,29 +380,30 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
saveVideoToPhotoLibrary(fileURL: outputFileURL) { [weak self] success, message in
|
latestFileSaved = true
|
||||||
guard let self else { return }
|
latestFileErrorMessage = nil
|
||||||
self.latestGallerySaved = success
|
latestOutputPath = outputFileURL.path
|
||||||
self.latestGalleryErrorMessage = message
|
guard FileManager.default.fileExists(atPath: outputFileURL.path) else {
|
||||||
if success {
|
latestFileSaved = false
|
||||||
self.updateStatus(
|
latestFileErrorMessage = "录制文件未生成"
|
||||||
RecordingStatus(
|
updateStatus(
|
||||||
state: .previewing,
|
|
||||||
outputPath: self.latestOutputPath,
|
|
||||||
elapsedMillis: self.elapsedMillis()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
self.updateStatus(
|
|
||||||
RecordingStatus(
|
RecordingStatus(
|
||||||
state: .error,
|
state: .error,
|
||||||
outputPath: self.latestOutputPath,
|
outputPath: latestOutputPath,
|
||||||
message: message ?? "保存到相册失败"
|
message: latestFileErrorMessage
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
finishStopRecording(stopResult: stopResult)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
self.finishStopRecording(stopResult: stopResult)
|
updateStatus(
|
||||||
}
|
RecordingStatus(
|
||||||
|
state: .previewing,
|
||||||
|
outputPath: latestOutputPath,
|
||||||
|
elapsedMillis: elapsedMillis()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
finishStopRecording(stopResult: stopResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
private func finishStopRecording(stopResult: FlutterResult?) {
|
private func finishStopRecording(stopResult: FlutterResult?) {
|
||||||
@@ -363,79 +413,23 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
var payload: [String: Any] = [
|
var payload: [String: Any] = [
|
||||||
"outputPath": self.latestOutputPath as Any,
|
"outputPath": self.latestOutputPath as Any,
|
||||||
"status": self.currentStatusMap(),
|
"status": self.currentStatusMap(),
|
||||||
"gallerySaved": self.latestGallerySaved,
|
"fileSaved": self.latestFileSaved,
|
||||||
]
|
]
|
||||||
if !self.latestGallerySaved {
|
if !self.latestFileSaved {
|
||||||
payload["galleryErrorMessage"] =
|
payload["fileErrorMessage"] =
|
||||||
self.latestGalleryErrorMessage ?? "保存到相册失败,请开启相册权限"
|
self.latestFileErrorMessage ?? "保存到文件夹失败,请检查文件保存权限"
|
||||||
}
|
}
|
||||||
stopResult?(payload)
|
stopResult?(payload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func saveVideoToPhotoLibrary(
|
|
||||||
fileURL: URL,
|
|
||||||
completion: @escaping (Bool, String?) -> Void
|
|
||||||
) {
|
|
||||||
let performSave = {
|
|
||||||
PHPhotoLibrary.shared().performChanges({
|
|
||||||
PHAssetCreationRequest.forAsset().addResource(with: .video, fileURL: fileURL, options: nil)
|
|
||||||
}) { success, error in
|
|
||||||
if success {
|
|
||||||
try? FileManager.default.removeItem(at: fileURL)
|
|
||||||
completion(true, nil)
|
|
||||||
} else {
|
|
||||||
completion(false, error?.localizedDescription ?? "保存到相册失败")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if #available(iOS 14, *) {
|
|
||||||
let status = PHPhotoLibrary.authorizationStatus(for: .addOnly)
|
|
||||||
switch status {
|
|
||||||
case .authorized, .limited:
|
|
||||||
performSave()
|
|
||||||
case .notDetermined:
|
|
||||||
PHPhotoLibrary.requestAuthorization(for: .addOnly) { newStatus in
|
|
||||||
if newStatus == .authorized || newStatus == .limited {
|
|
||||||
performSave()
|
|
||||||
} else {
|
|
||||||
completion(false, "未授予相册权限")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
completion(false, "未授予相册权限")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
let status = PHPhotoLibrary.authorizationStatus()
|
|
||||||
switch status {
|
|
||||||
case .authorized:
|
|
||||||
performSave()
|
|
||||||
case .notDetermined:
|
|
||||||
PHPhotoLibrary.requestAuthorization { newStatus in
|
|
||||||
if newStatus == .authorized {
|
|
||||||
performSave()
|
|
||||||
} else {
|
|
||||||
completion(false, "未授予相册权限")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
completion(false, "未授予相册权限")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private func configureSession(withAudio: Bool) throws {
|
private func configureSession(withAudio: Bool) throws {
|
||||||
if configured {
|
if configured {
|
||||||
try configureAudioInput(enabled: withAudio)
|
try configureAudioInput(enabled: withAudio)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
guard
|
guard let videoDevice = Self.preferredVideoDevice() else {
|
||||||
let videoDevice = AVCaptureDevice.default(
|
|
||||||
.builtInWideAngleCamera, for: .video, position: .back)
|
|
||||||
?? AVCaptureDevice.default(for: .video)
|
|
||||||
else {
|
|
||||||
throw NSError(
|
throw NSError(
|
||||||
domain: "RecordingCamera", code: 1,
|
domain: "RecordingCamera", code: 1,
|
||||||
userInfo: [NSLocalizedDescriptionKey: "No camera device available"])
|
userInfo: [NSLocalizedDescriptionKey: "No camera device available"])
|
||||||
@@ -465,9 +459,74 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
session.commitConfiguration()
|
session.commitConfiguration()
|
||||||
|
|
||||||
configured = true
|
configured = true
|
||||||
|
// 默认以主摄(显示 1.0x)开场:虚拟多摄设备里主摄对应的 zoomFactor 是 S。
|
||||||
|
currentZoomRatio = mainBaselineFactor(for: videoDevice)
|
||||||
|
try applyCurrentZoom()
|
||||||
try configureAudioInput(enabled: withAudio)
|
try configureAudioInput(enabled: withAudio)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 优先选用包含超广角的虚拟多摄设备,使 minAvailableVideoZoomFactor 能低于主摄(从而支持 0.6x)。
|
||||||
|
private static func preferredVideoDevice() -> AVCaptureDevice? {
|
||||||
|
let preferredTypes: [AVCaptureDevice.DeviceType] = [
|
||||||
|
.builtInTripleCamera,
|
||||||
|
.builtInDualWideCamera,
|
||||||
|
.builtInWideAngleCamera,
|
||||||
|
]
|
||||||
|
for type in preferredTypes {
|
||||||
|
if let device = AVCaptureDevice.default(type, for: .video, position: .back) {
|
||||||
|
return device
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return AVCaptureDevice.default(for: .video)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 虚拟多摄设备中「主摄(显示 1.0x)」对应的设备 zoomFactor 基准 S。
|
||||||
|
/// 取 ultra-wide → wide 的切换点;非虚拟设备无切换点时返回 1.0(向后兼容)。
|
||||||
|
private func mainBaselineFactor(for device: AVCaptureDevice) -> CGFloat {
|
||||||
|
if let first = device.virtualDeviceSwitchOverVideoZoomFactors.first {
|
||||||
|
let value = CGFloat(truncating: first)
|
||||||
|
if value > 0 {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 1.0
|
||||||
|
}
|
||||||
|
|
||||||
|
private func currentZoomCapabilitiesMap() -> [String: Any] {
|
||||||
|
guard let device = videoInput?.device else {
|
||||||
|
return [
|
||||||
|
"zoomRatio": Double(currentZoomRatio),
|
||||||
|
"minZoomRatio": 1.0,
|
||||||
|
"maxZoomRatio": 3.0,
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设备 zoomFactor 以 S 为基准换算成 App 使用的「显示倍率」(1.0x = 主摄)。
|
||||||
|
let baseline = mainBaselineFactor(for: device)
|
||||||
|
let minZoom = device.minAvailableVideoZoomFactor
|
||||||
|
let maxZoom = device.maxAvailableVideoZoomFactor
|
||||||
|
let zoom = clampedZoomRatio(device.videoZoomFactor, for: device)
|
||||||
|
currentZoomRatio = zoom
|
||||||
|
return [
|
||||||
|
"zoomRatio": Double(zoom / baseline),
|
||||||
|
"minZoomRatio": Double(minZoom / baseline),
|
||||||
|
"maxZoomRatio": Double(maxZoom / baseline),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
private func applyCurrentZoom() throws {
|
||||||
|
guard let device = videoInput?.device else { return }
|
||||||
|
let nextZoom = clampedZoomRatio(currentZoomRatio, for: device)
|
||||||
|
try device.lockForConfiguration()
|
||||||
|
device.videoZoomFactor = nextZoom
|
||||||
|
device.unlockForConfiguration()
|
||||||
|
currentZoomRatio = nextZoom
|
||||||
|
}
|
||||||
|
|
||||||
|
private func clampedZoomRatio(_ ratio: CGFloat, for device: AVCaptureDevice) -> CGFloat {
|
||||||
|
min(max(ratio, device.minAvailableVideoZoomFactor), device.maxAvailableVideoZoomFactor)
|
||||||
|
}
|
||||||
|
|
||||||
private func configureAudioInput(enabled: Bool) throws {
|
private func configureAudioInput(enabled: Bool) throws {
|
||||||
session.beginConfiguration()
|
session.beginConfiguration()
|
||||||
defer { session.commitConfiguration() }
|
defer { session.commitConfiguration() }
|
||||||
@@ -502,7 +561,30 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
try FileManager.default.createDirectory(at: recordingsURL, withIntermediateDirectories: true)
|
try FileManager.default.createDirectory(at: recordingsURL, withIntermediateDirectories: true)
|
||||||
|
|
||||||
let fileName = Self.resolveFileName(displayName: displayName)
|
let fileName = Self.resolveFileName(displayName: displayName)
|
||||||
return recordingsURL.appendingPathComponent(fileName)
|
return uniqueOutputURL(in: recordingsURL, preferredFileName: fileName)
|
||||||
|
}
|
||||||
|
|
||||||
|
private func uniqueOutputURL(in directoryURL: URL, preferredFileName: String) -> URL {
|
||||||
|
let preferredURL = directoryURL.appendingPathComponent(preferredFileName)
|
||||||
|
guard !FileManager.default.fileExists(atPath: preferredURL.path) else {
|
||||||
|
let fileExtension = preferredURL.pathExtension
|
||||||
|
let baseName = preferredURL.deletingPathExtension().lastPathComponent
|
||||||
|
let timestamp = Self.fileNameDateFormatter.string(from: Date())
|
||||||
|
|
||||||
|
var index = 0
|
||||||
|
while true {
|
||||||
|
let suffix = index == 0 ? timestamp : "\(timestamp)_\(index)"
|
||||||
|
let nextName = fileExtension.isEmpty
|
||||||
|
? "\(baseName)_\(suffix)"
|
||||||
|
: "\(baseName)_\(suffix).\(fileExtension)"
|
||||||
|
let nextURL = directoryURL.appendingPathComponent(nextName)
|
||||||
|
if !FileManager.default.fileExists(atPath: nextURL.path) {
|
||||||
|
return nextURL
|
||||||
|
}
|
||||||
|
index += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return preferredURL
|
||||||
}
|
}
|
||||||
|
|
||||||
private static func resolveFileName(displayName: String?) -> String {
|
private static func resolveFileName(displayName: String?) -> String {
|
||||||
@@ -520,6 +602,13 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
return "REC_\(formatter.string(from: Date())).mov"
|
return "REC_\(formatter.string(from: Date())).mov"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static let fileNameDateFormatter: DateFormatter = {
|
||||||
|
let formatter = DateFormatter()
|
||||||
|
formatter.locale = Locale(identifier: "en_US_POSIX")
|
||||||
|
formatter.dateFormat = "yyyyMMdd_HHmmss"
|
||||||
|
return formatter
|
||||||
|
}()
|
||||||
|
|
||||||
private func updateStatus(_ next: RecordingStatus) {
|
private func updateStatus(_ next: RecordingStatus) {
|
||||||
status = next
|
status = next
|
||||||
}
|
}
|
||||||
@@ -544,9 +633,9 @@ private final class RecordingCameraController: NSObject, AVCaptureFileOutputReco
|
|||||||
}
|
}
|
||||||
|
|
||||||
private enum RecordingChannelNames {
|
private enum RecordingChannelNames {
|
||||||
static let packageName = "com.qxy.dronex"
|
static let namespace = "app.record_tool"
|
||||||
static let method = "\(packageName)/recording"
|
static let method = "\(namespace)/recording"
|
||||||
static let events = "\(packageName)/recording_events"
|
static let events = "\(namespace)/recording_events"
|
||||||
}
|
}
|
||||||
|
|
||||||
final class RecordingPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
|
final class RecordingPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
|
||||||
@@ -587,6 +676,12 @@ final class RecordingPlugin: NSObject, FlutterPlugin, FlutterStreamHandler {
|
|||||||
controller.startRecording(withAudio: withAudio, displayName: displayName, result: result)
|
controller.startRecording(withAudio: withAudio, displayName: displayName, result: result)
|
||||||
case "stopRecording":
|
case "stopRecording":
|
||||||
controller.stopRecording(result: result)
|
controller.stopRecording(result: result)
|
||||||
|
case "getZoomCapabilities":
|
||||||
|
controller.zoomCapabilities(result: result)
|
||||||
|
case "setZoomRatio":
|
||||||
|
let args = call.arguments as? [String: Any]
|
||||||
|
let ratio = args?["zoomRatio"] as? Double ?? 1.0
|
||||||
|
controller.setZoomRatio(CGFloat(ratio), result: result)
|
||||||
case "disposePreview":
|
case "disposePreview":
|
||||||
controller.disposePreview(result: result)
|
controller.disposePreview(result: result)
|
||||||
case "getStatus":
|
case "getStatus":
|
||||||
|
|||||||
+2
-2
@@ -7,7 +7,7 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
|
|||||||
import 'package:recording_tool/app/config/app_config.dart';
|
import 'package:recording_tool/app/config/app_config.dart';
|
||||||
import 'package:recording_tool/app/router/app_navigator.dart';
|
import 'package:recording_tool/app/router/app_navigator.dart';
|
||||||
import 'package:recording_tool/app/theme/app_theme.dart';
|
import 'package:recording_tool/app/theme/app_theme.dart';
|
||||||
import 'package:recording_tool/features/recording/pages/page_record.dart';
|
import 'package:recording_tool/features/auth/pages/page_auth.dart';
|
||||||
import 'package:recording_tool/features/recording/view-model/view_model_recording.dart';
|
import 'package:recording_tool/features/recording/view-model/view_model_recording.dart';
|
||||||
|
|
||||||
class FlutterTemplateApp extends ConsumerStatefulWidget {
|
class FlutterTemplateApp extends ConsumerStatefulWidget {
|
||||||
@@ -74,7 +74,7 @@ class _FlutterTemplateAppState extends ConsumerState<FlutterTemplateApp>
|
|||||||
home: RefreshConfiguration(
|
home: RefreshConfiguration(
|
||||||
enableLoadingWhenNoData: false,
|
enableLoadingWhenNoData: false,
|
||||||
headerTriggerDistance: 80.h,
|
headerTriggerDistance: 80.h,
|
||||||
child: const RecordingPage(),
|
child: const AuthPageWidget(),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -37,12 +37,12 @@ class AppConfig {
|
|||||||
),
|
),
|
||||||
AppEnvironment.staging => const EnvironmentValues(
|
AppEnvironment.staging => const EnvironmentValues(
|
||||||
environment: AppEnvironment.staging,
|
environment: AppEnvironment.staging,
|
||||||
baseUrl: 'https://staging.example.com/api',
|
baseUrl: 'https://example.com/api',
|
||||||
enableNetworkLog: true,
|
enableNetworkLog: true,
|
||||||
),
|
),
|
||||||
AppEnvironment.prod => const EnvironmentValues(
|
AppEnvironment.prod => const EnvironmentValues(
|
||||||
environment: AppEnvironment.prod,
|
environment: AppEnvironment.prod,
|
||||||
baseUrl: 'https://api.example.com',
|
baseUrl: 'https://example.com/api',
|
||||||
enableNetworkLog: false,
|
enableNetworkLog: false,
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ class AppPlatformInfo {
|
|||||||
AppPlatformInfo._();
|
AppPlatformInfo._();
|
||||||
|
|
||||||
static const MethodChannel _channel = MethodChannel(
|
static const MethodChannel _channel = MethodChannel(
|
||||||
'com.qxy.dronex/platform_info',
|
'app.record_tool/platform_info',
|
||||||
);
|
);
|
||||||
|
|
||||||
static Future<AppPackageInfo> packageInfo() async {
|
static Future<AppPackageInfo> packageInfo() async {
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
|
import 'package:recording_tool/app/router/app_navigator.dart';
|
||||||
|
import 'package:recording_tool/features/scan_qrcode/pages/page_scan_qrcode.dart';
|
||||||
|
import 'package:recording_tool/shared/widgets/widgets.dart';
|
||||||
|
|
||||||
|
class AuthPageWidget extends StatefulWidget {
|
||||||
|
const AuthPageWidget({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AuthPageWidget> createState() => _AuthPageWidgetState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AuthPageWidgetState extends State<AuthPageWidget> {
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Center(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
SizedBox(height: 180.h),
|
||||||
|
Text('裁判工作台', style: TextStyle(fontSize: 50, color: Colors.black)),
|
||||||
|
SizedBox(height: 20.h),
|
||||||
|
Text(
|
||||||
|
'Auth Page',
|
||||||
|
style: TextStyle(fontSize: 30, color: Colors.black),
|
||||||
|
),
|
||||||
|
SizedBox(height: 20.h),
|
||||||
|
|
||||||
|
SizedBox(
|
||||||
|
width: 280.w,
|
||||||
|
height: 80.h,
|
||||||
|
child: AppTextField(initialValue: 'hhh'),
|
||||||
|
),
|
||||||
|
SizedBox(height: 20.h),
|
||||||
|
SizedBox(
|
||||||
|
width: 280.w,
|
||||||
|
height: 80.h,
|
||||||
|
child: AppButton(
|
||||||
|
label: '确定',
|
||||||
|
onPressed: () {
|
||||||
|
AppNavigator.push(const ScanQrCodePage());
|
||||||
|
},
|
||||||
|
variant: AppButtonVariant.secondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,30 +7,40 @@ class RecordingSessionState {
|
|||||||
this.isTouchLocked = true,
|
this.isTouchLocked = true,
|
||||||
this.isPreviewReady = false,
|
this.isPreviewReady = false,
|
||||||
this.isStartingRecording = false,
|
this.isStartingRecording = false,
|
||||||
|
this.isSwitchingLens = false,
|
||||||
this.hasDndAccess = false,
|
this.hasDndAccess = false,
|
||||||
this.isBatteryOptimizedIgnored = true,
|
this.isBatteryOptimizedIgnored = true,
|
||||||
this.notificationsGranted = true,
|
this.notificationsGranted = true,
|
||||||
this.isMicrophoneGranted = false,
|
this.isMicrophoneGranted = false,
|
||||||
|
this.zoomRatio = 1.0,
|
||||||
|
this.minZoomRatio = 1.0,
|
||||||
|
this.maxZoomRatio = 3.0,
|
||||||
this.lastOutputPath,
|
this.lastOutputPath,
|
||||||
this.lastSavedDisplayName,
|
this.lastSavedDisplayName,
|
||||||
this.errorMessage,
|
this.errorMessage,
|
||||||
this.permissionWarning,
|
this.permissionWarning,
|
||||||
this.gallerySaveFailed = false,
|
this.fileSaveFailed = false,
|
||||||
|
this.segmentOutputPaths = const [],
|
||||||
});
|
});
|
||||||
|
|
||||||
final RecordingStatus status;
|
final RecordingStatus status;
|
||||||
final bool isTouchLocked;
|
final bool isTouchLocked;
|
||||||
final bool isPreviewReady;
|
final bool isPreviewReady;
|
||||||
final bool isStartingRecording;
|
final bool isStartingRecording;
|
||||||
|
final bool isSwitchingLens;
|
||||||
final bool hasDndAccess;
|
final bool hasDndAccess;
|
||||||
final bool isBatteryOptimizedIgnored;
|
final bool isBatteryOptimizedIgnored;
|
||||||
final bool notificationsGranted;
|
final bool notificationsGranted;
|
||||||
final bool isMicrophoneGranted;
|
final bool isMicrophoneGranted;
|
||||||
|
final double zoomRatio;
|
||||||
|
final double minZoomRatio;
|
||||||
|
final double maxZoomRatio;
|
||||||
final String? lastOutputPath;
|
final String? lastOutputPath;
|
||||||
final String? lastSavedDisplayName;
|
final String? lastSavedDisplayName;
|
||||||
final String? errorMessage;
|
final String? errorMessage;
|
||||||
final String? permissionWarning;
|
final String? permissionWarning;
|
||||||
final bool gallerySaveFailed;
|
final bool fileSaveFailed;
|
||||||
|
final List<String> segmentOutputPaths;
|
||||||
|
|
||||||
bool get isRecording => status.isRecording;
|
bool get isRecording => status.isRecording;
|
||||||
|
|
||||||
@@ -47,15 +57,20 @@ class RecordingSessionState {
|
|||||||
bool? isTouchLocked,
|
bool? isTouchLocked,
|
||||||
bool? isPreviewReady,
|
bool? isPreviewReady,
|
||||||
bool? isStartingRecording,
|
bool? isStartingRecording,
|
||||||
|
bool? isSwitchingLens,
|
||||||
bool? hasDndAccess,
|
bool? hasDndAccess,
|
||||||
bool? isBatteryOptimizedIgnored,
|
bool? isBatteryOptimizedIgnored,
|
||||||
bool? notificationsGranted,
|
bool? notificationsGranted,
|
||||||
bool? isMicrophoneGranted,
|
bool? isMicrophoneGranted,
|
||||||
|
double? zoomRatio,
|
||||||
|
double? minZoomRatio,
|
||||||
|
double? maxZoomRatio,
|
||||||
String? lastOutputPath,
|
String? lastOutputPath,
|
||||||
String? lastSavedDisplayName,
|
String? lastSavedDisplayName,
|
||||||
String? errorMessage,
|
String? errorMessage,
|
||||||
String? permissionWarning,
|
String? permissionWarning,
|
||||||
bool? gallerySaveFailed,
|
bool? fileSaveFailed,
|
||||||
|
List<String>? segmentOutputPaths,
|
||||||
bool clearPermissionWarning = false,
|
bool clearPermissionWarning = false,
|
||||||
bool clearLastSaved = false,
|
bool clearLastSaved = false,
|
||||||
}) {
|
}) {
|
||||||
@@ -64,11 +79,15 @@ class RecordingSessionState {
|
|||||||
isTouchLocked: isTouchLocked ?? this.isTouchLocked,
|
isTouchLocked: isTouchLocked ?? this.isTouchLocked,
|
||||||
isPreviewReady: isPreviewReady ?? this.isPreviewReady,
|
isPreviewReady: isPreviewReady ?? this.isPreviewReady,
|
||||||
isStartingRecording: isStartingRecording ?? this.isStartingRecording,
|
isStartingRecording: isStartingRecording ?? this.isStartingRecording,
|
||||||
|
isSwitchingLens: isSwitchingLens ?? this.isSwitchingLens,
|
||||||
hasDndAccess: hasDndAccess ?? this.hasDndAccess,
|
hasDndAccess: hasDndAccess ?? this.hasDndAccess,
|
||||||
isBatteryOptimizedIgnored:
|
isBatteryOptimizedIgnored:
|
||||||
isBatteryOptimizedIgnored ?? this.isBatteryOptimizedIgnored,
|
isBatteryOptimizedIgnored ?? this.isBatteryOptimizedIgnored,
|
||||||
notificationsGranted: notificationsGranted ?? this.notificationsGranted,
|
notificationsGranted: notificationsGranted ?? this.notificationsGranted,
|
||||||
isMicrophoneGranted: isMicrophoneGranted ?? this.isMicrophoneGranted,
|
isMicrophoneGranted: isMicrophoneGranted ?? this.isMicrophoneGranted,
|
||||||
|
zoomRatio: zoomRatio ?? this.zoomRatio,
|
||||||
|
minZoomRatio: minZoomRatio ?? this.minZoomRatio,
|
||||||
|
maxZoomRatio: maxZoomRatio ?? this.maxZoomRatio,
|
||||||
lastOutputPath: lastOutputPath ?? this.lastOutputPath,
|
lastOutputPath: lastOutputPath ?? this.lastOutputPath,
|
||||||
lastSavedDisplayName: clearLastSaved
|
lastSavedDisplayName: clearLastSaved
|
||||||
? null
|
? null
|
||||||
@@ -77,7 +96,8 @@ class RecordingSessionState {
|
|||||||
permissionWarning: clearPermissionWarning
|
permissionWarning: clearPermissionWarning
|
||||||
? null
|
? null
|
||||||
: (permissionWarning ?? this.permissionWarning),
|
: (permissionWarning ?? this.permissionWarning),
|
||||||
gallerySaveFailed: gallerySaveFailed ?? this.gallerySaveFailed,
|
fileSaveFailed: fileSaveFailed ?? this.fileSaveFailed,
|
||||||
|
segmentOutputPaths: segmentOutputPaths ?? this.segmentOutputPaths,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,8 +172,12 @@ class _RecordingPageState extends ConsumerState<RecordingPage> {
|
|||||||
await ref.read(recordingViewModelProvider.notifier).stopRecording();
|
await ref.read(recordingViewModelProvider.notifier).stopRecording();
|
||||||
if (!mounted) return;
|
if (!mounted) return;
|
||||||
final latest = ref.read(recordingViewModelProvider).session;
|
final latest = ref.read(recordingViewModelProvider).session;
|
||||||
if (latest.gallerySaveFailed) {
|
if (latest.fileSaveFailed) {
|
||||||
AppToast.show(latest.errorMessage ?? '保存到相册失败,请开启相册权限');
|
if (latest.segmentOutputPaths.isNotEmpty) {
|
||||||
|
AppToast.show('视频合并失败,已为你保存分段文件,可在相册中查看');
|
||||||
|
} else {
|
||||||
|
AppToast.show(latest.errorMessage ?? '保存到文件夹失败,请检查文件保存权限');
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await _showRecordingSavedDialogIfNeeded();
|
await _showRecordingSavedDialogIfNeeded();
|
||||||
@@ -190,7 +194,7 @@ class _RecordingPageState extends ConsumerState<RecordingPage> {
|
|||||||
Future<void> _showRecordingSavedDialogIfNeeded() async {
|
Future<void> _showRecordingSavedDialogIfNeeded() async {
|
||||||
final recordingInfo = ref.read(recordingViewModelProvider);
|
final recordingInfo = ref.read(recordingViewModelProvider);
|
||||||
final session = recordingInfo.session;
|
final session = recordingInfo.session;
|
||||||
if (session.lastSavedDisplayName == null || session.gallerySaveFailed) {
|
if (session.lastSavedDisplayName == null || session.fileSaveFailed) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,10 +361,7 @@ class _PreviewLoadingLayer extends ConsumerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _RecordingHudLayer extends ConsumerWidget {
|
class _RecordingHudLayer extends ConsumerWidget {
|
||||||
const _RecordingHudLayer({
|
const _RecordingHudLayer({required this.onStart, required this.onStop});
|
||||||
required this.onStart,
|
|
||||||
required this.onStop,
|
|
||||||
});
|
|
||||||
|
|
||||||
final Future<void> Function() onStart;
|
final Future<void> Function() onStart;
|
||||||
final Future<void> Function() onStop;
|
final Future<void> Function() onStop;
|
||||||
@@ -377,7 +378,11 @@ class _RecordingHudLayer extends ConsumerWidget {
|
|||||||
m.session.notificationsGranted,
|
m.session.notificationsGranted,
|
||||||
m.session.isRecording,
|
m.session.isRecording,
|
||||||
m.session.isStartingRecording,
|
m.session.isStartingRecording,
|
||||||
|
m.session.isSwitchingLens,
|
||||||
m.session.isTouchLocked,
|
m.session.isTouchLocked,
|
||||||
|
m.session.zoomRatio,
|
||||||
|
m.session.minZoomRatio,
|
||||||
|
m.session.maxZoomRatio,
|
||||||
m.hasValidClipboardInfo,
|
m.hasValidClipboardInfo,
|
||||||
m.clipboardRecordingModel.address.trim(),
|
m.clipboardRecordingModel.address.trim(),
|
||||||
),
|
),
|
||||||
@@ -391,7 +396,11 @@ class _RecordingHudLayer extends ConsumerWidget {
|
|||||||
notificationsGranted,
|
notificationsGranted,
|
||||||
isRecording,
|
isRecording,
|
||||||
isStartingRecording,
|
isStartingRecording,
|
||||||
|
isSwitchingLens,
|
||||||
isTouchLocked,
|
isTouchLocked,
|
||||||
|
zoomRatio,
|
||||||
|
minZoomRatio,
|
||||||
|
maxZoomRatio,
|
||||||
showClipboardHint,
|
showClipboardHint,
|
||||||
clipboardAddress,
|
clipboardAddress,
|
||||||
) = hudState;
|
) = hudState;
|
||||||
@@ -405,7 +414,11 @@ class _RecordingHudLayer extends ConsumerWidget {
|
|||||||
notificationsGranted: notificationsGranted,
|
notificationsGranted: notificationsGranted,
|
||||||
isRecording: isRecording,
|
isRecording: isRecording,
|
||||||
isStartingRecording: isStartingRecording,
|
isStartingRecording: isStartingRecording,
|
||||||
|
isSwitchingLens: isSwitchingLens,
|
||||||
isTouchLocked: isTouchLocked,
|
isTouchLocked: isTouchLocked,
|
||||||
|
zoomRatio: zoomRatio,
|
||||||
|
minZoomRatio: minZoomRatio,
|
||||||
|
maxZoomRatio: maxZoomRatio,
|
||||||
showClipboardHint: showClipboardHint,
|
showClipboardHint: showClipboardHint,
|
||||||
clipboardAddress: clipboardAddress,
|
clipboardAddress: clipboardAddress,
|
||||||
onStart: onStart,
|
onStart: onStart,
|
||||||
@@ -419,9 +432,15 @@ class _RecordingHudLayer extends ConsumerWidget {
|
|||||||
await viewModel.refreshBatteryOptimization();
|
await viewModel.refreshBatteryOptimization();
|
||||||
},
|
},
|
||||||
onToggleTouchLock: () {
|
onToggleTouchLock: () {
|
||||||
final locked = ref.read(recordingViewModelProvider).session.isTouchLocked;
|
final locked = ref
|
||||||
|
.read(recordingViewModelProvider)
|
||||||
|
.session
|
||||||
|
.isTouchLocked;
|
||||||
viewModel.setTouchLocked(!locked);
|
viewModel.setTouchLocked(!locked);
|
||||||
},
|
},
|
||||||
|
onZoomSelected: (ratio) async {
|
||||||
|
await viewModel.setZoomRatio(ratio);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
abstract final class RecordingChannelNames {
|
abstract final class RecordingChannelNames {
|
||||||
static const packageName = 'com.qxy.dronex';
|
static const namespace = 'app.record_tool';
|
||||||
static const method = '$packageName/recording';
|
static const method = '$namespace/recording';
|
||||||
static const events = '$packageName/recording_events';
|
static const events = '$namespace/recording_events';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,6 +81,21 @@ class RecordingPlatform {
|
|||||||
return RecordingStatus.fromMap(result ?? const {});
|
return RecordingStatus.fromMap(result ?? const {});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Future<RecordingZoomCapabilities> getZoomCapabilities() async {
|
||||||
|
final result = await _channel.invokeMapMethod<String, dynamic>(
|
||||||
|
'getZoomCapabilities',
|
||||||
|
);
|
||||||
|
return RecordingZoomCapabilities.fromMap(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<RecordingZoomCapabilities> setZoomRatio(double ratio) async {
|
||||||
|
final result = await _channel.invokeMapMethod<String, dynamic>(
|
||||||
|
'setZoomRatio',
|
||||||
|
<String, dynamic>{'zoomRatio': ratio},
|
||||||
|
);
|
||||||
|
return RecordingZoomCapabilities.fromMap(result);
|
||||||
|
}
|
||||||
|
|
||||||
static Future<RecordingStartResult> startRecording({
|
static Future<RecordingStartResult> startRecording({
|
||||||
bool withAudio = true,
|
bool withAudio = true,
|
||||||
bool enableDoNotDisturb = true,
|
bool enableDoNotDisturb = true,
|
||||||
@@ -156,6 +171,29 @@ class RecordingPlatform {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class RecordingZoomCapabilities {
|
||||||
|
const RecordingZoomCapabilities({
|
||||||
|
required this.zoomRatio,
|
||||||
|
required this.minZoomRatio,
|
||||||
|
required this.maxZoomRatio,
|
||||||
|
});
|
||||||
|
|
||||||
|
final double zoomRatio;
|
||||||
|
final double minZoomRatio;
|
||||||
|
final double maxZoomRatio;
|
||||||
|
|
||||||
|
factory RecordingZoomCapabilities.fromMap(Map<String, dynamic>? map) {
|
||||||
|
final minZoomRatio = (map?['minZoomRatio'] as num?)?.toDouble() ?? 1.0;
|
||||||
|
final maxZoomRatio = (map?['maxZoomRatio'] as num?)?.toDouble() ?? 3.0;
|
||||||
|
final zoomRatio = (map?['zoomRatio'] as num?)?.toDouble() ?? minZoomRatio;
|
||||||
|
return RecordingZoomCapabilities(
|
||||||
|
zoomRatio: zoomRatio.clamp(minZoomRatio, maxZoomRatio).toDouble(),
|
||||||
|
minZoomRatio: minZoomRatio,
|
||||||
|
maxZoomRatio: maxZoomRatio,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class RecordingStartResult {
|
class RecordingStartResult {
|
||||||
const RecordingStartResult({this.outputPath, required this.status});
|
const RecordingStartResult({this.outputPath, required this.status});
|
||||||
|
|
||||||
@@ -167,14 +205,16 @@ class RecordingStopResult {
|
|||||||
const RecordingStopResult({
|
const RecordingStopResult({
|
||||||
this.outputPath,
|
this.outputPath,
|
||||||
required this.status,
|
required this.status,
|
||||||
this.gallerySaved = true,
|
this.fileSaved = true,
|
||||||
this.galleryErrorMessage,
|
this.fileErrorMessage,
|
||||||
|
this.segmentOutputPaths = const [],
|
||||||
});
|
});
|
||||||
|
|
||||||
final String? outputPath;
|
final String? outputPath;
|
||||||
final RecordingStatus status;
|
final RecordingStatus status;
|
||||||
final bool gallerySaved;
|
final bool fileSaved;
|
||||||
final String? galleryErrorMessage;
|
final String? fileErrorMessage;
|
||||||
|
final List<String> segmentOutputPaths;
|
||||||
|
|
||||||
factory RecordingStopResult.fromMap(Map<String, dynamic>? result) {
|
factory RecordingStopResult.fromMap(Map<String, dynamic>? result) {
|
||||||
return RecordingStopResult(
|
return RecordingStopResult(
|
||||||
@@ -182,8 +222,13 @@ class RecordingStopResult {
|
|||||||
status: RecordingStatus.fromMap(
|
status: RecordingStatus.fromMap(
|
||||||
Map<dynamic, dynamic>.from(result?['status'] as Map? ?? const {}),
|
Map<dynamic, dynamic>.from(result?['status'] as Map? ?? const {}),
|
||||||
),
|
),
|
||||||
gallerySaved: result?['gallerySaved'] as bool? ?? true,
|
fileSaved: result?['fileSaved'] as bool? ?? true,
|
||||||
galleryErrorMessage: result?['galleryErrorMessage'] as String?,
|
fileErrorMessage: result?['fileErrorMessage'] as String?,
|
||||||
|
segmentOutputPaths:
|
||||||
|
(result?['segmentOutputPaths'] as List?)?.whereType<String>().toList(
|
||||||
|
growable: false,
|
||||||
|
) ??
|
||||||
|
const [],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
import 'package:recording_tool/core/logging/app_logger.dart';
|
import 'package:recording_tool/core/logging/app_logger.dart';
|
||||||
import 'package:recording_tool/core/permission/permission_service.dart';
|
import 'package:recording_tool/core/permission/permission_service.dart';
|
||||||
|
import 'package:recording_tool/core/platform/app_platform_info.dart';
|
||||||
import 'package:recording_tool/features/recording/model/model_clipboard.dart';
|
import 'package:recording_tool/features/recording/model/model_clipboard.dart';
|
||||||
import 'package:recording_tool/features/recording/model/model_recording.dart';
|
import 'package:recording_tool/features/recording/model/model_recording.dart';
|
||||||
import 'package:recording_tool/features/recording/model/model_recording_session.dart';
|
import 'package:recording_tool/features/recording/model/model_recording_session.dart';
|
||||||
@@ -31,15 +32,19 @@ enum ClipboardReadResult {
|
|||||||
invalid,
|
invalid,
|
||||||
}
|
}
|
||||||
|
|
||||||
List<Permission> recordingGalleryPermissionsForHost({
|
List<Permission> recordingFileSavePermissionsForHost({
|
||||||
required bool isIOS,
|
required bool isIOS,
|
||||||
required bool isAndroid,
|
required bool isAndroid,
|
||||||
|
int? androidSdkInt,
|
||||||
}) {
|
}) {
|
||||||
if (isIOS) {
|
if (isIOS) {
|
||||||
return [Permission.photosAddOnly];
|
return const [];
|
||||||
}
|
}
|
||||||
if (isAndroid) {
|
if (isAndroid) {
|
||||||
return [Permission.videos, Permission.storage];
|
if (androidSdkInt != null && androidSdkInt <= 28) {
|
||||||
|
return [Permission.storage];
|
||||||
|
}
|
||||||
|
return const [];
|
||||||
}
|
}
|
||||||
return const [];
|
return const [];
|
||||||
}
|
}
|
||||||
@@ -144,11 +149,12 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final fileSavePermissions = await _fileSavePermissions();
|
||||||
final permissions = await PermissionService.requestMissing([
|
final permissions = await PermissionService.requestMissing([
|
||||||
Permission.camera,
|
Permission.camera,
|
||||||
Permission.microphone,
|
Permission.microphone,
|
||||||
if (Platform.isAndroid) Permission.notification,
|
if (Platform.isAndroid) Permission.notification,
|
||||||
..._galleryPermissions(),
|
...fileSavePermissions,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
final cameraGranted = permissions[Permission.camera]?.isGranted ?? false;
|
final cameraGranted = permissions[Permission.camera]?.isGranted ?? false;
|
||||||
@@ -170,8 +176,8 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
if (!microphoneGranted) {
|
if (!microphoneGranted) {
|
||||||
warnings.add('未授予麦克风权限,当前将以静音模式录制');
|
warnings.add('未授予麦克风权限,当前将以静音模式录制');
|
||||||
}
|
}
|
||||||
if (!_isGalleryPermissionGranted(permissions)) {
|
if (!_isFileSavePermissionGranted(permissions, fileSavePermissions)) {
|
||||||
warnings.add('未授予相册权限,录制结束后可能无法保存到相册');
|
warnings.add('未授予文件保存权限,录制结束后可能无法保存到文件夹');
|
||||||
}
|
}
|
||||||
|
|
||||||
final hasDnd = await RecordingPlatform.hasNotificationPolicyAccess();
|
final hasDnd = await RecordingPlatform.hasNotificationPolicyAccess();
|
||||||
@@ -193,6 +199,7 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
await _listenStatus();
|
await _listenStatus();
|
||||||
try {
|
try {
|
||||||
final status = await _initializePreviewWithRetry();
|
final status = await _initializePreviewWithRetry();
|
||||||
|
await _refreshZoomCapabilities();
|
||||||
_updateSession(
|
_updateSession(
|
||||||
(s) => s.copyWith(
|
(s) => s.copyWith(
|
||||||
status: status,
|
status: status,
|
||||||
@@ -239,6 +246,7 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
);
|
);
|
||||||
try {
|
try {
|
||||||
final status = await _initializePreviewWithRetry();
|
final status = await _initializePreviewWithRetry();
|
||||||
|
await _refreshZoomCapabilities();
|
||||||
_updateSession(
|
_updateSession(
|
||||||
(s) => s.copyWith(
|
(s) => s.copyWith(
|
||||||
status: status,
|
status: status,
|
||||||
@@ -258,24 +266,36 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 当前平台所需的相册/视频保存权限列表。
|
/// 当前平台所需的视频文件保存权限列表。
|
||||||
List<Permission> _galleryPermissions() {
|
Future<List<Permission>> _fileSavePermissions() async {
|
||||||
return recordingGalleryPermissionsForHost(
|
int? androidSdkInt;
|
||||||
|
if (Platform.isAndroid) {
|
||||||
|
try {
|
||||||
|
androidSdkInt = int.tryParse(
|
||||||
|
(await AppPlatformInfo.deviceInfo()).values['sdkInt'] ?? '',
|
||||||
|
);
|
||||||
|
} on PlatformException {
|
||||||
|
androidSdkInt = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return recordingFileSavePermissionsForHost(
|
||||||
isIOS: Platform.isIOS,
|
isIOS: Platform.isIOS,
|
||||||
isAndroid: Platform.isAndroid,
|
isAndroid: Platform.isAndroid,
|
||||||
|
androidSdkInt: androidSdkInt,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 判断相册相关权限是否至少有一项已授予。
|
/// 判断文件保存相关权限是否至少有一项已授予。
|
||||||
bool _isGalleryPermissionGranted(
|
bool _isFileSavePermissionGranted(
|
||||||
Map<Permission, PermissionStatus> permissions,
|
Map<Permission, PermissionStatus> permissions,
|
||||||
|
List<Permission> fileSavePermissions,
|
||||||
) {
|
) {
|
||||||
for (final permission in _galleryPermissions()) {
|
for (final permission in fileSavePermissions) {
|
||||||
if (permissions[permission]?.isGranted ?? false) {
|
if (permissions[permission]?.isGranted ?? false) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return _galleryPermissions().isEmpty;
|
return fileSavePermissions.isEmpty;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 检测并尝试申请相机、麦克风权限,同步更新 session 中的 isMicrophoneGranted。
|
/// 检测并尝试申请相机、麦克风权限,同步更新 session 中的 isMicrophoneGranted。
|
||||||
@@ -309,10 +329,62 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
return status?.isGranted == true || status?.isLimited == true;
|
return status?.isGranted == true || status?.isLimited == true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 读取相机支持的倍距范围并同步当前倍距。
|
||||||
|
Future<void> _refreshZoomCapabilities() async {
|
||||||
|
try {
|
||||||
|
final zoom = await RecordingPlatform.getZoomCapabilities();
|
||||||
|
_updateSession(
|
||||||
|
(s) => s.copyWith(
|
||||||
|
zoomRatio: zoom.zoomRatio,
|
||||||
|
minZoomRatio: zoom.minZoomRatio,
|
||||||
|
maxZoomRatio: zoom.maxZoomRatio,
|
||||||
|
errorMessage: null,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} on PlatformException catch (error) {
|
||||||
|
AppLogger.debug('读取相机倍距能力失败', error: error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置相机倍距,原生层会返回设备实际应用后的倍距范围与当前值。
|
||||||
|
Future<void> setZoomRatio(double ratio) async {
|
||||||
|
final session = state.session;
|
||||||
|
if (session.isSwitchingLens) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final clamped = ratio
|
||||||
|
.clamp(session.minZoomRatio, session.maxZoomRatio)
|
||||||
|
.toDouble();
|
||||||
|
|
||||||
|
_updateSession((s) => s.copyWith(isSwitchingLens: true));
|
||||||
|
try {
|
||||||
|
final zoom = await RecordingPlatform.setZoomRatio(clamped);
|
||||||
|
_updateSession(
|
||||||
|
(s) => s.copyWith(
|
||||||
|
zoomRatio: zoom.zoomRatio,
|
||||||
|
minZoomRatio: zoom.minZoomRatio,
|
||||||
|
maxZoomRatio: zoom.maxZoomRatio,
|
||||||
|
errorMessage: null,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} on PlatformException catch (error) {
|
||||||
|
final message = error.code == 'ZOOM_FAILED'
|
||||||
|
? '切换镜头失败,请重试'
|
||||||
|
: (error.message ?? '相机倍距设置失败');
|
||||||
|
_updateSession((s) => s.copyWith(errorMessage: message));
|
||||||
|
} finally {
|
||||||
|
_updateSession(
|
||||||
|
(s) => s.copyWith(isSwitchingLens: false, errorMessage: s.errorMessage),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 开始录制,可选开启勿扰模式。
|
/// 开始录制,可选开启勿扰模式。
|
||||||
Future<void> startRecording({bool enableDoNotDisturb = true}) async {
|
Future<void> startRecording({bool enableDoNotDisturb = true}) async {
|
||||||
final session = state.session;
|
final session = state.session;
|
||||||
if (session.isRecording || session.isStartingRecording) {
|
if (session.isRecording ||
|
||||||
|
session.isStartingRecording ||
|
||||||
|
session.isSwitchingLens) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!session.isPreviewReady) {
|
if (!session.isPreviewReady) {
|
||||||
@@ -338,7 +410,8 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
lastOutputPath: result.outputPath,
|
lastOutputPath: result.outputPath,
|
||||||
isTouchLocked: true,
|
isTouchLocked: true,
|
||||||
errorMessage: null,
|
errorMessage: null,
|
||||||
gallerySaveFailed: false,
|
fileSaveFailed: false,
|
||||||
|
segmentOutputPaths: const [],
|
||||||
clearLastSaved: true,
|
clearLastSaved: true,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -351,13 +424,13 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 停止录制、保存到相册,并恢复相机预览。
|
/// 停止录制、保存到文件夹,并恢复相机预览。
|
||||||
Future<void> stopRecording() async {
|
Future<void> stopRecording() async {
|
||||||
if (!state.session.isRecording) return;
|
if (!state.session.isRecording || state.session.isSwitchingLens) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final result = await RecordingPlatform.stopRecording();
|
final result = await RecordingPlatform.stopRecording();
|
||||||
final galleryFailed = !result.gallerySaved;
|
final fileFailed = !result.fileSaved;
|
||||||
final savedName = recordingFileNameForPlatform(
|
final savedName = recordingFileNameForPlatform(
|
||||||
state.clipboardRecordingModel.filename,
|
state.clipboardRecordingModel.filename,
|
||||||
);
|
);
|
||||||
@@ -365,11 +438,12 @@ class RecordingViewModel extends Notifier<RecordingModel> {
|
|||||||
(s) => s.copyWith(
|
(s) => s.copyWith(
|
||||||
status: result.status,
|
status: result.status,
|
||||||
lastOutputPath: result.outputPath ?? s.lastOutputPath,
|
lastOutputPath: result.outputPath ?? s.lastOutputPath,
|
||||||
lastSavedDisplayName: galleryFailed ? null : savedName,
|
lastSavedDisplayName: fileFailed ? null : savedName,
|
||||||
errorMessage: galleryFailed
|
errorMessage: fileFailed
|
||||||
? (result.galleryErrorMessage ?? '保存到相册失败,请开启相册权限')
|
? (result.fileErrorMessage ?? '保存到文件夹失败,请检查文件保存权限')
|
||||||
: null,
|
: null,
|
||||||
gallerySaveFailed: galleryFailed,
|
fileSaveFailed: fileFailed,
|
||||||
|
segmentOutputPaths: result.segmentOutputPaths,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} on PlatformException catch (error) {
|
} on PlatformException catch (error) {
|
||||||
|
|||||||
@@ -18,14 +18,19 @@ class RecordingHudWidget extends StatelessWidget {
|
|||||||
required this.notificationsGranted,
|
required this.notificationsGranted,
|
||||||
required this.isRecording,
|
required this.isRecording,
|
||||||
required this.isStartingRecording,
|
required this.isStartingRecording,
|
||||||
|
required this.isSwitchingLens,
|
||||||
required this.isTouchLocked,
|
required this.isTouchLocked,
|
||||||
this.showClipboardHint = false,
|
this.showClipboardHint = false,
|
||||||
this.clipboardAddress = '',
|
this.clipboardAddress = '',
|
||||||
|
required this.zoomRatio,
|
||||||
|
required this.minZoomRatio,
|
||||||
|
required this.maxZoomRatio,
|
||||||
required this.onStart,
|
required this.onStart,
|
||||||
required this.onStop,
|
required this.onStop,
|
||||||
required this.onOpenDnd,
|
required this.onOpenDnd,
|
||||||
required this.onOpenBattery,
|
required this.onOpenBattery,
|
||||||
required this.onToggleTouchLock,
|
required this.onToggleTouchLock,
|
||||||
|
required this.onZoomSelected,
|
||||||
});
|
});
|
||||||
|
|
||||||
final String? errorMessage;
|
final String? errorMessage;
|
||||||
@@ -35,14 +40,19 @@ class RecordingHudWidget extends StatelessWidget {
|
|||||||
final bool notificationsGranted;
|
final bool notificationsGranted;
|
||||||
final bool isRecording;
|
final bool isRecording;
|
||||||
final bool isStartingRecording;
|
final bool isStartingRecording;
|
||||||
|
final bool isSwitchingLens;
|
||||||
final bool isTouchLocked;
|
final bool isTouchLocked;
|
||||||
final bool showClipboardHint;
|
final bool showClipboardHint;
|
||||||
final String clipboardAddress;
|
final String clipboardAddress;
|
||||||
|
final double zoomRatio;
|
||||||
|
final double minZoomRatio;
|
||||||
|
final double maxZoomRatio;
|
||||||
final Future<void> Function() onStart;
|
final Future<void> Function() onStart;
|
||||||
final Future<void> Function() onStop;
|
final Future<void> Function() onStop;
|
||||||
final VoidCallback onOpenDnd;
|
final VoidCallback onOpenDnd;
|
||||||
final VoidCallback onOpenBattery;
|
final VoidCallback onOpenBattery;
|
||||||
final VoidCallback onToggleTouchLock;
|
final VoidCallback onToggleTouchLock;
|
||||||
|
final ValueChanged<double> onZoomSelected;
|
||||||
|
|
||||||
static double get _recordButtonSize => 70.r;
|
static double get _recordButtonSize => 70.r;
|
||||||
static double get _recordButtonBottom => 63.r;
|
static double get _recordButtonBottom => 63.r;
|
||||||
@@ -133,6 +143,18 @@ class RecordingHudWidget extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
Positioned(
|
||||||
|
right: 16.r,
|
||||||
|
bottom: 260.r,
|
||||||
|
child: _ZoomPresetControl(
|
||||||
|
enabled: !isSwitchingLens,
|
||||||
|
zoomRatio: zoomRatio,
|
||||||
|
minZoomRatio: minZoomRatio,
|
||||||
|
maxZoomRatio: maxZoomRatio,
|
||||||
|
presets: _zoomPresetsForRange(minZoomRatio),
|
||||||
|
onSelected: onZoomSelected,
|
||||||
|
),
|
||||||
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
left: 0,
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
@@ -141,7 +163,7 @@ class RecordingHudWidget extends StatelessWidget {
|
|||||||
child: RecordingControlButton(
|
child: RecordingControlButton(
|
||||||
isRecording: isRecording,
|
isRecording: isRecording,
|
||||||
isStartingRecording: isStartingRecording,
|
isStartingRecording: isStartingRecording,
|
||||||
enabled: !isStartingRecording,
|
enabled: !isStartingRecording && !isSwitchingLens,
|
||||||
size: _recordButtonSize,
|
size: _recordButtonSize,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
if (isRecording) {
|
if (isRecording) {
|
||||||
@@ -170,4 +192,140 @@ class RecordingHudWidget extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<double> _zoomPresetsForRange(double minZoomRatio) {
|
||||||
|
return [if (minZoomRatio < 1.0) minZoomRatio, 1.0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ZoomPresetControl extends StatelessWidget {
|
||||||
|
const _ZoomPresetControl({
|
||||||
|
required this.enabled,
|
||||||
|
required this.zoomRatio,
|
||||||
|
required this.minZoomRatio,
|
||||||
|
required this.maxZoomRatio,
|
||||||
|
required this.presets,
|
||||||
|
required this.onSelected,
|
||||||
|
});
|
||||||
|
|
||||||
|
final bool enabled;
|
||||||
|
final double zoomRatio;
|
||||||
|
final double minZoomRatio;
|
||||||
|
final double maxZoomRatio;
|
||||||
|
final List<double> presets;
|
||||||
|
final ValueChanged<double> onSelected;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final availablePresets = presets
|
||||||
|
.where(_isPresetAvailable)
|
||||||
|
.toList(growable: false);
|
||||||
|
if (availablePresets.isEmpty) {
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}
|
||||||
|
|
||||||
|
return DecoratedBox(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.black.withValues(alpha: 0.46),
|
||||||
|
borderRadius: BorderRadius.circular(18.r),
|
||||||
|
border: Border.all(color: Colors.white.withValues(alpha: 0.18)),
|
||||||
|
),
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.all(3.r),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
for (final preset in availablePresets)
|
||||||
|
_ZoomPresetButton(
|
||||||
|
displayRatio: preset,
|
||||||
|
requestRatio: preset,
|
||||||
|
selected: _isPresetSelected(preset),
|
||||||
|
enabled: enabled,
|
||||||
|
onSelected: onSelected,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool _isPresetAvailable(double preset) {
|
||||||
|
if (preset < 1.0) {
|
||||||
|
return minZoomRatio <= preset && maxZoomRatio >= preset;
|
||||||
|
}
|
||||||
|
return preset >= minZoomRatio && preset <= maxZoomRatio;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool _isPresetSelected(double preset) {
|
||||||
|
if (preset < 1.0) {
|
||||||
|
return zoomRatio < 1.0;
|
||||||
|
}
|
||||||
|
return (zoomRatio - preset).abs() < 0.05;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ZoomPresetButton extends StatelessWidget {
|
||||||
|
const _ZoomPresetButton({
|
||||||
|
required this.displayRatio,
|
||||||
|
required this.requestRatio,
|
||||||
|
required this.selected,
|
||||||
|
required this.enabled,
|
||||||
|
required this.onSelected,
|
||||||
|
});
|
||||||
|
|
||||||
|
final double displayRatio;
|
||||||
|
final double requestRatio;
|
||||||
|
final bool selected;
|
||||||
|
final bool enabled;
|
||||||
|
final ValueChanged<double> onSelected;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Padding(
|
||||||
|
padding: EdgeInsets.symmetric(horizontal: 1.r),
|
||||||
|
child: TextButton(
|
||||||
|
onPressed: selected || !enabled
|
||||||
|
? null
|
||||||
|
: () => RateLimit.instance.debounce<void>(
|
||||||
|
key:
|
||||||
|
'recording.session.zoom.${requestRatio.toStringAsFixed(1)}',
|
||||||
|
value: null,
|
||||||
|
duration: Duration(milliseconds: 300),
|
||||||
|
onCallback: (_) async {
|
||||||
|
onSelected(requestRatio);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
style: TextButton.styleFrom(
|
||||||
|
minimumSize: Size(38.r, 32.r),
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
tapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||||
|
foregroundColor: selected ? Colors.black : Colors.white,
|
||||||
|
disabledForegroundColor: Colors.black,
|
||||||
|
backgroundColor: selected ? Colors.white : Colors.transparent,
|
||||||
|
disabledBackgroundColor: Colors.white,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(15.r),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
_formatZoomRatio(displayRatio),
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13.sp,
|
||||||
|
fontWeight: FontWeight.w700,
|
||||||
|
letterSpacing: 0,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _formatZoomRatio(double ratio) {
|
||||||
|
if (ratio < 1.0) {
|
||||||
|
return '广角';
|
||||||
|
}
|
||||||
|
if (ratio == ratio.roundToDouble()) {
|
||||||
|
return '${ratio.toStringAsFixed(0)}x';
|
||||||
|
}
|
||||||
|
return '${ratio.toStringAsFixed(1)}x';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:recording_tool/features/dialog/dialog-record.dart';
|
import 'package:recording_tool/features/dialog/dialog-record.dart';
|
||||||
|
|
||||||
/// 录制结束并保存到相册后的后续操作弹窗。
|
/// 录制结束并保存到文件夹后的后续操作弹窗。
|
||||||
Future<void> showRecordingSavedDialog(
|
Future<void> showRecordingSavedDialog(
|
||||||
BuildContext context, {
|
BuildContext context, {
|
||||||
required String sessionTitle,
|
required String sessionTitle,
|
||||||
@@ -10,7 +10,7 @@ Future<void> showRecordingSavedDialog(
|
|||||||
}) {
|
}) {
|
||||||
return RecordDialog.showDouble(
|
return RecordDialog.showDouble(
|
||||||
context,
|
context,
|
||||||
title: '本轮比赛视频已保存到相册\n请选择后续录制信息',
|
title: '本轮比赛视频已保存到文件夹\n请选择后续录制信息',
|
||||||
leftText: '继续本轮',
|
leftText: '继续本轮',
|
||||||
rightText: '录制新轮',
|
rightText: '录制新轮',
|
||||||
onLeftPressed: onContinueRound,
|
onLeftPressed: onContinueRound,
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
|
import 'package:recording_tool/app/router/app_navigator.dart';
|
||||||
|
import 'package:recording_tool/shared/widgets/app_button.dart';
|
||||||
|
import 'package:recording_tool/shared/widgets/app_qr_scanner_dialog.dart';
|
||||||
|
import 'package:recording_tool/shared/widgets/app_webview.dart';
|
||||||
|
|
||||||
|
class ScanQrCodePage extends StatefulWidget {
|
||||||
|
const ScanQrCodePage({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ScanQrCodePage> createState() => _AuthPageWidgetState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AuthPageWidgetState extends State<ScanQrCodePage> {
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
leading: IconButton(
|
||||||
|
icon: const Icon(Icons.arrow_back),
|
||||||
|
onPressed: () {
|
||||||
|
Navigator.of(context).maybePop();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
centerTitle: true,
|
||||||
|
elevation: 0,
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
foregroundColor: Colors.black,
|
||||||
|
),
|
||||||
|
body: Center(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
SizedBox(height: 100.h),
|
||||||
|
Text('裁判工作台', style: TextStyle(fontSize: 30, color: Colors.black)),
|
||||||
|
SizedBox(height: 100.h),
|
||||||
|
Text(
|
||||||
|
'扫描选手参赛凭证进行执裁',
|
||||||
|
style: TextStyle(fontSize: 30, color: Colors.black),
|
||||||
|
),
|
||||||
|
SizedBox(height: 20.h),
|
||||||
|
|
||||||
|
SizedBox(
|
||||||
|
width: 280.w,
|
||||||
|
height: 80.h,
|
||||||
|
child: AppButton(
|
||||||
|
label: '扫码',
|
||||||
|
onPressed: () async {
|
||||||
|
final result = await AppQrScannerDialog.show(context);
|
||||||
|
if (result == null || result.isEmpty) return;
|
||||||
|
debugPrint('扫码结果: $result');
|
||||||
|
AppNavigator.push(
|
||||||
|
const WebviewPage(url: 'https://www.dronex.cc/'),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
variant: AppButtonVariant.secondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,331 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:math' as math;
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
|
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||||
|
|
||||||
|
class AppQrScannerDialog extends StatefulWidget {
|
||||||
|
const AppQrScannerDialog({super.key});
|
||||||
|
|
||||||
|
static Future<String?> show(BuildContext context) {
|
||||||
|
return showGeneralDialog<String>(
|
||||||
|
context: context,
|
||||||
|
barrierDismissible: false,
|
||||||
|
barrierLabel: MaterialLocalizations.of(context).modalBarrierDismissLabel,
|
||||||
|
barrierColor: Colors.black,
|
||||||
|
transitionDuration: const Duration(milliseconds: 180),
|
||||||
|
pageBuilder: (dialogContext, animation, secondaryAnimation) {
|
||||||
|
return const AppQrScannerDialog();
|
||||||
|
},
|
||||||
|
transitionBuilder: (context, animation, secondaryAnimation, child) {
|
||||||
|
return FadeTransition(opacity: animation, child: child);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AppQrScannerDialog> createState() => _AppQrScannerDialogState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AppQrScannerDialogState extends State<AppQrScannerDialog>
|
||||||
|
with SingleTickerProviderStateMixin {
|
||||||
|
late final MobileScannerController _controller;
|
||||||
|
late final AnimationController _scanLineController;
|
||||||
|
bool _hasScanned = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_controller = MobileScannerController(
|
||||||
|
detectionSpeed: DetectionSpeed.noDuplicates,
|
||||||
|
facing: CameraFacing.back,
|
||||||
|
formats: const [BarcodeFormat.qrCode],
|
||||||
|
);
|
||||||
|
_scanLineController = AnimationController(
|
||||||
|
vsync: this,
|
||||||
|
duration: const Duration(milliseconds: 1800),
|
||||||
|
)..repeat(reverse: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_scanLineController.dispose();
|
||||||
|
unawaited(_controller.dispose());
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _handleDetect(BarcodeCapture capture) async {
|
||||||
|
if (_hasScanned || capture.barcodes.isEmpty) return;
|
||||||
|
|
||||||
|
final value = capture.barcodes.first.rawValue;
|
||||||
|
if (value == null || value.isEmpty) return;
|
||||||
|
|
||||||
|
_hasScanned = true;
|
||||||
|
final navigator = Navigator.of(context, rootNavigator: true);
|
||||||
|
try {
|
||||||
|
await _controller.stop();
|
||||||
|
} catch (error) {
|
||||||
|
debugPrint('停止扫码相机失败: $error');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mounted) return;
|
||||||
|
navigator.pop(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _close() {
|
||||||
|
Navigator.of(context, rootNavigator: true).pop();
|
||||||
|
}
|
||||||
|
|
||||||
|
Rect _scanWindowFor(Size size) {
|
||||||
|
final scanSize = math.min(size.width * 0.72, 300.w);
|
||||||
|
final center = Offset(size.width / 2, size.height * 0.46);
|
||||||
|
return Rect.fromCenter(center: center, width: scanSize, height: scanSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Material(
|
||||||
|
color: Colors.black,
|
||||||
|
child: LayoutBuilder(
|
||||||
|
builder: (context, constraints) {
|
||||||
|
final size = constraints.biggest;
|
||||||
|
final scanWindow = _scanWindowFor(size);
|
||||||
|
|
||||||
|
return Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(
|
||||||
|
child: MobileScanner(
|
||||||
|
controller: _controller,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
scanWindow: scanWindow,
|
||||||
|
onDetect: _handleDetect,
|
||||||
|
errorBuilder: _buildCameraError,
|
||||||
|
placeholderBuilder: (_) => const ColoredBox(
|
||||||
|
color: Colors.black,
|
||||||
|
child: Center(
|
||||||
|
child: CircularProgressIndicator(color: Colors.white),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Positioned.fill(
|
||||||
|
child: CustomPaint(
|
||||||
|
painter: _ScannerOverlayPainter(scanWindow: scanWindow),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
_ScanLine(animation: _scanLineController, scanWindow: scanWindow),
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
child: SafeArea(
|
||||||
|
bottom: false,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 56.h,
|
||||||
|
child: Stack(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
children: [
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: IconButton(
|
||||||
|
onPressed: _close,
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
color: Colors.white,
|
||||||
|
tooltip: '关闭',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
'扫一扫',
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 18.sp,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Positioned(
|
||||||
|
top: scanWindow.bottom + 28.h,
|
||||||
|
left: 24.w,
|
||||||
|
right: 24.w,
|
||||||
|
child: Text(
|
||||||
|
'将二维码放入框内,即可自动扫描',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white.withValues(alpha: 0.86),
|
||||||
|
fontSize: 15.sp,
|
||||||
|
height: 1.4,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildCameraError(BuildContext context, MobileScannerException error) {
|
||||||
|
return ColoredBox(
|
||||||
|
color: Colors.black,
|
||||||
|
child: Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.symmetric(horizontal: 32.w),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.camera_alt_outlined,
|
||||||
|
color: Colors.white.withValues(alpha: 0.82),
|
||||||
|
size: 44.r,
|
||||||
|
),
|
||||||
|
SizedBox(height: 16.h),
|
||||||
|
Text(
|
||||||
|
'无法启动相机,请检查相机权限后重试',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white,
|
||||||
|
fontSize: 16.sp,
|
||||||
|
height: 1.45,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 8.h),
|
||||||
|
Text(
|
||||||
|
error.errorDetails?.message ?? error.errorCode.message,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
color: Colors.white.withValues(alpha: 0.58),
|
||||||
|
fontSize: 12.sp,
|
||||||
|
height: 1.35,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 24.h),
|
||||||
|
TextButton(
|
||||||
|
onPressed: _close,
|
||||||
|
style: TextButton.styleFrom(
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
side: BorderSide(color: Colors.white.withValues(alpha: 0.44)),
|
||||||
|
),
|
||||||
|
child: const Text('关闭'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ScanLine extends StatelessWidget {
|
||||||
|
const _ScanLine({required this.animation, required this.scanWindow});
|
||||||
|
|
||||||
|
final Animation<double> animation;
|
||||||
|
final Rect scanWindow;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return AnimatedBuilder(
|
||||||
|
animation: animation,
|
||||||
|
builder: (context, child) {
|
||||||
|
final inset = 14.r;
|
||||||
|
final top =
|
||||||
|
scanWindow.top +
|
||||||
|
inset +
|
||||||
|
(scanWindow.height - inset * 2) * animation.value;
|
||||||
|
|
||||||
|
return Positioned(
|
||||||
|
left: scanWindow.left + inset,
|
||||||
|
top: top,
|
||||||
|
width: scanWindow.width - inset * 2,
|
||||||
|
child: child!,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Container(
|
||||||
|
height: 2.h,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: const Color(0xFF1BD760),
|
||||||
|
borderRadius: BorderRadius.circular(2.r),
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
color: const Color(0xFF1BD760).withValues(alpha: 0.65),
|
||||||
|
blurRadius: 12.r,
|
||||||
|
spreadRadius: 2.r,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ScannerOverlayPainter extends CustomPainter {
|
||||||
|
const _ScannerOverlayPainter({required this.scanWindow});
|
||||||
|
|
||||||
|
final Rect scanWindow;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void paint(Canvas canvas, Size size) {
|
||||||
|
final overlayPaint = Paint()..color = Colors.black.withValues(alpha: 0.58);
|
||||||
|
final outerPath = Path()..addRect(Offset.zero & size);
|
||||||
|
final innerPath = Path()
|
||||||
|
..addRRect(RRect.fromRectAndRadius(scanWindow, Radius.circular(8.r)));
|
||||||
|
final overlayPath = Path.combine(
|
||||||
|
PathOperation.difference,
|
||||||
|
outerPath,
|
||||||
|
innerPath,
|
||||||
|
);
|
||||||
|
canvas.drawPath(overlayPath, overlayPaint);
|
||||||
|
|
||||||
|
final borderPaint = Paint()
|
||||||
|
..color = Colors.white.withValues(alpha: 0.38)
|
||||||
|
..style = PaintingStyle.stroke
|
||||||
|
..strokeWidth = 1.r;
|
||||||
|
canvas.drawRRect(
|
||||||
|
RRect.fromRectAndRadius(scanWindow, Radius.circular(8.r)),
|
||||||
|
borderPaint,
|
||||||
|
);
|
||||||
|
|
||||||
|
final cornerPaint = Paint()
|
||||||
|
..color = const Color(0xFF1BD760)
|
||||||
|
..style = PaintingStyle.stroke
|
||||||
|
..strokeCap = StrokeCap.round
|
||||||
|
..strokeWidth = 4.r;
|
||||||
|
final cornerLength = 28.r;
|
||||||
|
|
||||||
|
void drawCorner(Offset start, Offset horizontalEnd, Offset verticalEnd) {
|
||||||
|
canvas
|
||||||
|
..drawLine(start, horizontalEnd, cornerPaint)
|
||||||
|
..drawLine(start, verticalEnd, cornerPaint);
|
||||||
|
}
|
||||||
|
|
||||||
|
drawCorner(
|
||||||
|
scanWindow.topLeft,
|
||||||
|
scanWindow.topLeft.translate(cornerLength, 0),
|
||||||
|
scanWindow.topLeft.translate(0, cornerLength),
|
||||||
|
);
|
||||||
|
drawCorner(
|
||||||
|
scanWindow.topRight,
|
||||||
|
scanWindow.topRight.translate(-cornerLength, 0),
|
||||||
|
scanWindow.topRight.translate(0, cornerLength),
|
||||||
|
);
|
||||||
|
drawCorner(
|
||||||
|
scanWindow.bottomLeft,
|
||||||
|
scanWindow.bottomLeft.translate(cornerLength, 0),
|
||||||
|
scanWindow.bottomLeft.translate(0, -cornerLength),
|
||||||
|
);
|
||||||
|
drawCorner(
|
||||||
|
scanWindow.bottomRight,
|
||||||
|
scanWindow.bottomRight.translate(-cornerLength, 0),
|
||||||
|
scanWindow.bottomRight.translate(0, -cornerLength),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldRepaint(covariant _ScannerOverlayPainter oldDelegate) {
|
||||||
|
return oldDelegate.scanWindow != scanWindow;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,164 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:webview_flutter/webview_flutter.dart';
|
||||||
|
import 'package:webview_flutter_android/webview_flutter_android.dart';
|
||||||
|
import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
|
||||||
|
|
||||||
|
class WebviewPage extends StatefulWidget {
|
||||||
|
final String url;
|
||||||
|
final String? title;
|
||||||
|
|
||||||
|
const WebviewPage({super.key, required this.url, this.title});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<WebviewPage> createState() => WebviewPageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class WebviewPageState extends State<WebviewPage> {
|
||||||
|
WebViewController? _controller;
|
||||||
|
bool _isLoading = true;
|
||||||
|
String? _errorMessage;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_initController();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _initController() async {
|
||||||
|
if (widget.url?.isEmpty ?? true) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final params = _createPlatformParams();
|
||||||
|
final controller = WebViewController.fromPlatformCreationParams(params)
|
||||||
|
..setJavaScriptMode(JavaScriptMode.unrestricted)
|
||||||
|
..setBackgroundColor(Colors.transparent)
|
||||||
|
..setNavigationDelegate(
|
||||||
|
NavigationDelegate(
|
||||||
|
onProgress: (int progress) {
|
||||||
|
debugPrint('webview - progress: $progress');
|
||||||
|
},
|
||||||
|
onPageStarted: (String url) {
|
||||||
|
debugPrint('webview - page started: $url');
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_isLoading = true;
|
||||||
|
_errorMessage = null;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onPageFinished: (String url) {
|
||||||
|
debugPrint('webview - page finished: $url');
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() => _isLoading = false);
|
||||||
|
},
|
||||||
|
onHttpError: (HttpResponseError error) {
|
||||||
|
debugPrint(
|
||||||
|
'webview - http error: ${error.response?.uri}, code: ${error.response?.statusCode}',
|
||||||
|
);
|
||||||
|
},
|
||||||
|
onWebResourceError: (WebResourceError error) {
|
||||||
|
debugPrint(
|
||||||
|
'webview error: ${error.description}, code: ${error.errorCode}, url: ${error.url}',
|
||||||
|
);
|
||||||
|
if (!mounted || error.isForMainFrame != true) return;
|
||||||
|
setState(() {
|
||||||
|
_isLoading = false;
|
||||||
|
_errorMessage = error.description;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onNavigationRequest: (NavigationRequest request) {
|
||||||
|
return NavigationDecision.navigate;
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (controller.platform is AndroidWebViewController) {
|
||||||
|
AndroidWebViewController.enableDebugging(kDebugMode);
|
||||||
|
await (controller.platform as AndroidWebViewController)
|
||||||
|
.setMediaPlaybackRequiresUserGesture(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
final targetUrl = widget.url ?? '';
|
||||||
|
try {
|
||||||
|
await controller.loadRequest(Uri.parse(targetUrl));
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('webview - loadRequest failed: $e');
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_isLoading = false;
|
||||||
|
_errorMessage = e.toString();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() => _controller = controller);
|
||||||
|
}
|
||||||
|
|
||||||
|
PlatformWebViewControllerCreationParams _createPlatformParams() {
|
||||||
|
if (WebViewPlatform.instance is WebKitWebViewPlatform) {
|
||||||
|
return WebKitWebViewControllerCreationParams(
|
||||||
|
allowsInlineMediaPlayback: true,
|
||||||
|
mediaTypesRequiringUserAction: const <PlaybackMediaTypes>{},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return const PlatformWebViewControllerCreationParams();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
extendBodyBehindAppBar: true,
|
||||||
|
appBar: AppBar(
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
elevation: 0,
|
||||||
|
title: Text(
|
||||||
|
widget.title ?? '',
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
),
|
||||||
|
leading: IconButton(
|
||||||
|
icon: const Icon(Icons.arrow_back, color: Colors.white),
|
||||||
|
onPressed: () async {
|
||||||
|
final controller = _controller;
|
||||||
|
if (controller != null && await controller.canGoBack()) {
|
||||||
|
await controller.goBack();
|
||||||
|
} else {
|
||||||
|
if (context.mounted) Navigator.of(context).maybePop();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
iconTheme: const IconThemeData(color: Colors.white),
|
||||||
|
),
|
||||||
|
|
||||||
|
body: _buildBody(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildBody() {
|
||||||
|
if (_errorMessage != null) {
|
||||||
|
return Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(24),
|
||||||
|
child: Text(
|
||||||
|
'页面加载失败\n$_errorMessage',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 14),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final controller = _controller;
|
||||||
|
if (controller == null) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(child: WebViewWidget(controller: controller)),
|
||||||
|
if (_isLoading) const Center(child: CircularProgressIndicator()),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ export 'app_empty_view.dart';
|
|||||||
export 'app_error_view.dart';
|
export 'app_error_view.dart';
|
||||||
export 'app_loading_view.dart';
|
export 'app_loading_view.dart';
|
||||||
export 'app_network_image.dart';
|
export 'app_network_image.dart';
|
||||||
|
export 'app_qr_scanner_dialog.dart';
|
||||||
export 'app_refresh_list.dart';
|
export 'app_refresh_list.dart';
|
||||||
export 'app_search_bar.dart';
|
export 'app_search_bar.dart';
|
||||||
export 'app_status_view.dart';
|
export 'app_status_view.dart';
|
||||||
|
|||||||
+5
-1
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 1.0.0+2002
|
version: 1.0.0
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.9.0
|
sdk: ^3.9.0
|
||||||
@@ -47,6 +47,10 @@ dependencies:
|
|||||||
shared_preferences: ^2.5.5
|
shared_preferences: ^2.5.5
|
||||||
url_launcher: ^6.3.2
|
url_launcher: ^6.3.2
|
||||||
uuid: ^4.5.3
|
uuid: ^4.5.3
|
||||||
|
mobile_scanner: ^7.2.0
|
||||||
|
webview_flutter_android: ^4.13.0
|
||||||
|
webview_flutter_wkwebview: ^3.26.0
|
||||||
|
webview_flutter: ^4.14.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ void main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
group('iOS permission configuration', () {
|
group('iOS permission configuration', () {
|
||||||
test('Podfile enables camera, microphone and photos permission macros', () {
|
test('Podfile enables camera and microphone permission macros only', () {
|
||||||
final podfile = File('ios/Podfile').readAsStringSync();
|
final podfile = File('ios/Podfile').readAsStringSync();
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
@@ -80,8 +80,8 @@ void main() {
|
|||||||
);
|
);
|
||||||
expect(podfile, contains("'PERMISSION_CAMERA=1'"));
|
expect(podfile, contains("'PERMISSION_CAMERA=1'"));
|
||||||
expect(podfile, contains("'PERMISSION_MICROPHONE=1'"));
|
expect(podfile, contains("'PERMISSION_MICROPHONE=1'"));
|
||||||
expect(podfile, contains("'PERMISSION_PHOTOS=1'"));
|
expect(podfile, isNot(contains("'PERMISSION_PHOTOS=1'")));
|
||||||
expect(podfile, contains("'PERMISSION_PHOTOS_ADD_ONLY=1'"));
|
expect(podfile, isNot(contains("'PERMISSION_PHOTOS_ADD_ONLY=1'")));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ void main() {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
RecordDialog.showDouble(
|
RecordDialog.showDouble(
|
||||||
context,
|
context,
|
||||||
title: '本轮比赛视频已保存到相册\n请选择后续录制信息',
|
title: '本轮比赛视频已保存到文件夹\n请选择后续录制信息',
|
||||||
leftText: '继续本轮',
|
leftText: '继续本轮',
|
||||||
rightText: '录制新轮',
|
rightText: '录制新轮',
|
||||||
onLeftPressed: () => leftTapped = true,
|
onLeftPressed: () => leftTapped = true,
|
||||||
@@ -123,7 +123,7 @@ void main() {
|
|||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
expect(find.text('王东方 丨李想 空中格斗赛'), findsNothing);
|
expect(find.text('王东方 丨李想 空中格斗赛'), findsNothing);
|
||||||
expect(find.text('本轮比赛视频已保存到相册\n请选择后续录制信息'), findsOneWidget);
|
expect(find.text('本轮比赛视频已保存到文件夹\n请选择后续录制信息'), findsOneWidget);
|
||||||
expect(find.text('继续本轮'), findsOneWidget);
|
expect(find.text('继续本轮'), findsOneWidget);
|
||||||
expect(find.text('录制新轮'), findsOneWidget);
|
expect(find.text('录制新轮'), findsOneWidget);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,7 +1,15 @@
|
|||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:recording_tool/features/recording/platform/recording_channel_names.dart';
|
||||||
import 'package:recording_tool/features/recording/platform/recording_platform.dart';
|
import 'package:recording_tool/features/recording/platform/recording_platform.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
group('RecordingChannelNames', () {
|
||||||
|
test('uses stable bridge names without package binding', () {
|
||||||
|
expect(RecordingChannelNames.method, 'app.record_tool/recording');
|
||||||
|
expect(RecordingChannelNames.events, 'app.record_tool/recording_events');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
group('RecordingPlatform support', () {
|
group('RecordingPlatform support', () {
|
||||||
test('supports Android and iOS hosts only', () {
|
test('supports Android and iOS hosts only', () {
|
||||||
expect(
|
expect(
|
||||||
@@ -18,4 +26,20 @@ void main() {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
group('RecordingStopResult', () {
|
||||||
|
test('parses file save result fields from platform payload', () {
|
||||||
|
final result = RecordingStopResult.fromMap(<String, dynamic>{
|
||||||
|
'outputPath': '/Documents/recordings/test.mov',
|
||||||
|
'status': <String, dynamic>{'state': 'previewing'},
|
||||||
|
'fileSaved': false,
|
||||||
|
'fileErrorMessage': '保存到文件夹失败',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(result.outputPath, '/Documents/recordings/test.mov');
|
||||||
|
expect(result.status.state, RecordingState.previewing);
|
||||||
|
expect(result.fileSaved, isFalse);
|
||||||
|
expect(result.fileErrorMessage, '保存到文件夹失败');
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
|
import 'package:recording_tool/features/recording/model/model_recording_session.dart';
|
||||||
|
import 'package:recording_tool/features/recording/platform/recording_channel_names.dart';
|
||||||
|
import 'package:recording_tool/features/recording/platform/recording_platform.dart';
|
||||||
import 'package:recording_tool/features/recording/view-model/view_model_recording.dart';
|
import 'package:recording_tool/features/recording/view-model/view_model_recording.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
@@ -24,6 +29,11 @@ void main() {
|
|||||||
tearDown(() {
|
tearDown(() {
|
||||||
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
.setMockMethodCallHandler(SystemChannels.platform, null);
|
.setMockMethodCallHandler(SystemChannels.platform, null);
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
null,
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
group('RecordingViewModel', () {
|
group('RecordingViewModel', () {
|
||||||
@@ -36,27 +46,389 @@ void main() {
|
|||||||
expect(model.clipboardRecordingModel.title, defaultClipboardTitle);
|
expect(model.clipboardRecordingModel.title, defaultClipboardTitle);
|
||||||
expect(model.session.isPreviewReady, isFalse);
|
expect(model.session.isPreviewReady, isFalse);
|
||||||
expect(model.session.isRecording, isFalse);
|
expect(model.session.isRecording, isFalse);
|
||||||
|
expect(model.session.zoomRatio, 1.0);
|
||||||
|
expect(model.session.minZoomRatio, 1.0);
|
||||||
|
expect(model.session.maxZoomRatio, 3.0);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
group('recordingGalleryPermissionsForHost', () {
|
group('RecordingViewModel.setZoomRatio', () {
|
||||||
test('requests only add-only photo permission on iOS', () {
|
test('updates zoom ratio from native response', () async {
|
||||||
final permissions = recordingGalleryPermissionsForHost(
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
expect(call.method, 'setZoomRatio');
|
||||||
|
expect(call.arguments, <String, dynamic>{'zoomRatio': 2.0});
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 2.0,
|
||||||
|
'minZoomRatio': 1.0,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
|
||||||
|
await container.read(recordingViewModelProvider.notifier).setZoomRatio(2);
|
||||||
|
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.zoomRatio, 2.0);
|
||||||
|
expect(session.minZoomRatio, 1.0);
|
||||||
|
expect(session.maxZoomRatio, 3.0);
|
||||||
|
expect(session.errorMessage, isNull);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passes 0.5x to native when camera capabilities allow it', () async {
|
||||||
|
final calls = <MethodCall>[];
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
calls.add(call);
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 0.5,
|
||||||
|
'minZoomRatio': 0.5,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
final notifier = container.read(recordingViewModelProvider.notifier);
|
||||||
|
// ignore: invalid_use_of_protected_member
|
||||||
|
notifier.state = container
|
||||||
|
.read(recordingViewModelProvider)
|
||||||
|
.copyWith(
|
||||||
|
session: const RecordingSessionState(
|
||||||
|
zoomRatio: 1.0,
|
||||||
|
minZoomRatio: 0.5,
|
||||||
|
maxZoomRatio: 3.0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await notifier.setZoomRatio(0.5);
|
||||||
|
|
||||||
|
expect(calls.single.arguments, <String, dynamic>{'zoomRatio': 0.5});
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.zoomRatio, 0.5);
|
||||||
|
expect(session.minZoomRatio, 0.5);
|
||||||
|
expect(session.maxZoomRatio, 3.0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('passes 0.6x to native when camera capabilities allow it', () async {
|
||||||
|
final calls = <MethodCall>[];
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
calls.add(call);
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 0.6,
|
||||||
|
'minZoomRatio': 0.6,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
final notifier = container.read(recordingViewModelProvider.notifier);
|
||||||
|
// ignore: invalid_use_of_protected_member
|
||||||
|
notifier.state = container
|
||||||
|
.read(recordingViewModelProvider)
|
||||||
|
.copyWith(
|
||||||
|
session: const RecordingSessionState(
|
||||||
|
zoomRatio: 1.0,
|
||||||
|
minZoomRatio: 0.6,
|
||||||
|
maxZoomRatio: 3.0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await notifier.setZoomRatio(0.6);
|
||||||
|
|
||||||
|
expect(calls.single.arguments, <String, dynamic>{'zoomRatio': 0.6});
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.zoomRatio, 0.6);
|
||||||
|
expect(session.minZoomRatio, 0.6);
|
||||||
|
expect(session.maxZoomRatio, 3.0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('clamps requested zoom ratio before invoking native', () async {
|
||||||
|
final calls = <MethodCall>[];
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
calls.add(call);
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 1.0,
|
||||||
|
'minZoomRatio': 1.0,
|
||||||
|
'maxZoomRatio': 1.0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
|
||||||
|
await container.read(recordingViewModelProvider.notifier).setZoomRatio(4);
|
||||||
|
|
||||||
|
expect(calls.single.arguments, <String, dynamic>{'zoomRatio': 3.0});
|
||||||
|
expect(container.read(recordingViewModelProvider).session.zoomRatio, 1.0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'clamps 0.6x to 1x when camera capabilities do not allow it',
|
||||||
|
() async {
|
||||||
|
final calls = <MethodCall>[];
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
calls.add(call);
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 1.0,
|
||||||
|
'minZoomRatio': 1.0,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
|
||||||
|
await container
|
||||||
|
.read(recordingViewModelProvider.notifier)
|
||||||
|
.setZoomRatio(0.6);
|
||||||
|
|
||||||
|
expect(calls.single.arguments, <String, dynamic>{'zoomRatio': 1.0});
|
||||||
|
expect(
|
||||||
|
container.read(recordingViewModelProvider).session.zoomRatio,
|
||||||
|
1.0,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'keeps previous zoom ratio and stores error when native fails',
|
||||||
|
() async {
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
throw PlatformException(
|
||||||
|
code: 'ZOOM_FAILED',
|
||||||
|
message: 'Zoom is unavailable',
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
|
||||||
|
await container
|
||||||
|
.read(recordingViewModelProvider.notifier)
|
||||||
|
.setZoomRatio(2);
|
||||||
|
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.zoomRatio, 1.0);
|
||||||
|
expect(session.errorMessage, '切换镜头失败,请重试');
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test(
|
||||||
|
'maps native zoom failure to user friendly lens switch message',
|
||||||
|
() async {
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
throw PlatformException(
|
||||||
|
code: 'ZOOM_FAILED',
|
||||||
|
message: 'Cannot switch physical camera while recording',
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
|
||||||
|
await container
|
||||||
|
.read(recordingViewModelProvider.notifier)
|
||||||
|
.setZoomRatio(0.6);
|
||||||
|
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.zoomRatio, 1.0);
|
||||||
|
expect(session.errorMessage, '切换镜头失败,请重试');
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test('sets switching lens while native zoom request is pending', () async {
|
||||||
|
final completer = Completer<Map<String, dynamic>>();
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) => completer.future,
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
final notifier = container.read(recordingViewModelProvider.notifier);
|
||||||
|
|
||||||
|
final future = notifier.setZoomRatio(2);
|
||||||
|
await Future<void>.delayed(Duration.zero);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
container.read(recordingViewModelProvider).session.isSwitchingLens,
|
||||||
|
isTrue,
|
||||||
|
);
|
||||||
|
|
||||||
|
completer.complete(<String, dynamic>{
|
||||||
|
'zoomRatio': 2.0,
|
||||||
|
'minZoomRatio': 1.0,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
});
|
||||||
|
await future;
|
||||||
|
|
||||||
|
expect(
|
||||||
|
container.read(recordingViewModelProvider).session.isSwitchingLens,
|
||||||
|
isFalse,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
group('RecordingViewModel.stopRecording', () {
|
||||||
|
test('does not call native stop while switching lens', () async {
|
||||||
|
final calls = <MethodCall>[];
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
calls.add(call);
|
||||||
|
return <String, dynamic>{};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
final notifier = container.read(recordingViewModelProvider.notifier);
|
||||||
|
// ignore: invalid_use_of_protected_member
|
||||||
|
notifier.state = container
|
||||||
|
.read(recordingViewModelProvider)
|
||||||
|
.copyWith(
|
||||||
|
session: const RecordingSessionState(
|
||||||
|
status: RecordingStatus(state: RecordingState.recording),
|
||||||
|
isSwitchingLens: true,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await notifier.stopRecording();
|
||||||
|
|
||||||
|
expect(calls, isEmpty);
|
||||||
|
});
|
||||||
|
|
||||||
|
test(
|
||||||
|
'stores segment output paths when native save falls back to parts',
|
||||||
|
() async {
|
||||||
|
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
|
||||||
|
.setMockMethodCallHandler(
|
||||||
|
const MethodChannel(RecordingChannelNames.method),
|
||||||
|
(call) async {
|
||||||
|
switch (call.method) {
|
||||||
|
case 'stopRecording':
|
||||||
|
return <String, dynamic>{
|
||||||
|
'outputPath': 'content://recordings/part1',
|
||||||
|
'status': <String, dynamic>{
|
||||||
|
'state': 'error',
|
||||||
|
'message': 'Merge failed',
|
||||||
|
},
|
||||||
|
'fileSaved': false,
|
||||||
|
'fileErrorMessage': 'Merge failed',
|
||||||
|
'segmentOutputPaths': <String>[
|
||||||
|
'content://recordings/part1',
|
||||||
|
'content://recordings/part2',
|
||||||
|
],
|
||||||
|
};
|
||||||
|
case 'initializePreview':
|
||||||
|
return <String, dynamic>{'state': 'previewing'};
|
||||||
|
case 'getZoomCapabilities':
|
||||||
|
return <String, dynamic>{
|
||||||
|
'zoomRatio': 1.0,
|
||||||
|
'minZoomRatio': 1.0,
|
||||||
|
'maxZoomRatio': 3.0,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return <String, dynamic>{};
|
||||||
|
},
|
||||||
|
);
|
||||||
|
final container = ProviderContainer();
|
||||||
|
addTearDown(container.dispose);
|
||||||
|
final notifier = container.read(recordingViewModelProvider.notifier);
|
||||||
|
// ignore: invalid_use_of_protected_member
|
||||||
|
notifier.state = container
|
||||||
|
.read(recordingViewModelProvider)
|
||||||
|
.copyWith(
|
||||||
|
session: const RecordingSessionState(
|
||||||
|
status: RecordingStatus(state: RecordingState.recording),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await notifier.stopRecording();
|
||||||
|
|
||||||
|
final session = container.read(recordingViewModelProvider).session;
|
||||||
|
expect(session.fileSaveFailed, isTrue);
|
||||||
|
expect(session.segmentOutputPaths, <String>[
|
||||||
|
'content://recordings/part1',
|
||||||
|
'content://recordings/part2',
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
group('recordingFileSavePermissionsForHost', () {
|
||||||
|
test('does not request photo permission on iOS', () {
|
||||||
|
final permissions = recordingFileSavePermissionsForHost(
|
||||||
isIOS: true,
|
isIOS: true,
|
||||||
isAndroid: false,
|
isAndroid: false,
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(permissions, <Permission>[Permission.photosAddOnly]);
|
expect(permissions, isEmpty);
|
||||||
|
expect(permissions, isNot(contains(Permission.photosAddOnly)));
|
||||||
expect(permissions, isNot(contains(Permission.photos)));
|
expect(permissions, isNot(contains(Permission.photos)));
|
||||||
});
|
});
|
||||||
|
|
||||||
test('keeps Android gallery permissions unchanged', () {
|
test('requests storage permission on Android 9 and below', () {
|
||||||
final permissions = recordingGalleryPermissionsForHost(
|
final permissions = recordingFileSavePermissionsForHost(
|
||||||
|
isIOS: false,
|
||||||
|
isAndroid: true,
|
||||||
|
androidSdkInt: 28,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(permissions, <Permission>[Permission.storage]);
|
||||||
|
expect(permissions, isNot(contains(Permission.videos)));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('does not request file save permission on Android 10 and above', () {
|
||||||
|
final permissions = recordingFileSavePermissionsForHost(
|
||||||
|
isIOS: false,
|
||||||
|
isAndroid: true,
|
||||||
|
androidSdkInt: 29,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(permissions, isEmpty);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('does not request file save permission on Android 13 and above', () {
|
||||||
|
final permissions = recordingFileSavePermissionsForHost(
|
||||||
|
isIOS: false,
|
||||||
|
isAndroid: true,
|
||||||
|
androidSdkInt: 33,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(permissions, isEmpty);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('does not request file save permission when Android SDK is unknown', () {
|
||||||
|
final permissions = recordingFileSavePermissionsForHost(
|
||||||
isIOS: false,
|
isIOS: false,
|
||||||
isAndroid: true,
|
isAndroid: true,
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(permissions, <Permission>[Permission.videos, Permission.storage]);
|
expect(permissions, isEmpty);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,231 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:recording_tool/features/recording/widgets/widget_recording_hud.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
Future<void> pumpHud(
|
||||||
|
WidgetTester tester, {
|
||||||
|
double zoomRatio = 1.0,
|
||||||
|
double minZoomRatio = 1.0,
|
||||||
|
double maxZoomRatio = 3.0,
|
||||||
|
bool isRecording = false,
|
||||||
|
bool isSwitchingLens = false,
|
||||||
|
Future<void> Function()? onStop,
|
||||||
|
ValueChanged<double>? onZoomSelected,
|
||||||
|
}) async {
|
||||||
|
await tester.pumpWidget(
|
||||||
|
ScreenUtilInit(
|
||||||
|
designSize: const Size(375, 812),
|
||||||
|
builder: (context, _) {
|
||||||
|
return MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
backgroundColor: Colors.black,
|
||||||
|
body: RecordingHudWidget(
|
||||||
|
hasDndAccess: true,
|
||||||
|
isBatteryOptimizedIgnored: true,
|
||||||
|
notificationsGranted: true,
|
||||||
|
isRecording: isRecording,
|
||||||
|
isStartingRecording: false,
|
||||||
|
isSwitchingLens: isSwitchingLens,
|
||||||
|
isTouchLocked: false,
|
||||||
|
zoomRatio: zoomRatio,
|
||||||
|
minZoomRatio: minZoomRatio,
|
||||||
|
maxZoomRatio: maxZoomRatio,
|
||||||
|
onStart: () async {},
|
||||||
|
onStop: onStop ?? () async {},
|
||||||
|
onOpenDnd: () {},
|
||||||
|
onOpenBattery: () {},
|
||||||
|
onToggleTouchLock: () {},
|
||||||
|
onZoomSelected: onZoomSelected ?? (_) {},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pump();
|
||||||
|
}
|
||||||
|
|
||||||
|
testWidgets('shows preset zoom buttons', (tester) async {
|
||||||
|
await pumpHud(tester);
|
||||||
|
|
||||||
|
expect(find.text('广角'), findsNothing);
|
||||||
|
expect(find.text('1x'), findsOneWidget);
|
||||||
|
expect(find.text('2x'), findsNothing);
|
||||||
|
expect(find.text('3x'), findsNothing);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('shows wide angle when ultra-wide camera capability is 0.5', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpHud(tester, minZoomRatio: 0.5);
|
||||||
|
|
||||||
|
expect(find.text('广角'), findsOneWidget);
|
||||||
|
expect(find.text('1x'), findsOneWidget);
|
||||||
|
expect(find.text('2x'), findsNothing);
|
||||||
|
expect(find.text('3x'), findsNothing);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('shows wide angle when 0.6x camera capability supports it', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpHud(tester, minZoomRatio: 0.6);
|
||||||
|
|
||||||
|
expect(find.text('广角'), findsOneWidget);
|
||||||
|
expect(find.text('1x'), findsOneWidget);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('marks current 0.5x wide angle ratio as selected', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpHud(tester, zoomRatio: 0.5, minZoomRatio: 0.5);
|
||||||
|
|
||||||
|
final selectedButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('广角'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
expect(selectedButton.enabled, isFalse);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('marks current 0.6x wide angle ratio as selected', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
await pumpHud(tester, zoomRatio: 0.6, minZoomRatio: 0.6);
|
||||||
|
|
||||||
|
final selectedButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('广角'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
expect(selectedButton.enabled, isFalse);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('does not expose presets beyond max zoom ratio', (tester) async {
|
||||||
|
await pumpHud(tester, minZoomRatio: 0.5, maxZoomRatio: 0.55);
|
||||||
|
|
||||||
|
expect(find.text('广角'), findsOneWidget);
|
||||||
|
expect(find.text('1x'), findsNothing);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('tapping 0.5x reports 0.5 when camera capability is 0.5', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
double? selected;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
minZoomRatio: 0.5,
|
||||||
|
onZoomSelected: (ratio) => selected = ratio,
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.tap(find.text('广角'));
|
||||||
|
await tester.pump(const Duration(milliseconds: 350));
|
||||||
|
|
||||||
|
expect(selected, 0.5);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('tapping 0.6x reports 0.6 when camera only supports 0.6x', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
double? selected;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
minZoomRatio: 0.6,
|
||||||
|
onZoomSelected: (ratio) => selected = ratio,
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.tap(find.text('广角'));
|
||||||
|
await tester.pump(const Duration(milliseconds: 350));
|
||||||
|
|
||||||
|
expect(selected, 0.6);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('allows 0.6x while recording on main camera after unlock', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
double? selected;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
minZoomRatio: 0.6,
|
||||||
|
isRecording: true,
|
||||||
|
onZoomSelected: (ratio) => selected = ratio,
|
||||||
|
);
|
||||||
|
|
||||||
|
final ultraWideButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('广角'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
final mainButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('1x'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(ultraWideButton.enabled, isTrue);
|
||||||
|
expect(mainButton.enabled, isFalse);
|
||||||
|
|
||||||
|
await tester.tap(find.text('广角'));
|
||||||
|
await tester.pump(const Duration(milliseconds: 350));
|
||||||
|
|
||||||
|
expect(selected, 0.6);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('allows 1x while recording on ultra-wide after unlock', (
|
||||||
|
tester,
|
||||||
|
) async {
|
||||||
|
double? selected;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
zoomRatio: 0.5,
|
||||||
|
minZoomRatio: 0.5,
|
||||||
|
isRecording: true,
|
||||||
|
onZoomSelected: (ratio) => selected = ratio,
|
||||||
|
);
|
||||||
|
|
||||||
|
final ultraWideButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('广角'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
final mainButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('1x'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(ultraWideButton.enabled, isFalse);
|
||||||
|
expect(mainButton.enabled, isTrue);
|
||||||
|
|
||||||
|
await tester.tap(find.text('1x'));
|
||||||
|
await tester.pump(const Duration(milliseconds: 350));
|
||||||
|
|
||||||
|
expect(selected, 1.0);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('disables stop button while switching lens', (tester) async {
|
||||||
|
var stopped = false;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
minZoomRatio: 0.6,
|
||||||
|
isRecording: true,
|
||||||
|
isSwitchingLens: true,
|
||||||
|
onStop: () async => stopped = true,
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.tap(find.byType(GestureDetector).last);
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
expect(stopped, isFalse);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('disables zoom buttons while switching lens', (tester) async {
|
||||||
|
double? selected;
|
||||||
|
await pumpHud(
|
||||||
|
tester,
|
||||||
|
minZoomRatio: 0.6,
|
||||||
|
isRecording: true,
|
||||||
|
isSwitchingLens: true,
|
||||||
|
onZoomSelected: (ratio) => selected = ratio,
|
||||||
|
);
|
||||||
|
|
||||||
|
final ultraWideButton = tester.widget<TextButton>(
|
||||||
|
find.ancestor(of: find.text('广角'), matching: find.byType(TextButton)),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(ultraWideButton.enabled, isFalse);
|
||||||
|
await tester.tap(find.text('广角'));
|
||||||
|
await tester.pump(const Duration(milliseconds: 350));
|
||||||
|
|
||||||
|
expect(selected, isNull);
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user