1.0.0

pages/main/detail.js

@@ -80,6 +80,8 @@ Page({
                     that.init();
                   else if (that.data.WordType == "review")
                     that.initReview();
+                  else if (that.data.WordType == "search")
+                    that.initSearch();
                 });
               });
             });
@@ -115,7 +117,6 @@ Page({
   init: function () {
     var arr = JSON.parse(wx.getStorageSync("HanziAll"));
     var arrReview = wx.getStorageSync("ReviewList");
-    var title = "";
     var result;
     for (var i = 0; i < arr.length; i++) {
       if (arr[i].ID == this.data.BookID) {
@@ -129,9 +130,6 @@ Page({
               item.Words[k].WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Words[k].Name + ".jpg";
 
               item.Words[k].IsReview = false;
-
-              title = arr[i].Name.replace("识字能力", "");
-              title += " " + item.Name;
               for (var l = 0; l < arrReview.length; l++) {
                 if (arrReview[l].Word == item.Words[k].Name) {
                   item.Words[k].IsReview = true;
@@ -163,35 +161,18 @@ Page({
     });
 
     this.restart(this.data.CurrentIndex);
-
     wx.setNavigationBarTitle({
-      title: title
+      title: "练习"
     });
   },
   initReview: function () {
-    var arr = JSON.parse(wx.getStorageSync("HanziAll"));
     var arrReview = wx.getStorageSync("ReviewList");
-    var title = "";
-    var result = [];
     for (var l = 0; l < arrReview.length; l++) {
-      for (var i = 0; i < arr.length; i++) {
-        for (var j = 0; j < arr[i].Units.length; j++) {
-          var item = arr[i].Units[j];
-          for (var k = 0; k < item.Words.length; k++) {
-            if (arrReview[l].Word == item.Words[k].Name && arrReview[l].WordID == item.Words[k].ID) {
-              if (item.Words[k].Pinyin.indexOf(",") > 0)
-                item.Words[k].Pinyin = item.Words[k].Pinyin.substr(0, item.Words[k].Pinyin.indexOf(","));
-
-              item.Words[k].WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Words[k].Name + ".jpg";
-              item.Words[k].IsReview = false;
-              item.Words[k].IsReview = true;
-              result.push(item.Words[k]);
-              break;
-            }
-          }
-        }
-      }
+      var item = arrReview[l];
+      item.WordUrl = app.globalData.imageUrl + "/images/hanzi" + item.Name + ".jpg";
+      item.IsReview = true;
     }
+    var result = arrReview;
 
     if (this.data.selectedRandom) {
       result = common.randomArray(result);
@@ -211,8 +192,51 @@ Page({
     this.restart(this.data.CurrentIndex);
 
     wx.setNavigationBarTitle({
-      title: "复习"
+      title: "练习"
+    });
+  },
+  initSearch: function () {
+    var arr = JSON.parse(wx.getStorageSync("HanziAll"));
+    var result = wx.getStorageSync("CurrentSearchWord");
+    result.WordUrl += "?" + new Date().getTime();
+    var arrReview = wx.getStorageSync("ReviewList");
+    var title = "汉字";
+    for (var i = 0; i < arr.length; i++) {
+      for (var j = 0; j < arr[i].Units.length; j++) {
+        var item = arr[i].Units[j];
+        for (var k = 0; k < item.Words.length; k++) {
+
+          if (result.ID == item.Words[k].ID) {
+            title = arr[i].Name.replace("识字能力", "");
+            title += " " + item.Name;
+          }
+          result.IsReview = false;
+
+          for (var l = 0; l < arrReview.length; l++) {
+            if (arrReview[l].Word == result.Name) {
+              result.IsReview = true;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    var resultArr = [];
+    resultArr.push(result);
+    var obj = {
+      IsEnd: true,
+    }
+    resultArr.push(obj);
+    this.setData({
+      List: resultArr,
+    });
+
+    wx.setNavigationBarTitle({
+      title: title
     });
+
+    this.restart(this.data.CurrentIndex);
   },
   playAudio: function (e) {
     //console.log("playAudio");
@@ -242,8 +266,7 @@ Page({
 
           var Name = this.data.List[this.data.CurrentIndex].Name;
           var CombineWords = this.data.List[this.data.CurrentIndex].CombineWords;
-
-
+          CombineWords = CombineWords.replace(Name, Name + "(" + pinyinItem + ")");
           if ((e && e.currentTarget.dataset.pinyin) || !this.data.IsAudioLengthChecked) {
             url = url.replace("[word]", Name + "(" + pinyinItem + ")");
             url = url.replace("spd=3", "spd=1");
@@ -251,7 +274,6 @@ Page({
           else {
             url = url.replace("[word]", Name + "(" + pinyinItem + ")," + CombineWords + "的" + Name + "(" + pinyinItem + ")");
           }
-
         }
       }
       this.audioCtx.setSrc(url);
@@ -316,17 +338,6 @@ Page({
     if (index == 0)
       isShowPrev = false;
 
-
-    if (that.data.wordType == "review") {
-      for (var i = 0; i < that.data.List.length - 1; i++) {
-        if (!that.data.List[i].IsReview)
-          that.data.List.splice(i, 1);
-      }
-      that.setData({
-        List: that.data.List,
-      });
-    }
-
     this.setCurrentWord(index, isShowPrev, true);
 
     this.playAudio();
@@ -359,7 +370,9 @@ Page({
     });
   },
   getImageDownload: function () {
+    this.data.List[this.data.CurrentIndex].WordUrl += common.random(0, 9);
     this.setData({
+      List: this.data.List,
       IsImageError: false,
     });
   },
@@ -372,18 +385,41 @@ Page({
       });
 
       if (this.data.IsShowWordDetail) {
-        var id = e.currentTarget.dataset.id;
-        server.getData('GetHanziDetail?ID=' + id, function (data) {
-          if (data) {
-            //var data = common.Decrypt(data);
-            //data=JSON.parse(data);
-            data.Antonym = data.Antonym.join(" ");
-            data.Synonym = data.Synonym.join(" ");
-            that.setData({
-              Detail: data,
-            });
+        if (this.data.WordType == "search") {
+          var result = wx.getStorageSync("CurrentSearchWord");
+          result = JSON.parse(result.Details);
+          for (var i = 0; i < result.PinYin.length; i++) {
+            var item = result.PinYin[i].explain;
+            item = common.ReplaceAllString(item, "<p>", "");
+            item = common.ReplaceAllString(item, "<span>", "");
+            item = common.ReplaceAllString(item, "</span>", "");
+            item = common.ReplaceAllString(item, "\r", "");
+            item = common.ReplaceAllString(item, "\n", "");
+
+            var arr = item.split("</p>");
+            arr.pop();
+            result.PinYin[i].explain = arr;
           }
-        });
+          result.Antonym = result.Antonym.join(" ");
+          result.Synonym = result.Synonym.join(" ");
+          that.setData({
+            Detail: result,
+          });
+        }
+        else {
+          var id = e.currentTarget.dataset.id;
+          server.getData('GetHanziDetail?ID=' + id, function (data) {
+            if (data) {
+              //var data = common.Decrypt(data);
+              //data=JSON.parse(data);
+              data.Antonym = data.Antonym.join(" ");
+              data.Synonym = data.Synonym.join(" ");
+              that.setData({
+                Detail: data,
+              });
+            }
+          });
+        }
       }
     }
   },

pages/main/detail.wxml

@@ -17,12 +17,12 @@
       </view>
 
       <view class="finished FlexColumn" catchtap='updateFinish' wx:if="{{WordType!='review' && IsFinished}}">
-        <view class="finished1 FlexColumn" >
+        <view class="finished1 FlexColumn">
           <image src='../../images/05010.png' class="btnImage04006" />
         </view>
       </view>
       <view class="finished2 finished FlexColumn" catchtap='updateFinish' wx:if="{{WordType!='review' && !IsFinished}}">
-        <view class="finished3 finished1 FlexColumn" >
+        <view class="finished3 finished1 FlexColumn">
           <image src='../../images/05011.png' class="btnImage04006" />
         </view>
       </view>
@@ -32,11 +32,18 @@
 
   </view>
   <view class="detail" wx:if="{{IsShowWordDetail}}">
-    <image src='{{Detail.BiShunUrl}}' class="bishun" />
-    <view class="line"></view>
-    <view class="title2 title FlexRow">
-      <view class="title1">汉语拼音</view>
-    </view>
+    <block wx:if="{{Detail.BiShunUrl}}">
+      <image src='{{Detail.BiShunUrl}}' class="bishun" />
+      <view class="line"></view>
+      <view class="title2 title FlexRow">
+        <view class="title1">汉语拼音</view>
+      </view>
+    </block>
+    <block wx:if="{{!Detail.BiShunUrl}}">
+      <view class="title FlexRow">
+        <view class="title1">汉语拼音</view>
+      </view>
+    </block>
     <view class="content FlexRow">
       <view class="pinyin FlexRow" wx:for="{{Detail.PinYin}}" wx:key="index" catchtap='playAudio' data-click="true" data-pinyin="{{item.pinyin}}">
         <view>{{item.pinyin}}</view>
@@ -100,24 +107,35 @@
 
   <view class="bottom FlexColumn">
     <view class="bottom1 FlexRow">
-      <view class="btn FlexColumn" bindtap='prevHandler'>
-        <image src='../../images/05001.png' class="btnImage05001" wx:if="{{IsShowPrev && !IsAutoPage }}" />
+      <view class="btn FlexColumn" bindtap='prevHandler' wx:if="{{IsShowPrev && !IsAutoPage }}">
+        <image src='../../images/05001.png' class="btnImage05001" />
+      </view>
+      <view class="btn FlexColumn" bindtap='prevHandler' wx:if="{{!(IsShowPrev && !IsAutoPage) }}">
       </view>
+      
       <view class="btn FlexColumn" bindtap='reviewHandler'>
         <image wx:if="{{!List[CurrentIndex].IsReview && IsShowNext && !IsAutoPage}}" src='../../images/05002.png' class="btnImage05002" />
         <image wx:if="{{List[CurrentIndex].IsReview && IsShowNext && !IsAutoPage}}" src='../../images/05003.png' class="btnImage05002" />
         <image wx:if="{{!IsShowNext}}" src='../../images/05009.png' class="btnImage022" />
       </view>
-      <view class="btn FlexColumn" bindtap='openSetting'>
+
+      <view class="btn FlexColumn" bindtap='openSetting' wx:if="{{WordType!='search'}}">
         <image src='../../images/05004.png' class="btnImage05004" />
       </view>
+      <view class="btn FlexColumn" wx:if="{{WordType=='search'}}">
+      </view>
+
       <view class="btn FlexColumn" bindtap='showWordDetailHandler' data-id='{{List[CurrentIndex].ID}}'>
         <image src='../../images/05005.png' wx:if="{{!IsShowWordDetail && IsShowNext && !IsAutoPage}}" class="btnImage05005" />
         <image src='../../images/05006.png' wx:if="{{IsShowWordDetail && IsShowNext && !IsAutoPage}}" class="btnImage05006" />
       </view>
-      <view class="btn FlexColumn" bindtap='nextHandler' data-status="click">
-        <image src='../../images/05007.png' class="btnImage05001" wx:if="{{IsShowNext && !IsAutoPage}}" />
+
+      <view class="btn FlexColumn" bindtap='nextHandler' data-status="click" wx:if="{{IsShowNext && !IsAutoPage && WordType!='search'}}">
+        <image src='../../images/05007.png' class="btnImage05001" />
+      </view>
+      <view class="btn FlexColumn" bindtap='nextHandler' data-status="click" wx:if="{{!(IsShowNext && !IsAutoPage && WordType!='search')}}">
       </view>
+      
     </view>
   </view>
 </view>

pages/main/detail.wxss

@@ -90,6 +90,8 @@
   left:0;
   z-index: 10;
   overflow-x: hidden;
+  background-color: #F0F0F0;
+  
 }
 .detail .bishun{
   width:758rpx;

pages/main/index.wxml

@@ -60,7 +60,7 @@
     <view class="index8 FlexColumn">
       <image src='../../images/02013.png' class="img" />
       <view class="index8_1" bindtap='gotoSearch'>
-        搜一搜，输入一个字
+        输入一个字
       </view>
     </view>
 

pages/main/list.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  <view class="line"></view>
-  <view class="line1 line"></view>
+  <view class="top line"></view>
+  <view class="top2 top line1 line"></view>
   <image src='{{topImage}}' class="topImage" />
 
   <view class="line"></view>

pages/main/list.wxss

@@ -15,7 +15,19 @@
   background-color: #c4a271;
 }
 
+
+.top {
+  position: fixed;
+  top:0;
+  z-index: 10;
+}
+
+.top2 {
+  top:10rpx;
+}
+
 .topImage {
+  margin-top: 20rpx;
   width: 100%;
   height: 430rpx;
 }

pages/main/search.js

@@ -13,13 +13,13 @@ Page({
       IsSearchResult: false,
     });
   },
-  getExampleArray:function(){
-    var result=[];
+  getExampleArray: function () {
+    var result = [];
     var arr = JSON.parse(wx.getStorageSync("HanziAll"));
     for (var i = 0; i < arr.length; i++) {
-      var rnd1 = common.random(0, arr[i].Units.length-1);
+      var rnd1 = common.random(0, arr[i].Units.length - 1);
       var rnd2 = common.random(0, arr[i].Units[rnd1].Words.length - 1);
-      
+
       var isfinished = false;
       var arrReview = wx.getStorageSync("ReviewList");
       for (var l = 0; l < arrReview.length; l++) {
@@ -31,47 +31,32 @@ Page({
       arr[i].Units[rnd1].Words[rnd2].BookID = arr[i].ID;
       arr[i].Units[rnd1].Words[rnd2].UnitID = arr[i].Units[rnd1].ID;
       arr[i].Units[rnd1].Words[rnd2].WordID = rnd2;
-      arr[i].Units[rnd1].Words[rnd2].IsFinished=isfinished;
+      arr[i].Units[rnd1].Words[rnd2].IsFinished = isfinished;
       result.push(arr[i].Units[rnd1].Words[rnd2]);
     }
     return result;
   },
   researchWord: function (e) {
-    var result=false;
+    var that = this;
+    var result = false;
     var word = e.detail.value;
-    if (word) {
-      console.log(word);
-      var arr = JSON.parse(wx.getStorageSync("HanziAll"));
-      for (var i = 0; i < arr.length; i++) {
-        for (var j = 0; j < arr[i].Units.length; j++) {
-          var item = arr[i].Units[j];
-          for (var n = 0; n < item.Words.length; n++) {
-            if (word == item.Words[n].Name) {
-              var bookid = arr[i].ID;
-              var unitid = item.ID;
-              var wordid = n;
-
-              var isfinished = false;
-              var arrReview = wx.getStorageSync("ReviewList");
-              for (var l = 0; l < arrReview.length; l++) {
-                if (arrReview[l].Word == word) {
-                  isfinished=true;
-                  break;
-                }
-              }
-              wx.navigateTo({
-                url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
-              });
-              result=true;
-              break;
-            }
-          }
+    if (common.IsChinese(word)) {
+      server.getData('SearchHanzi?Word=' + word, function (data) {
+        if (data) {
+          wx.setStorageSync("CurrentSearchWord", data);
+          wx.navigateTo({
+            url: "./detail?Type=search",
+          });
         }
-      }
+        else{
+          that.setData({
+            IsSearchResult: true,
+          });
+        }
+      });
     }
-
-    if (!result){
-      this.setData({
+    else {
+      that.setData({
         IsSearchResult: true,
       });
     }
@@ -88,7 +73,7 @@ Page({
       wx.setStorageSync('IsAutoPage', false);
     }
     wx.navigateTo({
-      url: "./detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
+      url: "./detail?Type=search&bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
     });
   },
 })

pages/main/search.wxml

@@ -5,7 +5,7 @@
   <block wx:if="{{IsSearchResult}}">
     <image class="image04009" src="../../images/04009.png" />
     <view class="search2">暂未收录</view>
-    <text class="search3">换个常用字试试吧\n更多字逐步更新中</text>
+    <text class="search3">不支持英文和其它字符</text>
     <view class="line"></view>
     <view class="search4">推荐几个常用字</view>
     <view class="search5 FlexRow">

project.config.json

@@ -1,7 +1,7 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,

utils/util.js

@@ -346,9 +346,9 @@ function getWordArray(word, key) {
     }
     else {
       var number1 = word.indexOf(key);
-      var number2 = number1+key.length;
+      var number2 = number1 + key.length;
       result.push({ css: "", name: word.substr(0, number1) });
-      result.push({ css: "highlight", name: key});
+      result.push({ css: "highlight", name: key });
       result.push({ css: "", name: word.substr(number2) });
     }
 
@@ -360,18 +360,18 @@ function getWordArray(word, key) {
 //console.log(sortArrayByStringLength(arrTemp));
 
 //排序数组根据字符串长度
-function sortArrayByStringLength(arr){
-  var result=[],temp=[];
-  for(var i=0;i<30;i++){
+function sortArrayByStringLength(arr) {
+  var result = [], temp = [];
+  for (var i = 0; i < 30; i++) {
     temp.push([]);
   }
   for (var i = 0; i < arr.length; i++) {
-    var item=arr[i];
+    var item = arr[i];
     temp[item.length].push(item);
   }
   for (var i = 0; i < temp.length; i++) {
     temp[i].sort();
-    for (var j = 0; j < temp[i].length;j++){
+    for (var j = 0; j < temp[i].length; j++) {
       result.push(temp[i][j]);
     }
   }
@@ -388,6 +388,11 @@ function ReplaceAllString(str, replaceStrFrom, replaceStrTo) {//替换
     return str;
 }
 
+function isChinese(temp) {
+  var reg = /^[\u4e00-\u9fa5]|[\uFE30-\uFFA0]+$/;   /*定义验证表达式*/
+    return reg.test(temp);     /*进行验证*/
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -409,5 +414,6 @@ module.exports = {
   getTimeFormat: getTimeFormat,
   getWordArray: getWordArray,
   sortArrayByStringLength: sortArrayByStringLength,
-  ReplaceAllString: ReplaceAllString
+  ReplaceAllString: ReplaceAllString,
+  IsChinese: isChinese
 }