modify files

AIGrammar/AllTabView.swift

@@ -40,6 +40,7 @@ struct AllTabView: View {
             WordPuzzleView()
                 .tabItem {
                     Image(systemName: "timer.circle")
+                    //Image(systemName: "rectangle.3.group")
                     Text("Puzzel")
                 }
                 .tag(3)

AIGrammar/Models/PuzzleGenerator.swift

@@ -0,0 +1,112 @@
+//
+//  PuzzleGenerator.swift
+//  AIGrammar
+//
+//  Created by oscar on 2025/7/21.
+//
+
+import Foundation
+import SwiftUI
+
+class PuzzleGenerator {
+    private(set) var validationWords: Set<String> = []
+    private(set) var puzzleWords: [String] = []
+
+    init() {
+        //loadValidationWords()
+        //loadPuzzleWords()
+        validationWords = Set(loadWords(from: "wordlist"))
+        puzzleWords = loadWords(from: "puzzle")
+    }
+
+    /// 通用加载逻辑
+    private func loadWords(from fileName: String) -> [String] {
+        if let url = Bundle.main.url(forResource: fileName, withExtension: "txt") {
+            do {
+                let content = try String(contentsOf: url)
+                let words = content
+                    .components(separatedBy: .newlines)
+                    .map { $0.trimmingCharacters(in: .whitespacesAndNewlines).uppercased() }
+                    .filter { !$0.isEmpty }
+                logger.info("Loaded \(words.count) words from \(fileName).txt")
+                return words
+            } catch {
+                logger.warning("Failed to load \(fileName).txt: \(error)")
+            }
+        } else {
+            logger.warning("\(fileName).txt not found!")
+        }
+        return []
+    }
+    
+    /// 加载验证单词库
+    private func loadValidationWords() {
+        if let url = Bundle.main.url(forResource: "wordlist", withExtension: "txt") {
+            do {
+                let content = try String(contentsOf: url)
+                validationWords = Set(content
+                    .components(separatedBy: .newlines)
+                    .map { $0.trimmingCharacters(in: .whitespacesAndNewlines).uppercased() }
+                    .filter { !$0.isEmpty })
+                logger.info("Loaded validation words: \(validationWords.count)")
+            } catch {
+                logger.warning("Failed to load wordlist.txt: \(error)")
+            }
+        }
+    }
+
+    /// 加载出题单词库
+    private func loadPuzzleWords() {
+        if let url = Bundle.main.url(forResource: "puzzle", withExtension: "txt") {
+            do {
+                let content = try String(contentsOf: url)
+                puzzleWords = content
+                    .components(separatedBy: .newlines)
+                    .map { $0.trimmingCharacters(in: .whitespacesAndNewlines).uppercased() }
+                    .filter { !$0.isEmpty }
+                logger.info("Loaded puzzle words: \(puzzleWords.count)")
+            } catch {
+                logger.warning("Failed to load puzzle.txt: \(error)")
+            }
+        }
+    }
+
+    /// 随机生成一套题目
+    func generatePuzzle() -> (Set<String>, [[String]]) {
+        var chosenWords: Set<String> = []
+        var uniqueLetters: Set<Character> = []
+
+        while (uniqueLetters.count < 16 && chosenWords.count < 6) || chosenWords.count < 4 {
+            if let word = puzzleWords.randomElement() {
+                chosenWords.insert(word)
+                uniqueLetters.formUnion(word)
+            }
+        }
+
+        // 保证16个不同字母
+        var selectedLetters = Array(uniqueLetters)
+        let alphabet = Array("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
+        while selectedLetters.count < 16 {
+            let randomLetter = alphabet.randomElement()!
+            if !selectedLetters.contains(randomLetter) {
+                selectedLetters.append(randomLetter)
+            }
+        }
+
+        let shuffledLetters = selectedLetters.shuffled()
+
+        var letters: [[String]] = Array(repeating: Array(repeating: "", count: 4), count: 4)
+        for i in 0..<4 {
+            for j in 0..<4 {
+                letters[i][j] = String(shuffledLetters[i * 4 + j])
+            }
+        }
+
+        return (chosenWords, letters)
+    }
+
+    /// 校验用户提交的单词
+    func validate(word: String) -> Bool {
+        validationWords.contains(word.uppercased())
+    }
+}

AIGrammar/View/WordPuzzleGameView.swift

@@ -1,153 +0,0 @@
-//
-//  WordPuzzleView.swift
-//  AIGrammar
-//
-//  Created by oscar on 2025/7/16.
-//
-import SwiftUI
-import AVFoundation
-
-struct WordPuzzleGameView: View {
-    @State private var letters: [[String]] = []
-    @State private var selectedLetters: [(Int, Int)] = []
-    @State private var foundWords: [String] = []
-    @State private var score: Int = 0
-    @State private var remainingTime = 60
-    @State private var isGameOver = false
-    
-    @GestureState private var dragLocation: CGPoint? = nil
-    @State private var audioPlayer: AVAudioPlayer?
-
-    let validWords = ["WORD", "GAME", "PUZZLE", "MET", "ME", "GO"]
-    let gridSize = 4
-    let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
-    
-    init() {
-        var chars = Array("WORDPUZZLEGAMETO").map { String($0) }
-        chars.shuffle()
-        _letters = State(initialValue: stride(from: 0, to: chars.count, by: gridSize).map {
-            Array(chars[$0..<$0+gridSize])
-        })
-    }
-    
-    var body: some View {
-        VStack {
-            Text("Time: \(remainingTime)s   Score: \(score)")
-                .font(.headline)
-            
-            if isGameOver {
-                Text("Game Over!")
-                    .font(.largeTitle)
-                    .foregroundColor(.red)
-            } else {
-                VStack(spacing: 4) {
-                    ForEach(0..<gridSize, id: \.self) { row in
-                        HStack(spacing: 4) {
-                            ForEach(0..<gridSize, id: \.self) { col in
-                                Text(letters[row][col])
-                                    .font(.title)
-                                    .frame(width: 50, height: 50)
-                                    .background(
-                                        selectedLetters.contains(where: { $0 == (row, col) }) ?
-                                        Color.blue.opacity(0.7) : Color.gray.opacity(0.2)
-                                    )
-                                    .cornerRadius(8)
-                                    .onTapGesture {
-                                        handleSelect(row: row, col: col)
-                                    }
-                            }
-                        }
-                    }
-                }
-                .gesture(
-                    DragGesture()
-                        .updating($dragLocation) { value, state, _ in
-                            state = value.location
-                            selectLetter(at: value.location)
-                        }
-                        .onEnded { _ in
-                            submitWord()
-                        }
-                )
-            }
-
-            ScrollView(.horizontal) {
-                HStack {
-                    ForEach(foundWords, id: \.self) { word in
-                        Text(word)
-                            .padding(6)
-                            .background(Color.green.opacity(0.3))
-                            .cornerRadius(6)
-                    }
-                }
-                .padding()
-            }
-        }
-        .padding()
-        .onReceive(timer) { _ in
-            guard !isGameOver else { return }
-            if remainingTime > 0 {
-                remainingTime -= 1
-            } else {
-                isGameOver = true
-                timer.upstream.connect().cancel()
-            }
-        }
-    }
-    
-    /// 点击选择
-    private func handleSelect(row: Int, col: Int) {
-        if !selectedLetters.contains(where: { $0 == (row, col) }) {
-            selectedLetters.append((row, col))
-        }
-    }
-    
-    /// 拖动选择
-    private func selectLetter(at point: CGPoint?) {
-        guard let point = point else { return }
-        for row in 0..<gridSize {
-            for col in 0..<gridSize {
-                let cellSize: CGFloat = 50 + 4
-                let cellOrigin = CGPoint(x: CGFloat(col) * cellSize + 20,
-                                         y: CGFloat(row) * cellSize + 120)
-                let cellRect = CGRect(origin: cellOrigin, size: CGSize(width: 50, height: 50))
-                if cellRect.contains(point) {
-                    if !selectedLetters.contains(where: { $0 == (row, col) }) {
-                        selectedLetters.append((row, col))
-                    }
-                }
-            }
-        }
-    }
-    
-    /// 提交选中的单词
-    private func submitWord() {
-        let word = selectedLetters.map { letters[$0.0][$0.1] }.joined()
-        
-        if validWords.contains(word) && !foundWords.contains(word) {
-            foundWords.append(word)
-            score += word.count * 10
-            playSound(named: "success")
-        } else {
-            playSound(named: "fail")
-        }
-        selectedLetters.removeAll()
-    }
-    
-    /// 播放提示音
-    private func playSound(named name: String) {
-        guard let url = Bundle.main.url(forResource: name, withExtension: "mp3") else { return }
-        audioPlayer = try? AVAudioPlayer(contentsOf: url)
-        audioPlayer?.play()
-    }
-}
-
-struct WordPuzzleGameView_Previews: PreviewProvider {
-    static var previews: some View {
-        WordPuzzleGameView()
-    }
-}
-
-#Preview {
-    WordPuzzleGameView()
-}

AIGrammar/View/WordPuzzleView.swift

@@ -175,83 +175,31 @@ class WordPuzzleViewModel: ObservableObject {
     @Published var showToast = false
     @Published var toastFlag = false
     @Published var toastMessage = ""
-    @Published var toastColor = Color.green
 
     private var timer: Timer?
-    private var allWords: Set<String> = ["WORD", "HAVE", "SWIFT", "CODE"] // 示例字典
-    private var wordList: [String] = []
+    private var allWords: Set<String> = []
+    private var submittedWords: Set<String> = []
+    private let generator = PuzzleGenerator()
 
     init() {
-        loadWordList()
         generateNewPuzzle()
     }
 
-    /// 加载本地字典
-    private func loadWordList() {
-        if let url = Bundle.main.url(forResource: "wordlist", withExtension: "txt") {
-            do {
-                let content = try String(contentsOf: url)
-                wordList = content
-                    .components(separatedBy: .newlines)
-                    .map { $0.trimmingCharacters(in: .whitespacesAndNewlines).uppercased() }
-                    .filter { !$0.isEmpty }
-            } catch {
-                logger.warning("Failed to load word list: \(error)")
-            }
-        } else {
-            logger.warning("wordlist.txt not found!")
-        }
-        logger.info("load wordlist. total words: \(wordList.count)")
-    }
-
-    /// 生成新的题目
+    /// 生成新题
     func generateNewPuzzle() {
-        if wordList.isEmpty {
-            logger.warning("Word list is empty")
-            wordList = ["WORD", "HAVE", "SWIFT", "CODE"] //  给个示例的
-        }
-
-        var chosenWords: Set<String> = []
-        var uniqueLetters: Set<Character> = []
-
-        while (uniqueLetters.count < 16 && chosenWords.count < 6) || chosenWords.count < 4 {
-            if let word = wordList.randomElement() {
-                chosenWords.insert(word)
-                uniqueLetters.formUnion(word)
-            }
-        }
-
-        allWords = chosenWords
-
-        // 确保 uniqueLetters ≥ 16
-        var selectedLetters = Array(uniqueLetters)
-        let alphabet = Array("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-
-        while selectedLetters.count < 16 {
-            let randomLetter = alphabet.randomElement()!
-            if !selectedLetters.contains(randomLetter) {
-                selectedLetters.append(randomLetter)
-            }
-        }
-
-        // 打乱
-        let shuffledLetters = selectedLetters.shuffled()
-
-        letters = Array(repeating: Array(repeating: "", count: 4), count: 4)
-        for i in 0..<4 {
-            for j in 0..<4 {
-                letters[i][j] = String(shuffledLetters[i * 4 + j])
-            }
-        }
+        let (words, grid) = generator.generatePuzzle()
+        allWords = words
+        letters = grid
 
         guessedWords = 0
         selectedPositions.removeAll()
         timeRemaining = 60
         //shuffleCount = 0
         
-        logger.info("New puzzle generated with words: \(allWords) and letters: \(shuffledLetters)")
+        submittedWords.removeAll()
+        logger.info("New puzzle with words: \(allWords)")
     }
-    
+
     func startTimer() {
         stopTimer()
         timer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
@@ -275,22 +223,32 @@ class WordPuzzleViewModel: ObservableObject {
         guard !word.isEmpty else { return }
 
         if timeRemaining <= 0 {
-            showToast(message: "Time's up!", succ: false)
+            showToast(message: "Time's up!  Shuffle for new game.", succ: false)
             return
         }
 
-        if allWords.contains(word) {
+        if word.count < 3 {
+            showToast(message: "At least three words.", succ: false)
+            return
+        }
+        
+        if submittedWords.contains(word) {
+            showToast(message: "Already submitted!", succ: false)
+            return
+        }
+        
+        if generator.validate(word: word) {
             guessedWords += 1
+            submittedWords.insert(word) // 记录
             showToast(message: "Correct!", succ: true)
         } else {
             showToast(message: "Please try again", succ: false)
         }
 
         if guessedWords >= 4 {
-            //stopTimer()
             dailyWins += 1
-            showToast(message: "Congratulations! \nStart next puzzle...", succ: true)
-            generateNewPuzzle()  // 新开一局
+            showToast(message: "Congratulations! Next puzzle...", succ: true)
+            generateNewPuzzle()
         }
     }
 
@@ -302,14 +260,11 @@ class WordPuzzleViewModel: ObservableObject {
 
         shuffleCount += 1
         generateNewPuzzle()
+        startTimer()
     }
 
     private func selectedWord() -> String {
-        var result = ""
-        for pos in selectedPositions {
-            result += letters[pos.row][pos.col]
-        }
-        return result
+        selectedPositions.map { letters[$0.row][$0.col] }.joined()
     }
 
     private func showToast(message: String, succ: Bool) {