diff --git a/kplayer/photo/SPhotoAlbumView.swift b/kplayer/photo/SPhotoAlbumView.swift index 5a6f779..13d1172 100644 --- a/kplayer/photo/SPhotoAlbumView.swift +++ b/kplayer/photo/SPhotoAlbumView.swift @@ -68,6 +68,11 @@ struct SPhotoAlbumView: View { }.task() { model.preload() } + .sheet(isPresented: Binding(get: { faceResultImage != nil }, set: { if !$0 { faceResultImage = nil } })) { + if let img = faceResultImage { + Image(uiImage: img).resizable().scaledToFit() + } + } if embedded && !more { v.overlay(SEmbeddedVideo(embedded: $embedded, down: $embDown).offset(y: embDown ? 0: 70), alignment: embDown ? .bottomLeading : .topLeading) } else if more { @@ -99,8 +104,9 @@ struct SPhotoAlbumView: View { Button(action: {faceSelectedItem("birgit"); more=false; }, label: {Text("birgit")}).buttonStyle(BorderlessButtonStyle()) Button(action: {faceSelectedItem("barbara"); more=false; }, label: {Text("barbara")}).buttonStyle(BorderlessButtonStyle()) Button(action: {faceSelectedItem("nina"); more=false; }, label: {Text("nina")}).buttonStyle(BorderlessButtonStyle()) - Button(action: {faceSelectedItem("nicki"); more=false; }, label: {Text("nina")}).buttonStyle(BorderlessButtonStyle()) - Button(action: {faceSelectedItem("mitra"); more=false; }, label: {Text("nina")}).buttonStyle(BorderlessButtonStyle()) + Button(action: {faceSelectedItem("nicki"); more=false; }, label: {Text("nicki")}).buttonStyle(BorderlessButtonStyle()) + Button(action: {faceSelectedItem("mitra"); more=false; }, label: {Text("mitra")}).buttonStyle(BorderlessButtonStyle()) + Button(action: {faceSelectedItem("koch"); more=false; }, label: {Text("koch")}).buttonStyle(BorderlessButtonStyle()) Button(action: {faceSelectedItem("amruta"); more=false; }, label: {Text("amruta")}).buttonStyle(BorderlessButtonStyle()) } .frame(width: 80, alignment: .top).offset(x: 0, y: 70), alignment: .topLeading) @@ -133,11 +139,13 @@ struct SPhotoAlbumView: View { Task { if !single { try await FaceManager.sharedInstance.processFolder(inputFolderPath: path, sourceFacePath: "benchmark/" + name + ".jpg", outputFolderPath: outpath) + } else { + let filename = (item.thumbUrl! as NSString).lastPathComponent + let data = try await FaceManager.sharedInstance.processOneImage(inputImage: path+"/"+filename, sourceFace: "benchmark/" + name + ".jpg") + if let img = UIImage(data: data) { + await MainActor.run { faceResultImage = img } + } } - else { - try! await FaceManager.sharedInstance.processImage(inputImagePath: "input", sourceFacePath: "benchmark/" + name + ".jpg") - } - //try! await FaceManager.sharedInstance.processImage(inputImagePath: "input", sourceFacePath: "benchmark/Renate.jpg") } }