1.0.4

app.js

@@ -1,8 +1,8 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.3",
-    //IsProduction: true,
+    Version: "1.0.4",
+    IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",
     ShareImage: '../images/pic_07.png',

app.wxss

@@ -27,3 +27,32 @@
   background-color: #004433;
 } 
 
+
+.panelRemindParent{
+  background-color: rgba(26,67,51,0.10);
+  z-index: 20;
+  position: fixed;
+  bottom:0;
+}
+
+/* 弹窗上滑动画 */
+@keyframes slideUp {
+  from { transform: translateY(100%); }
+  to { transform: translateY(0); }
+}
+
+/* 弹窗下滑动画 */
+@keyframes slideDown {
+  from { transform: translateY(0); }
+  to { transform: translateY(100%); }
+}
+
+/* 上滑动画类 */
+.remind-slide-up {
+  animation: slideUp 0.3s ease-out forwards;
+}
+
+/* 下滑动画类 */
+.remind-slide-down {
+  animation: slideDown 0.3s ease-out forwards;
+}

pages/main/article.js

@@ -1,5 +1,7 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import animation from '../../utils/animation';
+
 const Theme=[{
     "Name":"DarkColor",
     "backgroundColor": "#004433",
@@ -137,64 +139,86 @@ Page({
   updateData:function(content){
     let that=this;
     //console.log(content);
+    
     if (typeof content === 'string') {
       content = JSON.parse(content);
     }
     if (typeof content === 'string') {
       content = JSON.parse(content);
     }
-    let hl="nonelight";
-    if (that.data.IsShowKeyword)
-      hl="highlight";
+    let hl = that.data.IsShowKeyword ? "highlight" : "nonelight";
     
-    // 简化的解决方案：按长度排序并使用临时标记
-    for(let i=0;i<content.ArticleEnglish.length;i++){
-      // 1. 先对单词按长度从长到短排序，确保先处理"Come on"再处理"Come"
-      let sortedWords = [...content.FormsOfWords].sort((a, b) => b.length - a.length);
+    // 初始化ArticleEnglishArr数组
+    content.ArticleEnglishArr = [];
+    
+    for(let i=0; i<content.ArticleEnglish.length; i++){
+      // 确保每个句子末尾有空格，避免和下一句紧挨着
+      const sentence = content.ArticleEnglish[i] + " ";
+      // 按长度从长到短排序单词，确保先匹配较长的词组
+      const sortedWords = [...content.FormsOfWords].sort((a, b) => b.length - a.length);
       
-      // 2. 使用临时标记替换匹配的单词，避免HTML解析问题
-      let text = content.ArticleEnglish[i];
-      let placeholders = [];
-      for(let j=0;j<sortedWords.length;j++){
-        let word = sortedWords[j];
-        let regex = new RegExp(`\\b${word}\\b[.,!?;:]?`, 'gi');
+      // 创建一个句子的分段数组
+      let segments = [{
+        Sentence: sentence,
+        CSS: ""
+      }];
+      
+      // 对每个单词进行处理
+      for(let j=0; j<sortedWords.length; j++){
+        const word = sortedWords[j];
+        // 创建一个新的分段数组，用于存储处理后的结果
+        let newSegments = [];
         
-        text = text.replace(regex, match => {
-          let punctuation = match.match(/[.,!?;:]$/);
-          let punc = punctuation ? punctuation[0] : '';
-          let wordPart = match.replace(/[.,!?;:]$/, '');
+        // 处理每个现有分段
+        for(let k=0; k<segments.length; k++){
+          const segment = segments[k];
           
-          // 使用唯一的占位符
-          let placeholder = `__PLACEHOLDER_${placeholders.length}__`;
-          placeholders.push(`<span class='${hl}'>${wordPart}</span>${punc}`);
-          return placeholder;
-        });
-      }
-      
-      // 3. 将临时标记替换为实际的HTML标签
-      for(let j=0; j<placeholders.length; j++){
-        text = text.replace(`__PLACEHOLDER_${j}__`, placeholders[j]);
-      }
-      
-      content.ArticleEnglish[i] = text;
-    }
-    content.ArticleEnglishArr=[];
-    for(let i=0;i<content.ArticleEnglish.length;i++){
-      let obj=common.splitByMultipleDelimiters(content.ArticleEnglish[i],["<span class='"+hl+"'>","</span>"]);
-      obj=common.removeDuplicateAndTrimStrings(obj);
-      //debugger;
-      let arr=[];
-      for(let j=0;j<obj.length;j++){
-        let objChild={};
-        objChild.Content=obj[j]+" ";
-        objChild.CSS="";
-        if (j%2==1){
-          objChild.CSS=hl;
-          objChild.Content=" "+objChild.Content;
+          // 如果当前分段已经被标记为高亮，则不再处理
+          if(segment.CSS !== ""){
+            newSegments.push(segment);
+            continue;
+          }
+          
+          const text = segment.Sentence;
+          // 使用正则表达式查找单词边界
+          const regex = new RegExp(`\\b${word}\\b`, 'gi');
+          let lastIndex = 0;
+          let match;
+          
+          // 查找所有匹配项
+          while((match = regex.exec(text)) !== null){
+            // 添加匹配前的文本
+            if(match.index > lastIndex){
+              newSegments.push({
+                Sentence: text.substring(lastIndex, match.index),
+                CSS: ""
+              });
+            }
+            
+            // 添加匹配的单词（高亮）
+            newSegments.push({
+              Sentence: match[0],
+              CSS: hl
+            });
+            
+            lastIndex = match.index + match[0].length;
+          }
+          
+          // 添加最后一个匹配后的文本
+          if(lastIndex < text.length){
+            newSegments.push({
+              Sentence: text.substring(lastIndex),
+              CSS: ""
+            });
+          }
         }
-        arr.push(objChild);
+        
+        // 更新分段数组
+        segments = newSegments;
       }
-      content.ArticleEnglishArr.push(arr);
+      
+      // 将分段数组添加到ArticleEnglishArr
+      content.ArticleEnglishArr.push(segments);
     }
 
     for(let i=0;i<content.Question.length;i++){
@@ -415,9 +439,6 @@ Page({
       //console.log("选中的句子索引:", selectedIndex);
       //console.log("选中的句子:", that.data.Content.ArticleEnglish[selectedIndex]);
       engSentence=that.data.Content.ArticleEnglish[selectedIndex];
-      engSentence=common.ReplaceAllString(engSentence,"<span class='highlight'>","");
-      engSentence=common.ReplaceAllString(engSentence,"<span class='nonelight'>","");
-      engSentence=common.ReplaceAllString(engSentence,"</span>","");
       chnSentence=that.data.Content.ArticleChinese[selectedIndex];
     }
     else if (strType=="question"){
@@ -431,31 +452,16 @@ Page({
     this.setData({
       EnglishSentence:engSentence,
       ChineseSentence:chnSentence,
-      remindAnimation: "remind-slide-up", // 添加上滑动画
-      IsShowRemind:true,
+    });
+    // 使用动画工具函数显示弹窗，并指定显示动画
+    animation.toggleRemindWithAnimation(this, {
+      showAnimation: 'remind-slide-up'
     });
   },
   showRemind:function(e){
-    let that = this;
-    if (that.data.IsShowRemind) {
-      // 如果当前是显示状态，先播放下滑动画，然后再隐藏
-      that.setData({
-        remindAnimation: "remind-slide-down" // 添加下滑动画
-      });
-      
-      // 等待动画完成后再隐藏弹窗
-      setTimeout(function() {
-        that.setData({
-          IsShowRemind: false
-        });
-      }, 300); // 动画持续时间为0.3秒
-    } else {
-      // 如果当前是隐藏状态，直接显示并播放上滑动画
-      that.setData({
-        IsShowRemind: true,
-        remindAnimation: "remind-slide-up"
-      });
-    }
+    animation.toggleRemindWithAnimation(this, {
+      showAnimation: 'remind-slide-down'
+    });
   },
   onShareAppMessage: function () {
     return {

pages/main/article.wxml

@@ -13,14 +13,14 @@
     <!-- 完整文章 -->
     <text class="textArticle" wx:if="{{!IsShowTranslate}}" >
       <text bindlongpress="onLongPress" data-strtype="article" data-index="{{index}}" wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" >
-        <text  class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Content}}</text>
+        <text class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Sentence}}</text>
       </text>
     </text>
     <!-- 有翻译文章 -->
     <view class="textArticle FlexColumn" wx:if="{{IsShowTranslate}}">
       <view wx:for="{{Content.ArticleEnglishArr}}" wx:key="index" class="textArticle">
         <!-- <rich-text class="textArticle" nodes="{{item}}"></rich-text> -->
-        <text  class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Content}}</text>
+        <text  class="{{itemChild.CSS}}" wx:for="{{item}}" wx:key="index2" wx:for-item="itemChild" wx:for-index="indexChild">{{itemChild.Sentence}}</text>
         <view class="textArticleTranslate">{{Content.ArticleChinese[index]}}</view>
         <view class="panelLine" wx:if="{{index<Content.ArticleEnglish.length-1}}"></view>
       </view>
@@ -111,8 +111,8 @@
 </view>
 
 <!-- 翻译 -->
-<view wx:if="{{IsShowRemind}}" class="panelRemindParent container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <view class="panelRemind FlexColumn {{remindAnimation}}">
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelRemind FlexColumn">
     <image src="../images/sysIcon_b17.png" class="sysIcon_b10"></image>
       
     <view class="panelRemind1 FlexRow">

pages/main/article.wxss

@@ -561,43 +561,6 @@
 }
 
 /* 翻译 */
-.panelRemindParent{
-  background-color: rgba(26,67,51,0.10);
-  z-index: 20;
-  position: fixed;
-  top:0;
-}
-
-/* 翻译弹窗动画 */
-@keyframes slideUp {
-  from {
-    transform: translateY(100%);
-    opacity: 0;
-  }
-  to {
-    transform: translateY(0);
-    opacity: 1;
-  }
-}
-
-@keyframes slideDown {
-  from {
-    transform: translateY(0);
-    opacity: 1;
-  }
-  to {
-    transform: translateY(100%);
-    opacity: 0;
-  }
-}
-
-.remind-slide-up {
-  animation: slideUp 0.3s ease-out forwards;
-}
-
-.remind-slide-down {
-  animation: slideDown 0.3s ease-out forwards;
-}
 
 .panelRemind{
   width: 690rpx;

pages/main/index.js

@@ -1,11 +1,13 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import animation from '../../utils/animation';
 
 const app = getApp();
 
 Page({
   data: {
     IsShowRemind:false,
+    remindAnimation: "",
   },
   onLoad: function (options) {
     let that = this;
@@ -23,15 +25,18 @@ Page({
     var url=e.currentTarget.dataset.url;
     if (url=="wordsinput"){
       if (that.data.TodayCount>that.data.MaxCount){
-        this.setData({
-          IsShowRemind:true,
-        });
+        animation.toggleRemindWithAnimation(that);
         return ;
       }
     }
+    
     wx.navigateTo({
       url: url,
     });
+    that.setData({
+      IsShowRemind:false,
+    })
+    
   },
   getData:function(){
     let that=this;
@@ -40,15 +45,12 @@ Page({
         that.setData({
           TodayCount:data.TodayCount,
           MaxCount:data.MaxCount,
-          IsShowRemind:false,
         });
       }
     });
   },
   showRemind:function(){
-    this.setData({
-      IsShowRemind:!this.data.IsShowRemind,
-    });
+    animation.toggleRemindWithAnimation(this);
   },
   onShareAppMessage: function () {
     return {

pages/main/index.wxml

@@ -31,7 +31,7 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowRemind}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelRemind FlexColumn">
     <image src="../images/sysIcon_b10.png" class="sysIcon_b10"></image>
       

pages/main/myarticles.js

@@ -1,5 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import animation from '../../utils/animation';
 
 const app = getApp();
 
@@ -47,17 +48,15 @@ Page({
     })
   },
   deleteArticle:function(e){
+    animation.toggleRemindWithAnimation(this);
     this.setData({
-      IsShowRemind:true,
       ID:e.currentTarget.dataset.id
     });
   },
   showRemind:function(e){
     let that=this;
     const confirm=e.currentTarget.dataset.confirm;
-    this.setData({
-      IsShowRemind:!this.data.IsShowRemind,
-    });
+    animation.toggleRemindWithAnimation(this);
     if (confirm=="1") {
       main.getData('DeleteYJBDCArticleList?UserID=' + app.globalData.userInfo.UserID+"&ID="+that.data.ID, function (data) {
          wx.showToast({

pages/main/myarticles.wxml

@@ -34,7 +34,7 @@
 </view>
 
 
-<view wx:if="{{IsShowRemind}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelRemind FlexColumn">
     <image src="../images/sysIcon_b13.png" class="sysIcon_b10"></image>
       

pages/main/ocr.js

@@ -110,7 +110,7 @@ Page({
       // 3. 调用云函数（添加超时处理）
       let postData={ ImageBase64: `data:image/jpeg;base64,${fileRes.data}` };
       
-      let url = common.Encrypt("OCRImageData");
+      let url = common.Encrypt("OCRImageData?UserID="+app.globalData.userInfo.UserID);
       url=app.globalData.serverUrl+url;
       //console.log("url:"+url);
       const cloudRes = await new Promise((resolve, reject) => {

pages/main/wordsinput.js

@@ -1,5 +1,6 @@
 import common from '../../utils/util';
 import main from '../../utils/main';
+import animation from '../../utils/animation';
 
 const app = getApp();
 let isFocus=true;
@@ -304,9 +305,7 @@ Page({
     }
   },
   showRemind:function(e){
-    this.setData({
-      IsShowRemind:!this.data.IsShowRemind,
-    });
+    animation.toggleRemindWithAnimation(this);
   },
   // 阻止示例面板的触摸事件传递到底层
   catchTouchMove: function(e) {

pages/main/wordsinput.wxml

@@ -97,7 +97,7 @@
   </view>
 </view>
 
-<view wx:if="{{IsShowRemind}}" class="panelMenu container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view wx:if="{{IsShowRemind}}" class="panelRemindParent {{remindAnimation}} container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelRemind FlexColumn">
     <image src="../images/sysIcon_b10.png" class="sysIcon_b10"></image>
       

utils/animation.js

@@ -0,0 +1,33 @@
+function toggleRemindWithAnimation(page, {
+  remindKey = 'IsShowRemind',
+  animationKey = 'remindAnimation',
+  duration = 300,
+  showAnimation = 'remind-slide-up',
+  hideAnimation = 'remind-slide-down'
+} = {}) {
+  // 获取当前显示状态
+  const isCurrentlyShown = page.data[remindKey];
+  if (isCurrentlyShown) {
+    // 如果当前是显示状态，先播放隐藏动画，然后再隐藏
+    const animationData = {};
+    animationData[animationKey] = hideAnimation;
+    page.setData(animationData);
+    
+    // 等待动画完成后再隐藏弹窗
+    setTimeout(function() {
+      const hideData = {};
+      hideData[remindKey] = false;
+      page.setData(hideData);
+    }, duration);
+  } else {
+    // 如果当前是隐藏状态，直接显示并播放显示动画
+    const showData = {};
+    showData[remindKey] = true;
+    showData[animationKey] = showAnimation;
+    page.setData(showData);
+  }
+}
+
+module.exports = {
+  toggleRemindWithAnimation:toggleRemindWithAnimation,
+}