send message

Emotilt/Emotilt.xcodeproj/project.pbxproj

@@ -374,6 +374,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Emotilt/Info.plist;
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "Emotilt에서 로컬 네트워크를 이용하고자 합니다.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
@@ -408,6 +409,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Emotilt/Info.plist;
+				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "Emotilt에서 로컬 네트워크를 이용하고자 합니다.";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;

Emotilt/Emotilt/Info.plist

@@ -2,16 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>SERVICE_NAME</key>
-	<string>$(SERVICE_NAME)</string>
-	<key>SERVICE_IDENTIFIER</key>
-	<string>$(SERVICE_IDENTIFIER)</string>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>Emotilt에서 로컬 네트워크를 이용하고자 합니다.</string>
 	<key>NSBonjourServices</key>
 	<array>
 		<string>$(BONJOUR_SERVICES)</string>
 	</array>
+	<key>SERVICE_IDENTIFIER</key>
+	<string>$(SERVICE_IDENTIFIER)</string>
+	<key>SERVICE_NAME</key>
+	<string>$(SERVICE_NAME)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

Emotilt/Emotilt/Network/MPCSessionManager.swift

@@ -71,21 +71,25 @@ class MPCSessionManager: NSObject {
     }
 
     /// Send message to a specific peer
-    func sendMessage(_ message: Message, to peerID: MCPeerID) {
+    func sendMessage(_ message: Message, to peerID: MCPeerID, completion: (Bool) -> ()) {
         if !session.connectedPeers.contains(peerID) {
             print("unconnected peer")
+            completion(false)
             return
         }
 
         guard let data = try? JSONEncoder().encode(message) else {
             // fail to encode Message into data
+            completion(false)
             return
         }
 
         do {
             try session.send(data, toPeers: [peerID], with: .reliable)
+            completion(true)
         } catch let error {
             print(error)
+            completion(false)
         }
     }
 }

Emotilt/Emotilt/Network/PeerSessionManager.swift

@@ -53,19 +53,24 @@ class PeerSessionManager: NSObject {
         }.store(in: &bag)
     }
 
