1.0.7

app.js

@@ -1,8 +1,8 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.6",
-    //IsProduction: true,
+    Version: "1.0.7",
+    IsProduction: true,
     ShareTitle: "阅读理解+答题",
     SharePath: "pages/index/index",
     ShareImage: '../images/pic_07.png',
@@ -33,6 +33,7 @@ App({
     SelectedWords:[],//选中的单词
     ocrReady: false,//
     Generating:false,//生成文章中
+    GeneratingStart:false,//生成文章中已经开始
   },
   onLaunch: function (options) {
     let that=this;

pages/main/article.js

@@ -142,6 +142,7 @@ Page({
       AIVersion:that.data.AIVersion
     }, function (data) {
       app.globalData.Generating=false;
+      app.globalData.GeneratingStart=false;
       if (data){
         if (data=="-1"){
           that.setData({

utils/main.js

@@ -11,7 +11,7 @@ function getData(url, callback) {
   //console.log("加密后的结果为===",url);
   wx.request({
     url: app.globalData.serverUrl + url,
-    timeout:120000,
+    timeout:150000,
     success: function (res) {
       if (res.statusCode)
         common.checkError(res.statusCode);
@@ -39,7 +39,7 @@ function postData(url, postData, callback) {
   wx.request({
     url: app.globalData.serverUrl + url,
     method: "POST",
-    timeout:120000,
+    timeout:150000,
     data: postData,
     success: function (res) {
       if (res.statusCode)
@@ -155,7 +155,8 @@ function onSelect(obj,event,callback){
 
 function checkGenerating(){
   let that=this;
-  if (app.globalData.Generating){
+  if (app.globalData.Generating && !app.globalData.GeneratingStart){
+    app.globalData.GeneratingStart=true;
     let timeStart=new Date().getTime();
     let intervalGenerate=setInterval(function(){
       let time=(new Date().getTime()-timeStart)/1000;
@@ -166,6 +167,8 @@ function checkGenerating(){
         if (!(page.NavigationDepth==3 
           && page.CurrentRoute=="pages/main/article" 
           && page.BackFromPage=="pages/main/article")){
+            app.globalData.Generating=false;
+            app.globalData.GeneratingStart=false;
             wx.showModal({
               title: '通知',
               content: '文章生成好了。',