1.5.11

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
     Version: "1.5.11",
-    IsProduction: true,
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

pages/test/index.js

@@ -7,8 +7,8 @@ Page({
   data: {
     List: [],
     IsSelectGrade: false,
-    TestSelectGrade:0,
-    
+    TestSelectGrade: 0,
+
   },
   onLoad: function (options) {
     var that = this;
@@ -20,11 +20,11 @@ Page({
       if (!arr) {
         wx.removeStorageSync("HanziUpdateTime");
         wx.removeStorageSync("HanziAll");
-        main.getHanzi(function(arr){});
+        main.getHanzi(function (arr) {});
       }
     });
   },
-  onShow:function(){
+  onShow: function () {
     this.getTestReportList();
   },
   showSelectGrade: function () {
@@ -48,110 +48,99 @@ Page({
   getTestReportList: function () {
     var that = this;
     that.setData({
-      GradeArr: [
-        {
+      GradeArr: [{
           Name: "一年级",
           Name2: "语文一年级",
           Select: "Select",
-          List: [
-            {
-              ID: 1,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 12,
-              Image: "../images/examine_subject_a001.png"
-            }, {
-              ID: 2,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "下学期",
-              Finish: 0,
-              Total: 14,
-              Image: "../images/examine_subject_a002.png"
-            },
-          ]
+          List: [{
+            ID: 1,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 12,
+            Image: "../images/examine_subject_a001.png"
+          }, {
+            ID: 2,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Finish: 0,
+            Total: 14,
+            Image: "../images/examine_subject_a002.png"
+          }, ]
         },
         {
           Name: "二年级",
           Name2: "语文二年级",
           Select: "",
-          List: [
-            {
-              ID: 3,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a003.png"
-            }, {
-              ID: 4,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "下学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a004.png"
-            },
-          ]
+          List: [{
+            ID: 3,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a003.png"
+          }, {
+            ID: 4,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a004.png"
+          }, ]
         },
         {
           Name: "三年级",
           Name2: "语文三年级",
           Select: "",
-          List: [
-            {
-              ID: 5,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a005.png"
-            }, {
-              ID: 6,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "下学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a006.png"
-            },
-          ]
+          List: [{
+            ID: 5,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a005.png"
+          }, {
+            ID: 6,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a006.png"
+          }, ]
         },
         {
           Name: "四年级",
           Name2: "语文四年级",
           Select: "",
-          List: [
-            {
-              ID: 7,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a007.png"
-            },
-          ]
+          List: [{
+            ID: 7,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a007.png"
+          }, ]
         },
         {
           Name: "五年级",
           Name2: "语文五年级",
           Select: "",
-          List: [
-            {
-              ID: 9,
-              Type: "Shizi",
-              Name: "语文识字",
-              Name2: "上学期",
-              Finish: 0,
-              Total: 16,
-              Image: "../images/examine_subject_a009.png"
-            },
-          ]
+          List: [{
+            ID: 9,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "上学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a009.png"
+          }, ]
         },
         // {
         //   Name: "六年级",
@@ -208,29 +197,29 @@ Page({
     var userid = app.globalData.userInfo.UserID;
     main.getData('GetTestReportList?UserID=' + userid, function (data) {
       if (data) {
-        var dataTemp=[];
+        var dataTemp = [];
         for (var i = 0; i < data.length; i++) {
-          for(var j=0;j<dataTemp.length;j++){
-            if (dataTemp[j].Name[0] == data[i].Name[0]
-              && dataTemp[j].Name[1] == data[i].Name[1]
-              && dataTemp[j].TestType == data[i].TestType 
-              && data[i].IsFinished==1
-              ){
-              dataTemp.splice(j,1);
+          for (var j = 0; j < dataTemp.length; j++) {
+            if (dataTemp[j].Name[0] == data[i].Name[0] &&
+              dataTemp[j].Name[1] == data[i].Name[1] &&
+              dataTemp[j].TestType == data[i].TestType &&
+              data[i].IsFinished == 1
+            ) {
+              dataTemp.splice(j, 1);
               break;
             }
           }
           dataTemp.push(data[i]);
         }
 
-        for (var i = 0; i < dataTemp.length;i++){
+        for (var i = 0; i < dataTemp.length; i++) {
           var name = dataTemp[i].Name[0].split(" ");
-          for(var j=0;j<that.data.GradeArr.length;j++){
+          for (var j = 0; j < that.data.GradeArr.length; j++) {
             var item = that.data.GradeArr[j];
-            if (name[0]==item.Name){
-              for(var k=0;k<item.List.length;k++){
-                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2){
-                  if (dataTemp[i].IsFinished==1)
+            if (name[0] == item.Name) {
+              for (var k = 0; k < item.List.length; k++) {
+                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
+                  if (dataTemp[i].IsFinished == 1)
                     item.List[k].Finish++;
                 }
               }
@@ -247,23 +236,29 @@ Page({
 
         that.setData({
           TestReport: data,
-          GradeArr:that.data.GradeArr,
+          GradeArr: that.data.GradeArr,
         });
         wx.setStorageSync("UserTestReport", data);
 
         common.getStorageValue(that, "TestSelectGrade", 0, function () {
-          that.onSelectGrade({ currentTarget: { dataset: { value: that.data.TestSelectGrade } } });
+          that.onSelectGrade({
+            currentTarget: {
+              dataset: {
+                value: that.data.TestSelectGrade
+              }
+            }
+          });
         });
       }
     });
   },
-  onSelectGrade:function(e){
-    var index=e.currentTarget.dataset.value;
-    for (var i = 0; i < this.data.GradeArr.length;i++)
+  onSelectGrade: function (e) {
+    var index = e.currentTarget.dataset.value;
+    for (var i = 0; i < this.data.GradeArr.length; i++)
       this.data.GradeArr[i].Select = "";
-    this.data.GradeArr[index].Select="Select";
+    this.data.GradeArr[index].Select = "Select";
     this.setData({
-      TestSelectGrade:index,
+      TestSelectGrade: index,
       GradeArr: this.data.GradeArr,
     });
     this.closeSelectGrade();
@@ -272,16 +267,17 @@ Page({
   gotoTestReportInfo: function (e) {
     var id = e.currentTarget.dataset.id;
     var userid = app.globalData.userInfo.UserID;
+    //todo
     main.getData('GetTestReportInfo?UserID=' + userid+'&ID='+id, function (data) {
       if (data) {
         wx.setStorageSync("TestTask", data);
         wx.navigateTo({
-          url: "./report?type=edit",
+          url: "./report?type=edit&id="+id,
         });
       }
     });
   },
-  onUnload:function(){
+  onUnload: function () {
     wx.removeStorageSync("UserTestReport");
   },
   onShareAppMessage: function () {
@@ -291,4 +287,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/test/index.wxml

@@ -51,9 +51,9 @@
             <image wx:if="{{item.TestType=='write' && item.IsFinished==1}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_green_22x22.png"></image>
             <image wx:if="{{item.TestType=='write' && item.IsFinished==0}}" class="examine_willwrite_gray_22x22" src="../images/examine_willwrite_gray_22x22.png"></image>
             <image class="universalpic_checked_gray_14x12" src="../images/universalpic_checked_gray_14x12.png"></image>
-            <view class="Number2">{{item.TestRight}}</view>
+            <view class="Number2">{{item.TestRightStr.length}}</view>
             <image class="universalpic_wrong_gray_12x12" src="../images/universalpic_wrong_gray_12x12.png"></image>
-            <view class="Number3">{{item.TestWrong}}</view>
+            <view class="Number3">{{item.TestWrongStr.length}}</view>
           </view>
         </view>
       </view>

pages/test/item.js

@@ -57,7 +57,6 @@ Page({
     if (app.globalData.BaiduToken === "")
       main.getBaiduToken();
   },
-  
   init: function (options) {
     var that = this;
     that.setData({
@@ -66,76 +65,15 @@ Page({
       TestName1: options.name1,
       TestName2: options.name2,
     });
-    main.getData('GetHanziUnitWords?UnitID=' + options.unitsid, function (data) {
+    main.GetHanziUnitWords(options.unitsid,that.data.TestType, function (data) {
       if (data) {
-        TaskList = [];
-        var words = data;
-        for (var k = 0; k < words.length; k++) {
-          var taskInfo = {
-            FontSize: 144,
-            TagWidth:136,
-            Content: [
-              { ContentType: 0, Content: [] },
-              { ContentType: 1, Content: [] },
-              { ContentType: 2, Content: [] },
-            ]
-          };
-          taskInfo.Word=words[k].Name;
-          
-          var pinyinNormal = "(" + main.getPinyinNormal(words[k].Pinyin) + ")";
-          taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
-
-          if (that.data.TestType == "read") {
-            taskInfo.Content[0].Content = ["怎么念"];
-            var question = words[k].CombineWords;
-            question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
-            taskInfo.Content[1].Content = question;
-            
-            
-            var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
-            taskInfo.Content[2].Content = answer;
-
-            if (words[k].CombineWords.length > 6) {
-              taskInfo.FontSize = 108;
-              if (words[k].CombineWords.length > 10) {
-                taskInfo.FontSize = 68;
-              }
-            }
-          }
-          else if (that.data.TestType == "write") {
-            taskInfo.Content[0].Content = ["怎么写"];
-
-            var question = words[k].CombineWords;
-            var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
-            
-            question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
-            taskInfo.Content[1].Content = question;
-            var answer = words[k].Name;
-            answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
-            taskInfo.Content[2].Content = answer;
-
-            if (question2.length > 6) {
-              taskInfo.FontSize = 108;
-              if (question2.length > 10) {
-                taskInfo.FontSize = 68;
-                if (question2.length > 14) {
-                  taskInfo.FontSize = 48;
-                }
-              }
-            }
-          }
-          taskInfo.ContentNew = main.changeStringToView(taskInfo.Content);
-          TaskList.push(taskInfo);
-        }
-
+        TaskList=data;
         TaskList = common.randomArray(TaskList);
-
         that.setData({
           TaskInfo: TaskList[0],
           TaskLength: TaskList.length,
           CurrentIndex: 0,
         });
-
         common.getStorageValue(that, "TestAutioPlay", 1, function () { 
           if (that.data.TestAutioPlay == 1 && that.data.TestType == "write") {
             that.playSound({ currentTarget: { dataset: { content: TaskList[that.data.CurrentIndex].ReadString } } })
@@ -143,8 +81,6 @@ Page({
         });
       }
     });
-
-    
   },
   init2: function (options) {
     var that = this;

utils/main.js

@@ -840,6 +840,77 @@ function getMemoryLevel(index, number, time) {
     return result;
   }
 }
+//得到要检验的汉字列表
+function GetHanziUnitWords(unitsID,testType,callback){
+  getData('GetHanziUnitWords?UnitID=' + unitsID, function (data) {
+    if (data) {
+      var TaskList = [];
+      var words = data;
+      for (var k = 0; k < words.length; k++) {
+        var taskInfo = {
+          FontSize: 144,
+          TagWidth:136,
+          Content: [
+            { ContentType: 0, Content: [] },
+            { ContentType: 1, Content: [] },
+            { ContentType: 2, Content: [] },
+          ]
+        };
+        taskInfo.Word=words[k].Name;
+        
+        var pinyinNormal = "(" + getPinyinNormal(words[k].Pinyin) + ")";
+        taskInfo.ReadString = words[k].Name + pinyinNormal + "," + words[k].CombineWords + "的" + words[k].Name + pinyinNormal;
+
+        if (testType == "read") {
+          taskInfo.Content[0].Content = ["怎么念"];
+          var question = words[k].CombineWords;
+          question = common.ReplaceAllString(question, words[k].Name, "(" + words[k].Name + ")");
+          taskInfo.Content[1].Content = question;
+          
+          
+          var answer = "[读 src='" + taskInfo.ReadString + "']" + words[k].Pinyin + "[/读]";
+          taskInfo.Content[2].Content = answer;
+
+          if (words[k].CombineWords.length > 6) {
+            taskInfo.FontSize = 108;
+            if (words[k].CombineWords.length > 10) {
+              taskInfo.FontSize = 68;
+            }
+          }
+        }
+        else if (testType == "write") {
+          taskInfo.Content[0].Content = ["怎么写"];
+
+          var question = words[k].CombineWords;
+          var question2 = common.ReplaceAllString(question, words[k].Name, words[k].Pinyin);
+          
+          question = "[读 src='" + taskInfo.ReadString + "']" + question2 + "[/读]"
+          taskInfo.Content[1].Content = question;
+          var answer = words[k].Name;
+          answer += "[图 w='650' h='650']" + words[k].BiShunUrl + "[/图]";
+          taskInfo.Content[2].Content = answer;
+
+          if (question2.length > 6) {
+            taskInfo.FontSize = 108;
+            if (question2.length > 10) {
+              taskInfo.FontSize = 68;
+              if (question2.length > 14) {
+                taskInfo.FontSize = 48;
+              }
+            }
+          }
+        }
+        taskInfo.ContentNew = changeStringToView(taskInfo.Content);
+        TaskList.push(taskInfo);
+      }
+
+      callback(TaskList);
+    }
+    else{
+      callback([]);
+    }
+  });
+}
 
 function getDetailColor(index) {
   var arr = [
@@ -2479,5 +2550,6 @@ module.exports = {
   getBaiduToken: getBaiduToken,
   buildInitData: buildInitData,
   getPinyinNormal: getPinyinNormal,
-  getHanzi: getHanzi
+  getHanzi: getHanzi,
+  GetHanziUnitWords:GetHanziUnitWords
 }