-    func sendMessageToNearestPeer(_ message: Message) {
+    //TODO: nearestPeerToken should be direction first, then distance
+    func sendMessageToNearestPeer(_ message: Message, completion: (Bool) -> ()) {
         guard let token = nearestPeerToken else {
+            completion(false)
             print("no nearest peer's token")
             return
         }
-        print("trying to send to \(token)")
 
+        //print("trying to send to \(token)")
         guard let peerID = peerList.first(where: { $0.token == token })?.id else {
+            completion(false)
             print("no matching peer in peerList")
             return
         }
 
-        mpcSessionManager.sendMessage(message, to: peerID)
+        mpcSessionManager.sendMessage(message, to: peerID) { success in
+            completion(success)
+        }
     }
 
     /// 새로운 Peer를 추가하고 연결받을 준비를 합니다.
@@ -129,8 +134,16 @@ extension PeerSessionManager: NISessionDelegate {
 
     /// Sort nearbyObjects by direction and return the nearest object's discoveryToken
     private func getNearestPeer(from nearbyObjects: [NINearbyObject]) -> NIDiscoveryToken {
-        let directions = nearbyObjects.sorted { $0.distance ?? .zero < $1.distance ?? .zero }
-        return directions[0].discoveryToken
+        let directionFiltered = nearbyObjects.filter { $0.direction != nil }
+        if (!directionFiltered.isEmpty){
+            let directionSorted = directionFiltered.sorted(by: {
+                norm_one($0.direction!) < norm_one($1.direction!)
+            })
+            return directionSorted.first!.discoveryToken
+        }else{
+            let distanceSorted = nearbyObjects.sorted { $0.distance ?? .zero < $1.distance ?? .zero }
+            return distanceSorted[0].discoveryToken
+        }
     }
 }
 

Emotilt/Emotilt/ViewModels/HomeViewModel.swift

@@ -6,6 +6,16 @@
 //
 
 import Foundation
+import CoreMotion
+import UIKit
+
+enum viewState {
+    case sendingSuccess //메세지 보내기 성공 직후 + 5초
+    case sendingFailure //메세지 보내기 실패 직후 + 5초
+    case motionDetectFailure //장전 이후 모션 감지 실패
+    case sendingTimer //장전 단계
+    case none //디폴트 화면
+}
 
 class HomeViewModel: BaseViewModel, ObservableObject {
     /// 연결된 peer 목록
@@ -18,14 +28,83 @@ class HomeViewModel: BaseViewModel, ObservableObject {
         receivedMessage != nil
     }
 
+    //MARK: - 뷰 관련 값
+    @Published var emoji : String = ""
+    @Published var content : String = ""
+
+    //MARK: - 메세지 전송 관련 값
+    let motionManager = CMMotionManager()
+    @Published var sendTimer: Timer?
+    @Published var currentState: viewState = .none
+    @Published var isSending: Bool = false
+    @Published var isAccelerating: Bool = false
+    @Published var accelerationRate: Double = 0.0
+    @Published var counter: Int = 0
+    @Published var isReadyForSending: Bool = false
+    var isDetected: Bool = false
+
     override init(peerSessionManager: PeerSessionManager) {
         super.init(peerSessionManager: peerSessionManager)
 
         peerSessionManager.$peerList.assign(to: &$peerList)
         peerSessionManager.$receivedMessage.assign(to: &$receivedMessage)
     }
+}
+
+//MARK: - message send logic
+extension HomeViewModel {
+
+    ///장전을 시작하고 모션을 감지함
+    func detectAcceleration(){
+        isDetected = false
+        isSending = true
+        currentState = .sendingTimer
+
+        motionManager
+            .startAccelerometerUpdates(to: OperationQueue.current!, withHandler: { [self] (motion, error) in
+                isAccelerating = true
+                accelerationRate = (motion?.acceleration.x)! + 1
+                if ((motion?.acceleration.x)! > 0.35){
+                    isDetected = true
+                    motionManager.stopAccelerometerUpdates()
+                    UINotificationFeedbackGenerator().notificationOccurred(.success)
+                    sendMessage()
+                }
+            })
+        startTimer()
+    }
+
+    ///5초 카운트다운을 시작함
+    func startTimer(){
+        if (counter == 0){ counter = 5 }
+        sendTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { tempTimer in
+            if (self.counter > 0){ self.counter = 1 }
+            if (self.counter == 0 && !self.isDetected){
+                self.currentState = .motionDetectFailure
+                self.stopTimer()
+            }
+        }
+    }
+
+    func stopTimer(){
+        DispatchQueue.main.asyncAfter(deadline: .now() + 3.0){
+            self.currentState = .none
+            self.isSending = false
+            self.sendTimer?.invalidate()
+            self.sendTimer = nil
+            self.emoji = ""
+            self.content = ""
+            self.currentState = .none
+            self.motionManager.stopAccelerometerUpdates()
+            self.isAccelerating = false
+        }
+    }
 
-    func sendMessage(_ message: Message) {
-        peerSessionManager.sendMessageToNearestPeer(message)
+    func sendMessage(){
+        let message = Message(emoji: emoji, content: content)
+        peerSessionManager.sendMessageToNearestPeer(message){ success in
+            self.currentState = (success) ? .sendingSuccess : .sendingFailure
+        }
+        stopTimer()
     }
 }

Emotilt/Emotilt/Views/HomeView.swift

@@ -11,85 +11,108 @@ import Combine
 struct HomeView: View {
 
     @ObservedObject var viewModel: HomeViewModel
-
     @State private var isEmojiSheetOpen: Bool = false
-    @State private var emoji: String = ""
-    @State private var content: String = ""
     @FocusState private var isTextFieldFocused: Bool
 
     var body: some View {
         VStack(alignment: .center) {
             Spacer()
 
+            //MARK: - viewState label
+            switch (viewModel.currentState){
+            case .sendingTimer:
+                Text("\(viewModel.counter)")
+                    .font(.system(size: 40, weight: .bold))
+            case .sendingSuccess:
+                Text("메세지 전송 성공!")
+                    .font(.system(size: 20, weight: .bold))
+            case .sendingFailure:
+                Text("메세지 전송 실패 ㅠ")
+                    .font(.system(size: 20, weight: .bold))
+            case .motionDetectFailure:
+                Text("메시지를 보내려면 흔들어주세요!")
+                    .font(.system(size: 20, weight: .bold))
+            case .none:
+                Text("")
+            }
+
             ZStack {
                 Button {
                     isEmojiSheetOpen = true
                 } label: {
                     ZStack {
-                        if emoji.isEmpty {
-                            RoundedRectangle(cornerRadius: 32)
-                                .fill(.tertiary.opacity(0.4))
-                                .frame(width: 168, height: 168)
+                            if viewModel.emoji.isEmpty {
+                                RoundedRectangle(cornerRadius: 32)
+                                    .fill(.tertiary.opacity(0.4))
+                                    .frame(width: 168, height: 168)
+                            }
+
+                            Text(viewModel.emoji)
+                                .font(.system(size: 168))
                         }
-
-                        Text(emoji)
-                            .font(.system(size: 168))
                     }
-                }
+
+
+                    ZStack {
+                        //DirectionIndicatorView()
+                    }
+                }.frame(width: 280, height: 280)
 
-                ZStack {
-//                    DirectionIndicatorView()
-                }
-            }.frame(width: 280, height: 280)
-
-            Group {
-                TextField("", text: $content, axis: .vertical)
-                    .placeholder(when: content.isEmpty && !isTextFieldFocused) {
+                Group {
+                    if #available(iOS 16.0, *) {
+                        TextField("", text: $viewModel
+                            .content, axis: .vertical)
+                        .placeholder(when: viewModel.content.isEmpty && !isTextFieldFocused) {
                             Text("20자 이내")
                                 .foregroundColor(.gray)
                                 .opacity(0.8)
-                    }
-                    .focused($isTextFieldFocused)
-                    .font(.system(size: 24, weight: .bold))
-                    .lineLimit(2)
-                    .frame(height: 64)
-                    .multilineTextAlignment(.center)
-                    .onReceive(Just(content)) { _ in
-                        if content.count > 20 {
-                            content = String(content.prefix(20))
                         }
-                    }
-                    .submitLabel(.done)
-                    .onChange(of: content) { text in
-                        if text.last == "\n" {
-                            content = String(text.dropLast())
-                            UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to:nil, from:nil, for:nil)
+                        .focused($isTextFieldFocused)
+                        .font(.system(size: 24, weight: .bold))
+                        .lineLimit(2)
+                        .frame(height: 64)
+                        .multilineTextAlignment(.center)
+                        .onReceive(Just($viewModel.content)) { _ in
+                            if viewModel.content.count > 20 {
+                                viewModel.content = String(viewModel.content.prefix(20))
+                            }
                         }
+                        .submitLabel(.done)
+                        .onChange(of: viewModel.content) { text in
+                            if text.last == "\n" {
+                                viewModel.content = String(text.dropLast())
+                                UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to:nil, from:nil, for:nil)
+                            }
+                        }
+                    } else {
+                        // Fallback on earlier versions
                     }
 
+                }
+
+                Spacer()
+                Spacer()
+
+                RoundedButton(label: "Send") {
+                    //viewModel.detectAcceleration()
+                    viewModel.sendMessage()
+                }
             }
-
-            Spacer()
-            Spacer()
-
-            RoundedButton(label: "Send") {
-                viewModel.sendMessage(.init(emoji: "🤔", content: "Nyam"))
-            }
-
-        }
-        .padding(.horizontal, 36)
-        .padding(.vertical, 24)
-        .onTapGesture(perform: {
-            UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to:nil, from:nil, for:nil)
-        })
-        .sheet(isPresented: $isEmojiSheetOpen) {
-            EmojiSheetView(selected: $emoji)
+                .padding(.horizontal, 36)
+                .padding(.vertical, 24)
+                .onTapGesture(perform: {
+                    UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to:nil, from:nil, for:nil)
+                })
+                .sheet(isPresented: $isEmojiSheetOpen) {
+                    EmojiSheetView(selected: $viewModel.emoji)
+                }
         }
     }
-}
-
+    
+    
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         HomeView(viewModel: .init(peerSessionManager: .debug))
     }
 }
+