bug fixes

Louiswu2011 · Feb 2, 2023 · 5c6b8fb · 5c6b8fb
1 parent 8630f01
commit 5c6b8fb
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 39 deletions.
diff --git a/chafenqi.xcodeproj/project.pbxproj b/chafenqi.xcodeproj/project.pbxproj
@@ -661,7 +661,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_ASSET_PATHS = "\"chafenqi/Preview Content\"";
 				DEVELOPMENT_TEAM = CYVRCL87U4;
 				ENABLE_PREVIEWS = YES;
@@ -693,7 +693,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 63;
+				CURRENT_PROJECT_VERSION = 65;
 				DEVELOPMENT_ASSET_PATHS = "\"chafenqi/Preview Content\"";
 				DEVELOPMENT_TEAM = CYVRCL87U4;
 				ENABLE_PREVIEWS = YES;

diff --git a/chafenqi.xcodeproj/xcuserdata/louis.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/chafenqi.xcodeproj/xcuserdata/louis.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -92,8 +92,8 @@
             filePath = "chafenqi/View/SongView/SongDetailView.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "246"
-            endingLineNumber = "246"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "body"
             landmarkType = "24">
          </BreakpointContent>

diff --git a/chafenqi/View/SongView/SongDetailView.swift b/chafenqi/View/SongView/SongDetailView.swift
@@ -15,6 +15,7 @@ struct SongDetailView: View {
     @AppStorage("settingsCoverSource") var coverSource = 0
     @AppStorage("userInfoData") var userInfoData = Data()
     @AppStorage("chartIDMap") var mapData = Data()
+    @AppStorage("didLogin") var didLogin = false
 
     @Environment(\.colorScheme) var colorScheme
 
@@ -217,7 +218,7 @@ struct SongDetailView: View {
                 }
                 .padding(.bottom)
 
-                if (!loadingScore) {
+                if (!loadingScore && didLogin) {
                     VStack(spacing: 5) {
                         ForEach(0..<4) { index in
                             ScoreCardView(index: index, scoreEntries: scoreEntries, song: song)
@@ -232,33 +233,35 @@ struct SongDetailView: View {
                 }
             }
             .task {
-                userInfo = try! JSONDecoder().decode(UserData.self, from: userInfoData)
-                var scores = userInfo.records.best.filter {
-                    $0.musicID == song.id
-                }
-                scores.sort {
-                    $0.levelIndex < $1.levelIndex
-                }
-                scoreEntries = Dictionary(uniqueKeysWithValues: scores.map { ($0.levelIndex, $0) })
-                loadingScore.toggle()
-            }
-            .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
-                    Menu {
-                        Button {
-                            showingCalc.toggle()
-                        } label: {
-                            Image(systemName: "plus.forwardslash.minus")
-                            Text("分数计算")
-                        }
-                        .sheet(isPresented: $showingCalc) {
-                            BorderCalcView(song: song)
-                        }
-                    } label: {
-                        Image(systemName: "ellipsis.circle")
+                if(didLogin) {
+                    userInfo = try! JSONDecoder().decode(UserData.self, from: userInfoData)
+                    var scores = userInfo.records.best.filter {
+                        $0.musicID == song.id
                     }
+                    scores.sort {
+                        $0.levelIndex < $1.levelIndex
+                    }
+                    scoreEntries = Dictionary(uniqueKeysWithValues: scores.map { ($0.levelIndex, $0) })
                 }
+                loadingScore.toggle()
             }
+//            .toolbar {
+//                ToolbarItem(placement: .navigationBarTrailing) {
+//                    Menu {
+//                        Button {
+//                            showingCalc.toggle()
+//                        } label: {
+//                            Image(systemName: "plus.forwardslash.minus")
+//                            Text("分数计算")
+//                        }
+//                        .sheet(isPresented: $showingCalc) {
+//                            BorderCalcView(song: song)
+//                        }
+//                    } label: {
+//                        Image(systemName: "ellipsis.circle")
+//                    }
+//                }
+//            }
         }
     }
 

diff --git a/chafenqi/View/TopView/HomeView.swift b/chafenqi/View/TopView/HomeView.swift
@@ -225,6 +225,8 @@ struct HomeView: View {
 
         }
         .task {
+            getChartIDMap()
+
             if (!didLogin) {
                 status = .empty
             } else {
@@ -330,8 +332,6 @@ struct HomeView: View {
                 await loadSongList()
                 totalChartCount = getTotalChartCount()
 
-                try getChartIDMap()
-
                 // For now
                 removeWEChart()
 
@@ -375,15 +375,11 @@ struct HomeView: View {
         return total
     }
 
-    func getChartIDMap() throws {
+    func getChartIDMap() {
+        guard mapData.isEmpty else { return }
+
         let path = Bundle.main.url(forResource: "IdMap", withExtension: "json")
-        let content: Data
-        do {
-            mapData = try Data(contentsOf: path!)
-            print("Successfully loaded ID map file.")
-        } catch {
-            throw CFQError.IOError(file: path!.absoluteString)
-        }
+        mapData = try! Data(contentsOf: path!)
     }
 }