完成打词率属性

Author: ryan4yin

.idea/workspace.xml

@@ -115,6 +115,7 @@ public void update(KeyEvent keyEvent) {
         updateKeys(keyEvent);
 
         // 2. 更新和文本有关的内容
+        // TODO 只在已经上屏时, 才调用 updateText() 方法. (需要找到一个检测字符是否已经上屏的方法,)
         updateText();
     }
 
@@ -132,7 +133,10 @@ private void updateText() {
 
         if (inputLengthLast < inputLengthNow) {
             // 1. 更新字符数
-            scoreUpdater.addToCharactersCount(inputLengthNow - inputLengthLast);
+            int count = inputLengthNow - inputLengthLast;
+            scoreUpdater.addToCharactersCount(count);
+            // 如果字符数添加了不止一个，还要更新打词字符数
+
 
             // 2. 检测刚刚键入的字符是否敲对了
             for (int i = inputLengthLast; i < inputLengthNow; i++) {

src/main/java/me/ryan/controller/TextController.java

@@ -31,7 +31,8 @@ public class ScoreUpdater {
     // start() 被调用前，也就是用户离开前，用户输入所用过的时间。
     private LocalTime timeIntervalLast;
 
-    // TODO 通过打词键入的字符数
+    // TODO 通过打词键入的字符数，名字就胡乱取了
+    private int charCountInWord;
 
     // TODO ：退格 等
 
@@ -44,6 +45,8 @@ public ScoreUpdater(Score score, ScoreProperties scoreProperties) {
         this.startTime = LocalTime.now();
         timeIntervalLast = LocalTime.of(0, 0);  // 初始用时为0
 
+        this.charCountInWord = 0;
+
         // 开启自动更新
         updateAutomatically();
     }
@@ -140,26 +143,47 @@ public void incKeyEnterCount() {
     }
 
     public void incTypos() {
+        checkIt("incTypos");
+
         score.setTypos(score.getTypos() + 1);
         scoreProperties.setTypos(score.getTyposString());
 
         logger.debug("inc typos: {}", score.getTyposString());
     }
 
     public void decTypos() {
+        checkIt("decTypos");
+
         score.setTypos(score.getTypos() - 1);
         scoreProperties.setTypos(score.getTyposString());
 
         logger.debug("dec typos: {}", score.getTyposString());
     }
 
+    public void setTypos(int typos) {
+        checkIt("setTypos");
+
+        score.setTypos(typos);
+        scoreProperties.setTypos(score.getTyposString());
+
+        logger.debug("set typos: {}", score.getTyposString());
+    }
+
     public void incBackspaceCount() {
+        checkIt("incBackspaceCount");
+
         score.setBackspaceCount(score.getBackspaceCount() + 1);
         scoreProperties.setBackspaceCount(score.getBackspaceCountString());
 
         logger.debug("inc BackspaceCount:　{}", score.getBackspaceCount());
     }
 
+    public void addToCharCountInWord(int count) {
+        checkIt("addToCharCountInWord");
+
+        this.charCountInWord += count;
+    }
+
     /**
      * 开始更新，用户开始输入
      */
@@ -234,8 +258,10 @@ private void updateScore() {
             score.setKeysEachChar(newKeysEachChar);
             scoreProperties.setKeysEachChar(score.getKeysEachCharString());
 
-            // TODO 5. 更新 打词率
-
+            // 5. 更新 打词比率
+            double newRatioOfWords = charCountInWord / (double) score.getCharactersCount();
+            score.setRatioOfWords(newRatioOfWords);
+            scoreProperties.setRatioOfWords(score.getRatioOfWordsString());
 
             // TODO 6. 更新 键准
         }
@@ -250,14 +276,16 @@ public void reInit() {
 
         this.active = false;
         this.startTime = LocalTime.now();
-        timeIntervalLast = LocalTime.of(0, 0);
+        this.timeIntervalLast = LocalTime.of(0, 0);
+
+        this.charCountInWord = 0;
 
         logger.info("重置成绩。");
     }
 
 
     /**
-     * TODO 生成收文机器人能识别的成绩字符串
+     * 生成收文机器人能识别的成绩字符串
      */
     @Override
     public String toString() {