1.0.1.4

pages/index/accredit.js

@@ -107,6 +107,10 @@ Page({
     wx.showLoading({
       title: '数据初始化',
     });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+    
     main.getData('BuildInitData?UserID=' + app.globalData.userInfo.UserID, function (data) {
       wx.hideLoading();
       if (data) {

pages/index/index.js

@@ -212,7 +212,7 @@ Page({
               });
             }, 2000);
 
-            main.UpdateMiaoguoCardTodayAll(function () {
+            main.UpdateMiaoguoCardTodayAll(false,function () {
               that.getTaskTodayList();
             });
           }

pages/main/add.js

@@ -6,7 +6,7 @@ var field = [[], [], [], []];
 var arrTag = [];
 
 var tempCursor = 0,
-  btnName = "";
+  btnName = ""; 
 var arrSoundMark = [];
 var isUnload = true;
 var isEdit = true;
@@ -103,6 +103,7 @@ Page({
       app.globalData.CardList=list;
       wx.removeStorageSync("TempCardInfo");
     }
+    wx.removeStorageSync("TempCardInfoAddItem");
   },
   onClose: function () {
     wx.navigateBack({
@@ -120,6 +121,7 @@ Page({
         break;
       }
     }
+    wx.setStorageSync("TempCardInfoAddItem", content);
     that.setData({
       HiddenFieldEdit: false,
       Focus: true,
@@ -196,7 +198,7 @@ Page({
             var item = that.data.Field[i][key];
             var str = "";
             if (item.Type == "image") {
-              str = "[图]" + item.Content + "[/图]";
+              str = "[图 w='"+item.Width+"' h='"+item.Height+"']" + item.Content + "[/图]";
             }
             else if (item.Type == "line") {
               for (var j = 0; j < item.Content.length; j++) {
@@ -416,6 +418,9 @@ Page({
       wx.showLoading({
         title: '请稍候',
       });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 5000);
       var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID;
       main.getData(url, function (data) {
         wx.hideLoading();
@@ -444,7 +449,6 @@ Page({
     this.setData({
       FieldContent: e.detail.value,
     });
-    //this.updateField();
 
   },
   //加符号
@@ -577,9 +581,16 @@ Page({
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
       isUnload = false;
-      wx.removeStorageSync("TempCardInfoAddItem");
       this.updateField();
     }
+    else if (isSave == "false") {
+      var content = wx.getStorageSync("TempCardInfoAddItem");
+      this.setData({
+        FieldContent:content,
+      })
+      this.updateField();
+    }
+    
     this.setData({
       HiddenFieldEdit:true,
     });
@@ -593,17 +604,13 @@ Page({
     });
   },
 
-  updateField: function (history) {
+  updateField: function () {
     var str = this.data.FieldContent;
     var list = app.globalData.CardList;
     var card={};
     for (var i = 0; i < list.length; i++) {
       if (this.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        if (history != undefined)
-          list[i].Content[this.data.FieldNumber].Content = history;
-        else
-          list[i].Content[this.data.FieldNumber].Content = str;
-        
+        list[i].Content[this.data.FieldNumber].Content = str;
         card = main.changeStringToView(list[i].Content);
         break;
       }
@@ -630,26 +637,34 @@ Page({
         //console.log(tempFilePaths[0]);
         //that.data.FieldContent = that.data.FieldContent + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
 
-        if (tempCursor == undefined)
-          tempCursor = that.data.FieldContent.length;
-        var str1 = "",
-          str2 = "";
-        if (that.data.FieldContent.length > 0) {
-          str1 = that.data.FieldContent.substr(0, tempCursor);
-          str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
-        }
+        wx.getImageInfo({
+          src: res.tempFilePaths[0],
+          success(res) {
+            console.log(res.width)
+            console.log(res.height)
+            if (tempCursor == undefined)
+              tempCursor = that.data.FieldContent.length;
+            var str1 = "",
+              str2 = "";
+            if (that.data.FieldContent.length > 0) {
+              str1 = that.data.FieldContent.substr(0, tempCursor);
+              str2 = that.data.FieldContent.substring(tempCursor, that.data.FieldContent.length);
+            }
 
-        var str0 = "[图]" + tempFilePaths[0] + "[/图]";
+            var str0 = "[图 w='"+res.width+"' h='"+res.height+"']" + tempFilePaths[0]+ "[/图]";
 
-        that.data.FieldContent = str1 + str0 + str2;
+            that.data.FieldContent = str1 + str0 + str2;
 
-        //console.log("uploadImageEnd:" + that.data.FieldContent);
+            //console.log("uploadImageEnd:" + that.data.FieldContent);
 
-        that.setData({
-          FieldContent: that.data.FieldContent,
-          Focus: false,
+            that.setData({
+              FieldContent: that.data.FieldContent,
+              Focus: false,
+            });
+            that.updateField();
+
+          }
         });
-        that.updateField();
       },
       fail: function () {
 

pages/main/add.wxss

@@ -130,10 +130,6 @@
   text-decoration: underline;
   margin-right: 10rpx;
 }
-.panelItem .imageBishun {
-  width:100rpx;
-  height:100rpx;
-}
 .panelItem .imageFree{
   width:100rpx;
 }

pages/main/detail.js

@@ -50,6 +50,12 @@ Page({
 
     this.getMemoryLevel();
 
+    if (app.globalData.IsIPad) {
+      that.setData({
+        IsIPad: "_iPad",
+      });
+    }
+
   },
   onShow: function () {
     var that = this;
@@ -86,7 +92,7 @@ Page({
   },
   onUnload: function () {
     clearInterval(intervalSound);
-    main.UpdateMiaoguoCardTodayAll(function(){
+    main.UpdateMiaoguoCardTodayAll(false,function(){
       listTaskFinished = [];
     });
   },
@@ -303,7 +309,7 @@ Page({
     if (listTaskFinished.length > 0) {
       var card = listTaskFinished.pop();
       wx.setStorageSync("ListTaskFinished", listTaskFinished);
-
+      timeStart  =  new  Date();
 
       card.Card.Number0 = card.Number0Old;
       card.Card.Number0Str = card.Number0StrOld;
@@ -343,7 +349,6 @@ Page({
 
       wx.showToast({
         title: '回到上一张',
-        mask: true,
         image: "../images/universalpic_undo_white_120x90.png",
       });
       that.setSoundFile(2);
@@ -413,9 +418,6 @@ Page({
         finishCard.IsReviewOld = TaskList[0].IsReview;
 
         TaskList[0].IsReview = true;
-
-
-
         TaskList.push(TaskList[0]);
       }
       //若是天月年
@@ -451,6 +453,7 @@ Page({
     if (finishCard.btnnumber == 1)
       duration = 0;
     finishCard.Duration = duration;
+    timeStart  =  new  Date();
 
     //添加完成列表，去掉任务列表数据
     listTaskFinished.push(finishCard);
@@ -490,7 +493,7 @@ Page({
         CanUndo: 1,
       });
       that.setSoundFile(1);
-      main.UpdateMiaoguoCardTodayAll(function () {
+      main.UpdateMiaoguoCardTodayAll(true,function () {
         listTaskFinished = [];
         that.getTaskTime();
       });
@@ -677,6 +680,9 @@ Page({
     wx.showLoading({
       title: '生成中',
     });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
     //console.log(app.globalData.userInfo.AvatarUrl);
     var avatarUrl = app.globalData.userInfo.AvatarUrl;
     avatarUrl = avatarUrl.substring(0, avatarUrl.lastIndexOf("/") + 1);

pages/main/detail.wxml

@@ -65,8 +65,10 @@
           </view>
 
           <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
-          <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-
+          
+          <view class="imageContainer FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
+            <image class="imageFree" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+          </view>
         </block>
       </view>
     </view>
@@ -102,8 +104,11 @@
           </view>
 
           <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-          <image class="imageFree2" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-          </block>
+          
+          <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
+            <image class="imageFree2" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+          </view>
+        </block>
         </view>
       </view>
     </view>
@@ -154,7 +159,7 @@
   <!-- 最后一页 -->
   <block wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     <view class='panelLast FlexColumn' style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};'>
-      <view class='text1'>做完了</view>
+      <view class='text1{{IsIPad}}' >做完了</view>
 
       <view class="panelLastTime FlexColumn">
         <view style='color:{{Color.FrontColor1}};'>今日练习总共用时</view>

pages/main/detail.wxss

@@ -223,18 +223,25 @@
   margin-right: 10rpx;
 }
 
-.panelItem .imageBishun {
-  width: 360rpx;
-  height: 360rpx;
+
+.panelItem .imageContainer {
+  width: 650rpx;
   margin: 6rpx 0;
+  border-radius: 20rpx;
+  background-color: rgba(0,0,0,0.1);
 }
 
 .panelItem .imageFree {
   width: 650rpx;
-  margin: 6rpx 0;
   border-radius: 20rpx;
 }
 
+
+.panelItem .imageContainer2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+  background-color: rgba(0,0,0,0.1);
+}
 .panelItem .imageFree2 {
   width: 650rpx;
   border-radius: 10rpx;
@@ -362,11 +369,17 @@
   z-index: 20;
 }
 
+
 .text1 {
   margin: 100rpx 0 60rpx 40rpx;
   font-size: 90rpx;
 }
 
+.text1_iPad {
+  margin: 20rpx 0 60rpx 40rpx;
+  font-size: 90rpx;
+}
+
 .panelLastTime {
   font-size: 28rpx;
   font-weight: 400;

pages/main/preview.js

@@ -255,6 +255,9 @@ Page({
       wx.showLoading({
         title: '处理中',
       });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 5000);
       var that = this;
       var url = "CollectMiaoguoCard?";
       url += "MiaoguoCardID=" + that.data.MiaoguoCardID;

pages/main/preview.wxml

@@ -44,8 +44,10 @@
       </view>
 
       <view class="textPinyin" hover-class='panelSoundHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</view>
-      <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
-
+      
+      <view class="imageContainer FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
+        <image class="imageFree" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+      </view>
       </block>
     </view>
   </view>
@@ -85,7 +87,10 @@
         </view>
 
         <view class="textPinyin" hover-class='panelPinyinHover1' hover-stay-time="1000" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</view>
-        <image class="imageFree2" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+        
+        <view class="imageContainer2 FlexColumn" wx:if="{{item.Type=='image'}}" style='width:{{item.Width}}rpx;height:{{item.Height}}rpx;'>
+          <image class="imageFree2" mode="widthFix" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" data-serverurl="{{item.ContentServer}}" binderror="onBindError" />
+        </view>
         </block>
       </view>
     </view>

pages/main/preview.wxss

@@ -232,18 +232,24 @@
   margin-right: 10rpx;
 }
 
-.panelItem .imageBishun {
-  width: 360rpx;
-  height: 360rpx;
+.panelItem .imageContainer {
+  width: 650rpx;
   margin: 6rpx 0;
+  border-radius: 20rpx;
+  background-color: rgba(0,0,0,0.1);
 }
 
 .panelItem .imageFree {
   width: 650rpx;
-  margin: 6rpx 0;
   border-radius: 20rpx;
 }
 
+
+.panelItem .imageContainer2 {
+  width: 650rpx;
+  border-radius: 10rpx;
+  background-color: rgba(0,0,0,0.1);
+}
 .panelItem .imageFree2 {
   width: 650rpx;
   border-radius: 10rpx;

pages/main/searchCard.js

@@ -39,6 +39,10 @@ Page({
     wx.showLoading({
       title: '请稍候',
     });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+    
     var IsToday=e.currentTarget.dataset.id;
     var that = this;
 

pages/main/searchCardList.js

@@ -90,8 +90,9 @@ Page({
 
     function getImage(str) {
       var result = "";
-      if (str.indexOf("[图]") >= 0) {
+      if (str.indexOf("[图") >= 0) {
         result = str.substring(str.indexOf("[图]") + 3, str.indexOf("[/图]"));
+        result = result.substring(result.indexOf("]") + 1);
       }
       return result;
     }
@@ -158,6 +159,10 @@ Page({
     wx.showLoading({
       title: '请稍候',
     });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+    
     var that = this;
     var id = e.currentTarget.dataset.id;
     var url = 'GetMiaoguoCardList?UserID=' + app.globalData.userInfo.UserID + "&IsToday=" + that.data.IsToday + "&PageID=" + id;

pages/main/searchWeb1.js

@@ -118,6 +118,10 @@ Page({
     wx.showLoading({
       title: '查询中',
     });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 5000);
+    
     var that = this;
 
     var url = 'GetMiaoguoAISearch?UserID=' + app.globalData.userInfo.UserID;

utils/main.js

@@ -339,8 +339,24 @@ function changeStringToView(field) {
           if (arr[k].indexOf("[图") >= 0 && arr[k].indexOf("[/图]") > 0) {
             var obj = {};
             obj.Type = "image";
-            if (arr[k].indexOf("[图]") >= 0) {
-              obj.ContentServer = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
+            if (arr[k].indexOf("[图") >= 0) {
+              obj.ContentServer = arr[k].substring(arr[k].indexOf("[图") + 3, arr[k].indexOf("[/图]"));
+
+              const w = 650;
+              if (obj.ContentServer.indexOf("w='") >= 0 && obj.ContentServer.indexOf("h='") >= 0) {
+                obj.Width = obj.ContentServer.substring(obj.ContentServer.indexOf("w='") + 3, obj.ContentServer.indexOf("h='") - 2);
+                obj.Height = obj.ContentServer.substring(obj.ContentServer.indexOf("h='") + 3, obj.ContentServer.indexOf("']"));
+
+                obj.Height = Math.round((w * Number(obj.Height)) / Number(obj.Width));
+                obj.Width = w;
+
+              }
+              else {
+                obj.Width = "";
+                obj.Height = "";
+              }
+
+              obj.ContentServer = obj.ContentServer.substring(obj.ContentServer.indexOf("]") + 1);
               obj.Content = getTempImage(obj.ContentServer);
               result.Images.push(obj.Content);
             }
@@ -460,10 +476,19 @@ function changeStringToView(field) {
 
 //得到当天任务
 function getTaskTodayList(callback) {
-  wx.showLoading({
-    title: '请稍候',
-    mask: true,
-  })
+  var isNotData = true;
+  var intervalTask = setTimeout(function () {
+    if (isNotData) {
+      wx.showLoading({
+        title: '请稍候',
+        mask: true,
+      });
+      setTimeout(function(){
+        wx.hideLoading();
+      },5000);
+    }
+  }, 2000);
+
   var that = this;
   var CardMaxNumberNew = wx.getStorageSync("CardMaxNumberNew");
   if (!CardMaxNumberNew)
@@ -483,7 +508,11 @@ function getTaskTodayList(callback) {
   url += "&SortTypeIndex=" + SortTypeIndex;
 
   getData(url, function (data) {
-    wx.hideLoading();
+    clearTimeout(intervalTask);
+    if (isNotData) {
+      wx.hideLoading();
+    }
+    isNotData = false;
 
     if (data) {
       app.globalData.TaskToday = data;
@@ -531,17 +560,22 @@ function saveTempImage(serverUrl, tempUrl) {
   wx.setStorageSync("TempImageList", list);
 }
 
-function UpdateMiaoguoCardTodayAll(callback){
+function UpdateMiaoguoCardTodayAll(isShowLoading, callback) {
   var that = this;
-  wx.showLoading({
-    title: '请稍候',
-    mask: true,
-  });
+  if (isShowLoading) {
+    wx.showLoading({
+      title: '请稍候',
+      mask: true,
+    });
+    setTimeout(function () {
+      wx.hideLoading();
+    }, 10000);
+  }
   var list = wx.getStorageSync("ListTaskFinished");
   if (list && list.length > 0) {
-    var arr=[];
-    for(var i=0;i<list.length;i++){
-      var obj={};
+    var arr = [];
+    for (var i = 0; i < list.length; i++) {
+      var obj = {};
       obj.MiaoguoCardID = list[i].Card.MiaoguoCardID;
       obj.IntervalTime = list[i].IntervalTime;
       obj.BtnNumber = list[i].BtnNumber;
@@ -553,16 +587,18 @@ function UpdateMiaoguoCardTodayAll(callback){
     that.postData('UpdateMiaoguoCardTodayAll?UserID=' + app.globalData.userInfo.UserID, {
       List: arr,
     }, function (data) {
-      wx.hideLoading();
+      if (isShowLoading) {
+        wx.hideLoading();
+      }
       if (data) {
         wx.removeStorageSync("ListTaskFinished");
       }
-      if (callback){
+      if (callback) {
         callback();
       }
     });
   }
-  else{
+  else {
     if (callback) {
       callback();
     }
@@ -584,18 +620,18 @@ function updateSearchList(obj) {
       && arr[i].Author == obj.Author
     ) {
       if (obj.Type == "shici") {
-        if (arr[i].ShiciUrl==obj.ShiciUrl){
+        if (arr[i].ShiciUrl == obj.ShiciUrl) {
           obj.Value = arr[i].Value;
           arr.splice(i, 1);
           break;
         }
       }
-      else{
+      else {
         obj.Value = arr[i].Value;
         arr.splice(i, 1);
         break;
       }
-      
+
     }
   }
   arr.unshift(obj);