Skip to content

Commit b9f9ebf

Browse files
KimPilGyeomKimPilGyeom
authored
Merge pull request #82 from DeveloperAcademy-POSTECH/fix/#81-all
Fix/#81 all
2 parents e7ae21f + 6053218 commit b9f9ebf

File tree

15 files changed

+166
-135
lines changed

15 files changed

+166
-135
lines changed

‎hearo/HearoadWatch Watch App/Assets.xcassets/MainCircle.appiconset/Contents.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Icon 오후 9.05.06.png",
5+
"idiom" : "universal",
6+
"platform" : "watchos",
7+
"size" : "1024x1024"
8+
}
9+
],
10+
"info" : {
11+
"author" : "xcode",
12+
"version" : 1
13+
}
14+
}

‎hearo/HearoadWatch Watch App/Assets.xcassets/MainCircle.appiconset/Icon 오후 9.05.06.png

731 KB
Loading

‎hearo/HearoadWatch Watch App/WatchSessionManager.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ class WatchSessionManager: NSObject, ObservableObject, WCSessionDelegate {
2424
}
2525

2626
// iOS에서 경고 메시지를 수신하는 메서드
27-
func session(_ session: WCSession, didReceiveMessage message: [String : Any]) {
27+
func session(_ session: WCSession, didReceiveMessage message: [String: Any]) {
2828
if let alert = message["alert"] as? String {
2929
DispatchQueue.main.async {
30-
self.showAlert(with: alert)
30+
self.showAlert(with: alert) // 메시지 수신 후 즉각적으로 알림 표시
31+
print("애플워치 - 메시지 수신: \(alert)")
3132
}
3233
}
3334
}

‎hearo/hearo.xcodeproj/project.pbxproj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
001C9F5F2CCF7984004EC4D2 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 001C9F5E2CCF7984004EC4D2 /* Preview Assets.xcassets */; };
2424
001C9F782CCF7984004EC4D2 /* HearoadWatch Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 001C9F552CCF7983004EC4D2 /* HearoadWatch Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2525
001C9F842CCF81A1004EC4D2 /* WatchSessionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 001C9F832CCF81A1004EC4D2 /* WatchSessionManager.swift */; };
26+
002E52F52CE33BF000901A5A /* HornSoundClassifier_V8.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = 002E52F42CE33BF000901A5A /* HornSoundClassifier_V8.mlmodel */; };
2627
0045C6B82CC0295F009B4261 /* WarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0045C6B72CC0295F009B4261 /* WarningView.swift */; };
2728
0045C6BA2CC02969009B4261 /* WarningViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0045C6B92CC02969009B4261 /* WarningViewModel.swift */; };
2829
007BEFCE2CB159AD00C0E9FD /* WorkingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 007BEFCD2CB159AD00C0E9FD /* WorkingView.swift */; };
@@ -144,6 +145,7 @@
144145
001C9F6E2CCF7984004EC4D2 /* HearoadWatch Watch AppUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "HearoadWatch Watch AppUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
145146
001C9F832CCF81A1004EC4D2 /* WatchSessionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSessionManager.swift; sourceTree = "<group>"; };
146147
001C9F852CD0CA11004EC4D2 /* HearoadWatch-Watch-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "HearoadWatch-Watch-App-Info.plist"; sourceTree = SOURCE_ROOT; };
148+
002E52F42CE33BF000901A5A /* HornSoundClassifier_V8.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = HornSoundClassifier_V8.mlmodel; sourceTree = "<group>"; };
147149
0045C6B72CC0295F009B4261 /* WarningView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarningView.swift; sourceTree = "<group>"; };
148150
0045C6B92CC02969009B4261 /* WarningViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarningViewModel.swift; sourceTree = "<group>"; };
149151
007BEFCD2CB159AD00C0E9FD /* WorkingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkingView.swift; sourceTree = "<group>"; };
@@ -478,6 +480,7 @@
478480
isa = PBXGroup;
479481
children = (
480482
00D1B7672CDDDB5B00BA2AF1 /* HornSoundClassifier_V11.mlmodel */,
483+
002E52F42CE33BF000901A5A /* HornSoundClassifier_V8.mlmodel */,
481484
00D1B7632CDDDAED00BA2AF1 /* LottieView.swift */,
482485
64F73A242CBAC9F100D2A140 /* HornSoundDetector.swift */,
483486
64F73A262CBAD1C000D2A140 /* SoundDetectorViewModel.swift */,
@@ -795,6 +798,7 @@
795798
64F73A252CBAC9F100D2A140 /* HornSoundDetector.swift in Sources */,
796799
0045C6B82CC0295F009B4261 /* WarningView.swift in Sources */,
797800
00078BE72CAFC79E00FB3F70 /* OnboardingView.swift in Sources */,
801+
002E52F52CE33BF000901A5A /* HornSoundClassifier_V8.mlmodel in Sources */,
798802
00D1B7642CDDDAF300BA2AF1 /* LottieView.swift in Sources */,
799803
00D1B76A2CDDDBB100BA2AF1 /* StartOnboardingView.swift in Sources */,
800804
00078BE52CAFC79400FB3F70 /* SplashView.swift in Sources */,
@@ -1012,7 +1016,7 @@
10121016
CODE_SIGN_STYLE = Automatic;
10131017
CURRENT_PROJECT_VERSION = 1;
10141018
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";
1015-
DEVELOPMENT_TEAM = GT56H2MYWV;
1019+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
10161020
ENABLE_PREVIEWS = YES;
10171021
GENERATE_INFOPLIST_FILE = YES;
10181022
INFOPLIST_FILE = hearo/Info.plist;
@@ -1046,7 +1050,7 @@
10461050
CODE_SIGN_STYLE = Automatic;
10471051
CURRENT_PROJECT_VERSION = 1;
10481052
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";
1049-
DEVELOPMENT_TEAM = GT56H2MYWV;
1053+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
10501054
ENABLE_PREVIEWS = YES;
10511055
GENERATE_INFOPLIST_FILE = YES;
10521056
INFOPLIST_FILE = hearo/Info.plist;
@@ -1152,7 +1156,7 @@
11521156
CODE_SIGN_STYLE = Automatic;
11531157
CURRENT_PROJECT_VERSION = 1;
11541158
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
1155-
DEVELOPMENT_TEAM = GT56H2MYWV;
1159+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
11561160
ENABLE_PREVIEWS = YES;
11571161
GENERATE_INFOPLIST_FILE = YES;
11581162
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1183,7 +1187,7 @@
11831187
CODE_SIGN_STYLE = Automatic;
11841188
CURRENT_PROJECT_VERSION = 1;
11851189
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
1186-
DEVELOPMENT_TEAM = GT56H2MYWV;
1190+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
11871191
ENABLE_PREVIEWS = YES;
11881192
GENERATE_INFOPLIST_FILE = YES;
11891193
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1291,7 +1295,7 @@
12911295
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
12921296
CODE_SIGN_STYLE = Automatic;
12931297
CURRENT_PROJECT_VERSION = 1;
1294-
DEVELOPMENT_TEAM = GT56H2MYWV;
1298+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
12951299
GENERATE_INFOPLIST_FILE = YES;
12961300
INFOPLIST_FILE = LiveActivity/Info.plist;
12971301
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
@@ -1319,7 +1323,7 @@
13191323
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
13201324
CODE_SIGN_STYLE = Automatic;
13211325
CURRENT_PROJECT_VERSION = 1;
1322-
DEVELOPMENT_TEAM = GT56H2MYWV;
1326+
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
13231327
GENERATE_INFOPLIST_FILE = YES;
13241328
INFOPLIST_FILE = LiveActivity/Info.plist;
13251329
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;

