1.5.24

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "1.5.19",
+    Version: "1.5.24",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
@@ -13,7 +13,6 @@ App({
     serverUrlLocalhost: "http://localhost:3020/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=5&le=auto&audio=",
-    pinyinUrl: "https://pinyin.kylx365.com/sounds/[pinyin].m4a",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
     BaiduToken: "",//百度开发平台token
     IsIOS: true,

pages/main/add.wxss

@@ -187,6 +187,10 @@
   height:20rpx;
 }
 
+.panelItem .textLine {
+  text-decoration: underline;
+}
+
 .panelItem .textHighlighter {
   color:#fff;
   background-color: #1E1E1E;

pages/main/searchCardList.js

@@ -108,21 +108,6 @@ Page({
       }
     }
 
-    // if (that.data.IsToday==1){
-    //   var tempList=[];
-    //   for (var i = 0; i < list.length; i++) {
-    //     var item = list[i];
-    //     var limitTimeStr = common.formatDateCHS(item.LimitTime);
-    //     var today = common.formatDateCHS(common.formatTime(new Date()));
-    //     if (limitTimeStr <= today) {
-    //       tempList.push(list[i]);
-    //     }
-    //   }
-    //   list=tempList;
-    //   app.globalData.CardList=list;
-    // }
-
-
     if (!that.data.IsCollect && !that.data.IsToday && !that.data.Search) {
       main.getData("GetUserCardCount?UserID=" + app.globalData.userInfo.UserID, function (data) {
         if (data) {
@@ -180,30 +165,35 @@ Page({
     }
 
     function replaceString(str) {
-      str = str.replace(/\[读]/g, "");
-      str = str.replace(/\[\/读\]/g, "");
-      str = str.replace(/\[图]/g, "");
-      str = str.replace(/\[\/图\]/g, "");
+      //str = str.replace(/\[读]/g, "");
+      //str = str.replace(/\[\/读\]/g, "");
+      //str = str.replace(/\[图]/g, "");
+      //str = str.replace(/\[\/图\]/g, "");
 
       var str2 = "";
       if (str.indexOf("[读") >= 0) {
         str2 = str.substr(str.indexOf("[读"));
-        str2 = str2.substring(0, str2.indexOf("]") + 1);
+        str2 = str2.substring(0, str2.indexOf("/读]") + 3);
       }
       str = str.replace(str2, "");
+
       if (str.indexOf("[读") >= 0) {
         str2 = str.substr(str.indexOf("[读"));
-        str2 = str2.substring(0, str2.indexOf("]") + 1);
+        str2 = str2.substring(0, str2.indexOf("/读]") + 3);
       }
       str = str.replace(str2, "");
 
       var str3 = "";
       if (str.indexOf("[图") >= 0) {
         str3 = str.substr(str.indexOf("[图"));
-        str3 = str3.substring(0, str3.indexOf("]") + 1);
+        str3 = str3.substring(0, str3.indexOf("/图]") + 3);
+      }
+      str = str.replace(str3, "");
+      if (str.indexOf("[图") >= 0) {
+        str3 = str.substr(str.indexOf("[图"));
+        str3 = str3.substring(0, str3.indexOf("/图]") + 3);
       }
       str = str.replace(str3, "");
-
 
       str = str.replace(/\[线]/g, "");
       str = str.replace(/\[\/线\]/g, "");

pages/main/searchWeb2.js

@@ -37,6 +37,20 @@ Page({
       }
     }
 
+    if (data.ENG && data.ENG.ExamplesSentences){
+      for (var i = 0; i < data.ENG.ExamplesSentences.length; i++) {
+        var item = data.ENG.ExamplesSentences[i];
+        var obj=[{ContentType:0,Content:""},{ContentType:1,Content:item[0]},{ContentType:2,Content:""},{ContentType:3,Content:""}];
+        var obj2=main.changeStringToView(obj);
+        var str=obj2.Field[1][0].Content;
+        item.push(str);
+        
+        
+        item[1]=common.ReplaceAllString(item[1],"<b>","");
+        item[1]=common.ReplaceAllString(item[1],"</b>","");
+      }
+    }
+
     that.setData({
       Result: data,
     })
@@ -194,9 +208,11 @@ Page({
                 str = "\n\n" + str;
               }
             }
-              
+
             list[i].Content[item.Number].Content += str;
 
+            if (list[i].Content[item.Number].Content.indexOf("\n\n")==0)
+              list[i].Content[item.Number].Content=list[i].Content[item.Number].Content.substr(2);
           }
           break;
         }

pages/main/searchWeb2.wxml

@@ -353,6 +353,36 @@
     <view class='lineFooter'></view>
   </block>
 
+  <!-- 例句 -->
+  <block wx:if="{{Result.ENG.ExamplesSentences && Result.ENG.ExamplesSentences.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">例句</view>
+    </view>
+    <view class="panelItem FlexRow">
+      <block wx:if="{{Result.ENG.ExamplesSentences && Result.ENG.ExamplesSentences.length>0}}" wx:for="{{Result.ENG.ExamplesSentences}}" wx:key="*this">
+        <view class="panelItemFrame2 FlexRow">
+          <view class="text3">第{{index+1}}句</view>
+        </view>
+        <view class="{{CSS['ENG_ExamplesSentences_'+index+'_0'].Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{item[0]}}" data-css="ENG_ExamplesSentences_{{index}}_0">
+          <view class="{{CSS['ENG_ExamplesSentences_'+index+'_0'].Css2}} panelSelect0">{{CSS['ENG_ExamplesSentences_'+index+'_0'].Number}}</view>
+          <view class="text1">
+            <block wx:for="{{item[2]}}" wx:key="contentIndex" wx:for-item="contentItem">
+              <text wx:if="{{contentItem.key=='normal'}}">{{contentItem.value}}</text>
+              <text class="textLine" wx:if="{{contentItem.key=='line'}}">{{contentItem.value}}</text>
+            </block>
+          </view>
+        </view>        
+        <view class="{{CSS['ENG_ExamplesSentences_'+index+'_1'].Css1}} panelItemFrame FlexRow" bindtap='getInputData' data-type="normal" data-content="{{item[1]}}" data-css="ENG_ExamplesSentences_{{index}}_1">
+          <view class="{{CSS['ENG_ExamplesSentences_'+index+'_1'].Css2}} panelSelect0">{{CSS['ENG_ExamplesSentences_'+index+'_1'].Number}}</view>
+          <view class="text1">
+            {{item[1]}}
+          </view>
+        </view>
+      </block>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
   <view style='height:150rpx;'></view>
 
   <view class='panelSave' bindtap="addData">添加</view>

pages/main/searchWeb2.wxss

@@ -60,6 +60,15 @@
 .panelItemFrame1 {
   margin: 30rpx 10rpx 0 30rpx;
 }
+.panelItemFrame2 {
+  width: 100%;
+  justify-content: flex-start;
+  margin: 30rpx 0 0 0;
+}
+.text3{
+  font-size:24rpx;
+  margin-left: 30rpx;
+}
 
 .Select1 {
   border:1rpx solid #0071EF;
@@ -190,4 +199,8 @@
 .universalpic_read_mark_black_20x20{
   width:21rpx;
   height:20rpx;
+}
+
+.textLine {
+  text-decoration: underline;
 }

pages/plan/setting.js

@@ -9,7 +9,6 @@ var arrUserID = app.globalData.SelectUserData;
 
 Page({
   data: {
-    CardNumber: [],
     IsShowChange: false,
     RecommendName: "启用",
     ChildUserID: 0,
@@ -36,15 +35,11 @@ Page({
   onLoad: function () {
     var that = this;
 
-    for (var i = 5; i <= 200; i++) {
-      that.data.CardNumber.push(i);
-    }
     var taskNumber = app.globalData.TaskToday.ListNew.length + app.globalData.TaskToday.ListReview.length + app.globalData.TaskToday.ListHistory.length;
     var cardEveryTime = 1 + Math.round(app.globalData.TaskToday.CardEveryTime / 60 * taskNumber);
     
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      CardNumber: that.data.CardNumber,
       MinSecond: 10,
       TimeSecond: 60,
       TaskNumber: taskNumber,

pages/plan/taskLimit.js

@@ -5,18 +5,23 @@ const app = getApp();
 
 Page({
   data: {
-    CardNumber: [],
+    CardNumberNew: [],
+    CardNumberOld: [],
   },
   onLoad: function (options) {
     var that = this;
 
     for (var i = 5; i <= 200; i++) {
-      that.data.CardNumber.push(i);
+      that.data.CardNumberNew.push(i);
+    }
+    for (var i = 5; i <= 500; i++) {
+      that.data.CardNumberOld.push(i);
     }
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      CardNumber: that.data.CardNumber,
+      CardNumberNew: that.data.CardNumberNew,
+      CardNumberOld: that.data.CardNumberOld,
     });
 
     that.init();
@@ -38,18 +43,18 @@ Page({
     this.data.CardMaxNumberNewIndex = e.detail.value;
     this.setData({
       CardMaxNumberNewIndex: this.data.CardMaxNumberNewIndex,
-      CardMaxNumberNew: this.data.CardNumber[this.data.CardMaxNumberNewIndex],
+      CardMaxNumberNew: this.data.CardNumberNew[this.data.CardMaxNumberNewIndex],
     });
-    wx.setStorageSync("CardMaxNumberNew", this.data.CardNumber[this.data.CardMaxNumberNewIndex]);
+    wx.setStorageSync("CardMaxNumberNew", this.data.CardNumberNew[this.data.CardMaxNumberNewIndex]);
     main.UploadUserConfig();
   },
   bindUpdateCardNumberHistoryMax: function (e) {
     this.data.CardMaxNumberHistoryIndex = e.detail.value;
     this.setData({
       CardMaxNumberHistoryIndex: this.data.CardMaxNumberHistoryIndex,
-      CardMaxNumberHistory: this.data.CardNumber[this.data.CardMaxNumberHistoryIndex],
+      CardMaxNumberHistory: this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex],
     });
-    wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumber[this.data.CardMaxNumberHistoryIndex]);
+    wx.setStorageSync("CardMaxNumberHistory", this.data.CardNumberOld[this.data.CardMaxNumberHistoryIndex]);
     main.UploadUserConfig();
   },
   

pages/plan/taskLimit.wxml

@@ -18,7 +18,7 @@
   <view class="panelItem FlexRow">
     <view class="panelItem1">新题卡数量上限</view>
     <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumber}}">
+      <picker bindchange="bindUpdateCardNumberNewMax" value="{{CardMaxNumberNewIndex}}" range="{{CardNumberNew}}">
         <view class="picker">
           {{CardMaxNumberNew}}张
         </view>
@@ -32,7 +32,7 @@
   <view class="panelItem FlexRow">
     <view class="panelItem1">旧题卡数量上限</view>
     <view class="panelItem2 FlexRow">
-      <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumber}}">
+      <picker bindchange="bindUpdateCardNumberHistoryMax" value="{{CardMaxNumberHistoryIndex}}" range="{{CardNumberOld}}">
         <view class="picker">
           {{CardMaxNumberHistory}}张
         </view>

pages/template/cardShow.wxml

@@ -58,15 +58,14 @@
     <view class="editFieldNull2"></view>
     <view id="ViewField{{itemParent}}" class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}" style='background-color:{{Color.BackColor2}};'>
       <view class="panelField21 panelItem FlexRow" style='color:{{Color.FieldColor}};'>
-        <!-- <image class="universalpic_starting_tc01_26x26" src='../images/universalpic_starting_tc0{{Color.ID}}_26x26.png' /> -->
         <text class='textDot' wx:if="{{Field[itemParent][0].Type!='normal' && Field[itemParent][0].Type!='line'}}" style='color:{{Color.LineColor}};'>●</text>
         <block wx:for="{{Field[itemParent]}}" wx:key="index">
-          <text class="textReturn" wx:if="{{index>0 && item.Type=='return'}}"></text>
-          <view class="textBr" wx:if="{{index>0 && item.Type=='br'}}"></view>
+          <text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
+          <view class="textBr" wx:if="{{item.Type=='br'}}"></view>
 
           <text class="textNormal2 textNormal" selectable="true" space='ensp' wx:if="{{item.Type=='normal'}}">
               <text class='textDot' wx:if="{{index==0}}" style='color:{{Color.LineColor}};'>●</text>
-          <text>{{item.Content}}</text>
+              <text>{{item.Content}}</text>
           </text>
 
           <text class="textNormal2 FlexRow" selectable="true" space='ensp' wx:if="{{item.Type=='line'}}">

pages/test/index.js

@@ -153,16 +153,15 @@ Page({
             Finish: 0,
             Total: 16,
             Image: "../images/examine_subject_a009.png"
+          }, {
+            ID: 10,
+            Type: "Shizi",
+            Name: "语文识字",
+            Name2: "下学期",
+            Finish: 0,
+            Total: 16,
+            Image: "../images/examine_subject_a010.png"
           }, 
-          // {
-          //   ID: 10,
-          //   Type: "Shizi",
-          //   Name: "语文识字",
-          //   Name2: "下学期",
-          //   Finish: 0,
-          //   Total: 16,
-          //   Image: "../images/examine_subject_a010.png"
-          // }, 
         ]
         },
         {

utils/cryptojs.js

@@ -1,7 +1,18 @@
 var Crypto = exports.Crypto = require('./lib/Crypto').Crypto;
 
-[ 'BlockModes'
-, 'AES'
-].forEach( function (path) {
+['BlockModes', 'AES'].forEach(function (path) {
 	require('./lib/' + path);
 });
+
+
+var obj = {
+	"CHN": {
+		"HanZi": "还自广陵",
+		"Author": "秦观",
+		"Dynasty": "[宋]",
+		"PeomContent": ["天寒水鸟自相依，十百为群戏落晖。 过尽行人都不起，忽闻水响一齐飞。"],
+		"PeomContentIsLong": false,
+		"Translation": ["大冷天里，水鸟为了暖和挤在一起，十几只几百只一起，在快要落山的太阳光下游戏。路上的人走来走去，它们都不躲开，忽然听到水里哗啦一声响，它们吓一跳，“轰”的一下一齐飞了起来。"],
+		"ShiciTitle": "《还自广陵》"
+	}
+}

utils/main.js

@@ -236,7 +236,7 @@ function changeViewToString(content) {
     str = ""
   else {
     str = str.replace(/\n\n\n/g, "\n\n");
-    if (str.indexOf("\n") == 0) {
+    if (str.indexOf("\n") == 0 && str.indexOf("[")==1) {
       str = str.substr(1);
     }
     if (str.lastIndexOf("\n") == str.length - 1) {
@@ -303,10 +303,12 @@ function changeStringToView(field) {
         var str = field[j].Content.toString();
 
         str = DecryptUrl(str);
-
-        str = str.replace(/\[读/g, "\n[读");
+        
+        if (str.indexOf("[读")>0)
+          str = str.replace(/\[读/g, "\n[读");
         str = str.replace(/\[图/g, "\n[图");
-        str = str.replace(/\[音/g, "\n[音");
+        if (str.indexOf("[音")>0)
+          str = str.replace(/\[音/g, "\n[音");
         str = str.replace(/\[\/读\]/g, "[\/读]\n");
         str = str.replace(/\[\/图\]/g, "[\/图]\n");
         str = str.replace(/\[\/音\]/g, "[\/音]\n");
@@ -485,12 +487,13 @@ function changeStringToView(field) {
         }
 
         //去掉前回车换行
-        while (arrResult[0].Type == "return" ||
-          arrResult[0].Type == "br") {
-          arrResult.shift();
-          if (arrResult.length == 0)
-            break;
-        }
+        // while (arrResult[0].Type == "return" ||
+        //   arrResult[0].Type == "br") {
+        //   arrResult.shift();
+        //   if (arrResult.length == 0)
+        //     break;
+        // }
+
         //去掉后回车换行
         for (var i = arrResult.length - 1; i >= 0; i--) {
           if (arrResult[i].Type == "return" ||
@@ -689,7 +692,8 @@ function updateSearchList(obj) {
     arr = [];
 
   if (obj.Type == "shici") {
-    obj.Key=obj.Value.CHN.ShiciTitle;
+    if (obj.Value.CHN.ShiciTitle)
+      obj.Key=obj.Value.CHN.ShiciTitle;
     if (obj.Key.indexOf("《") == 0)
       obj.Key = obj.Key.substring(1, obj.Key.length - 1);
   }
@@ -1028,23 +1032,6 @@ function getShareImageBackColor() {
   return arr[common.random(0, arr.length - 1)];
 }
 
-function getPinyin(pinyin) {
-  var result = [];
-  var arr = constant.arrPinyin;
-  var pinyinArray = pinyin.split(" ");
-  for (var j = 0; j < pinyinArray.length; j++) {
-    for (var i = 0; i < arr.length; i++) {
-      if (arr[i][1] == pinyinArray[j]) {
-        var url = app.globalData.pinyinUrl;
-        url = url.replace("[pinyin]", arr[i][0]);
-        result.push(url);
-        break;
-      }
-    }
-  }
-  return result.join(",");
-}
-
 function getPinyinNormal(pinyin) {
   var result = "";
   var arr = constant.arrPinyin;
@@ -1101,7 +1088,6 @@ module.exports = {
   changeViewToString: changeViewToString,
   encryptUrl: EncryptUrl,
   decryptUrl: DecryptUrl,
-  getPinyin: getPinyin,
   saveTempImage: saveTempImage,
   getTempImage: getTempImage,
   getTaskTodayList: getTaskTodayList,