‎hearo/hearo.xcodeproj/xcuserdata/pil_gaaang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,24 @@
2020
landmarkType = "0">
2121
</BreakpointContent>
2222
</BreakpointProxy>
23+
<<<<<<< Updated upstream
24+
=======
25+
<BreakpointProxy
26+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
27+
<BreakpointContent
28+
uuid = "35B5EB06-74AC-48F5-97F1-7808B582A78F"
29+
shouldBeEnabled = "Yes"
30+
ignoreCount = "0"
31+
continueAfterRunningActions = "No"
32+
filePath = "hearo/Sources/Presentations/Working/ViewModel/WorkingViewModel.swift"
33+
startingColumnNumber = "9223372036854775807"
34+
endingColumnNumber = "9223372036854775807"
35+
startingLineNumber = "67"
36+
endingLineNumber = "67"
37+
landmarkName = "WorkingViewModel"
38+
landmarkType = "3">
39+
</BreakpointContent>
40+
</BreakpointProxy>
41+
>>>>>>> Stashed changes
2342
</Breakpoints>
2443
</Bucket>

‎hearo/hearo/Application/hearoApp.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ final class AppRootManager: ObservableObject {
108108

109109
// 라이브 액티비티 종료 메서드
110110
func stopLiveActivity() {
111-
guard isActivityActive else {
111+
guard !Activity<LiveActivityAttributes>.activities.isEmpty else {
112112
print("라이브 액티비티가 이미 중지 상태입니다.")
113113
return
114114
}
@@ -118,9 +118,7 @@ final class AppRootManager: ObservableObject {
118118
await activity.end(nil, dismissalPolicy: .immediate)
119119
print("라이브 액티비티가 중지되었습니다: \(activity.id)")
120120
}
121-
122-
isActivityActive = false
123-
currentWarningState = false // 중지되었으므로 상태 리셋
121+
print("모든 라이브 액티비티가 성공적으로 중지되었습니다.")
124122
}
125123
}
126124

‎hearo/hearo/Resources/Assets.xcassets/SVGIcon/Icon.imageset/Contents.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"images" : [
33
{
4-
5-
"filename" : "Icon 오후 9.05.06.png",
6-
4+
"filename" : "Icon 오후 9.05.06 1.png",
75
"idiom" : "universal",
86
"scale" : "1x"
97
},

‎hearo/hearo/Resources/Assets.xcassets/SVGIcon/StartCircle.imageset/Contents.json renamed to ‎hearo/hearo/Resources/Assets.xcassets/StartCircle.imageset/Contents.json

File renamed without changes.

‎hearo/hearo/Resources/Assets.xcassets/SVGIcon/StartCircle.imageset/StartCircle.svg renamed to ‎hearo/hearo/Resources/Assets.xcassets/StartCircle.imageset/StartCircle.svg

File renamed without changes.

‎hearo/hearo/Sources/Helper/HornSoundClassifier_V8.mlmodel

12.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)