1.0.5

app.js

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

pages/main/article.js

@@ -77,6 +77,8 @@ Page({
     //   IsBuilding:true,
     // });
     // that.getChoicenessArticle();
+
+    main.checkGenerating();
   },
   getArticleByID:function(id){
     let that=this;
@@ -116,6 +118,7 @@ Page({
     that.setData({
       IsBuilding:true
     });
+    app.globalData.Generating=true;
     let words=app.globalData.SelectedWords.join(",");
     main.postData('GenerateArticle?UserID='+app.globalData.userInfo.UserID, {
       Words:words,
@@ -123,6 +126,7 @@ Page({
       ArticleStyle:that.data.ArticleStyle,
       AIVersion:that.data.AIVersion
     }, function (data) {
+      app.globalData.Generating=false;
       if (data){
         if (data=="-1"){
           that.setData({

pages/main/article.wxss

@@ -630,7 +630,7 @@
 .pic_08{
   width: 100%;
   position: fixed;
-  top:200rpx;
+  top:0rpx;
   z-index: 50;
 }
 
@@ -697,7 +697,7 @@
 }
 
 .text10{
-  margin-left: 30rpx;
+  margin-left: 50rpx;
   font-size: 24rpx;
   text-align: center;
 }

pages/main/feedbackinfo.js

@@ -23,6 +23,7 @@ Page({
       IsShow:app.globalData.userInfo.IsShow,
       Feedback:that.data.Feedback,
     });
+    main.checkGenerating();
   },
   bindKeyInput:function(e){
     var that=this;

pages/main/help.js

@@ -11,6 +11,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    main.checkGenerating();
   },
   onShareAppMessage: function () {
     return {

pages/main/index.js

@@ -19,6 +19,7 @@ Page({
   onShow:function(){
     app.globalData.OCRWords=[];
     this.getData();
+    main.checkGenerating();
   },
   goto: function (e) {
     let that=this;

pages/main/myarticles.js

@@ -14,6 +14,8 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
     that.getData(app.globalData.userInfo.UserID);
+
+    main.checkGenerating();
   },
   getData:function(userID){
     wx.showLoading({

pages/main/ocr.js

@@ -10,6 +10,7 @@ Page({
   },
   onLoad: function (options) {
     app.globalData.OCRWords=[];
+    main.checkGenerating();
   },
   onShow:function(){
     let that = this;

pages/main/paste.js

@@ -21,6 +21,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
       Words:words, 
     });
+    main.checkGenerating();
   },
   handlePaste: function(e) {
     let that = this;

pages/main/selectword.js

@@ -17,6 +17,7 @@ Page({
     that.setData({
       Containnerheight: main.getWindowHeight(),
     });
+    main.checkGenerating();
   },
 
   onShow:function(e){

pages/main/wordsinput.js

@@ -16,27 +16,17 @@ Page({
   },
   onLoad: function (options) {
     let that = this;
-    let grade=wx.getStorageSync('Grade');
-    if (!grade)
-      grade=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
-    let ArticleStyle=wx.getStorageSync('ArticleStyle');
-    if (!ArticleStyle)
-      ArticleStyle=[{Name:"随机",CSS:"Selected"},{Name:"童话",CSS:""},{Name:"奇幻",CSS:""},{Name:"动物",CSS:""},{Name:"校园生活",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"成长",CSS:""},{Name:"科幻",CSS:""},{Name:"环保",CSS:""},{Name:"旅行",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"人生励志",CSS:""}];
-    let AIVersion=wx.getStorageSync('AIVersion');
-    if (!AIVersion)
-      AIVersion=[{Version:"1.0",Content:"基础词汇，结构简明\n平均30秒生成",CSS:"Selected"},{Version:"1.5",Content:"词句丰富，深度表达\n平均60秒生成",CSS:""}];
-  
+    
     const hiddenhelp=wx.getStorageSync('HiddenWordInputFirstOpen');
 
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      Grade:grade,
-      ArticleStyle:ArticleStyle,
-      AIVersion:AIVersion,
       IsShowFirstOpen:!hiddenhelp,
       KeyboardBtnName:"next",
     });
+    that.initMenu();
 
+    main.checkGenerating();
   },
   onShow:function(e){
     let that = this;
@@ -70,6 +60,45 @@ Page({
   onHide:function(e){
     this.getInputData();
   },
+  initMenu:function(){
+    let that = this;
+    let GradeArr=[{Name:"小学",CSS:"Selected"},{Name:"初中",CSS:""},{Name:"高中",CSS:""},{Name:"大学",CSS:""}];
+    let grade=wx.getStorageSync('Grade');
+    if (grade && grade>=0 && grade<=3){
+      for(let i=0;i<GradeArr.length;i++){
+        GradeArr[i].CSS="";
+        if (grade==i)
+          GradeArr[i].CSS="Selected";
+      }
+    }
+
+    let ArticleStyleArr=[{Name:"童话",CSS:"Selected"},{Name:"奇幻",CSS:""},{Name:"动物",CSS:""},{Name:"校园生活",CSS:""},{Name:"家庭亲子",CSS:""},{Name:"成长",CSS:""},{Name:"科幻",CSS:""},{Name:"旅行",CSS:""},{Name:"大自然",CSS:""},{Name:"科普",CSS:""},{Name:"节日文化",CSS:""},{Name:"人生励志",CSS:""}];
+    let ArticleStyle=wx.getStorageSync('ArticleStyle');
+    if (ArticleStyle && ArticleStyle>=0 && ArticleStyle<=12){
+      for(let i=0;i<ArticleStyleArr.length;i++){
+        ArticleStyleArr[i].CSS="";
+        if (ArticleStyle==i)
+          ArticleStyleArr[i].CSS="Selected";
+      }
+    }
+
+    let AIVersionArr=[{Version:"1.0",Content:"词句丰富，结构简明\n平均30秒生成",CSS:"Selected"},{Version:"1.5",Content:"深度表达，更多要素\n平均60秒生成",CSS:""}];
+    let AIVersion=wx.getStorageSync('AIVersion');
+    if (AIVersion && AIVersion>=0 && AIVersion<=2){
+      for(let i=0;i<AIVersionArr.length;i++){
+        AIVersionArr[i].CSS="";
+        if (AIVersion==i)
+          AIVersionArr[i].CSS="Selected";
+      }
+    }
+
+    
+    that.setData({
+      GradeArr:GradeArr,
+      ArticleStyleArr:ArticleStyleArr,
+      AIVersionArr:AIVersionArr,
+    });
+  },
   bindKeyInput: function (e) {
     let that=this;
     let id=e.currentTarget.dataset.id;
@@ -200,11 +229,11 @@ Page({
     const index=e.currentTarget.dataset.index;
     const id=e.currentTarget.dataset.id;
     
-    let arr=this.data.Grade;
+    let arr=this.data.GradeArr;
     if (id==1)
-      arr=this.data.ArticleStyle;
+      arr=this.data.ArticleStyleArr;
     else if (id==2)
-      arr=this.data.AIVersion;
+      arr=this.data.AIVersionArr;
       
     for(let i=0;i<arr.length;i++){
       arr[i].CSS="";
@@ -213,21 +242,21 @@ Page({
     }
     if (id==1){
       this.setData({
-        ArticleStyle:arr,
+        ArticleStyleArr:arr,
       });
-      wx.setStorageSync('ArticleStyle', arr);
+      wx.setStorageSync('ArticleStyle', index);
     }
     else if (id==2){
       this.setData({
-        AIVersion:arr,
+        AIVersionArr:arr,
       });
-      wx.setStorageSync('AIVersion', arr);
+      wx.setStorageSync('AIVersion', index);
     }
     else{
       this.setData({
-        Grade:arr,
+        GradeArr:arr,
       });
-      wx.setStorageSync('Grade', arr);
+      wx.setStorageSync('Grade', index);
     }
     
   },
@@ -243,21 +272,21 @@ Page({
     that.getInputData();
 
     if (url=="article"){
-      let arr=this.data.Grade;
+      let arr=this.data.GradeArr;
       for(let i=0;i<arr.length;i++){
         if (arr[i].CSS=="Selected"){
           url+="?Level="+i;
           break;
         }
       }
-      arr=this.data.ArticleStyle;
+      arr=this.data.ArticleStyleArr;
       for(let i=0;i<arr.length;i++){
         if (arr[i].CSS=="Selected"){
           url+="&ArticleStyle="+arr[i].Name;
           break;
         }
       }
-      arr=this.data.AIVersion;
+      arr=this.data.AIVersionArr;
       for(let i=0;i<arr.length;i++){
         if (arr[i].CSS=="Selected"){
           url+="&AIVersion="+arr[i].Version;

pages/main/wordsinput.wxml

@@ -65,21 +65,21 @@
     <view class="panelMenu11 FlexColumn">
       <view class="text04 text05">单词水平</view>
       <view class="panelMenu111 FlexRow">
-        <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{Grade}}" wx:key="index" capture-bind:tap="selectBtn" data-id="0" data-index="{{index}}">{{item.Name}}</view>
+        <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{GradeArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="0" data-index="{{index}}">{{item.Name}}</view>
       </view>
     </view>
     <view class="panelMenu11 FlexColumn">
       <view class="text04 text06">主题</view>
       <scroll-view scroll-x="true" class="panelMenu1110">
         <view class="panelMenu1111 FlexRow">
-          <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyle}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
+          <view class="btn btn{{item.CSS}} FlexRow" wx:for="{{ArticleStyleArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="1" data-index="{{index}}">{{item.Name}}</view>
         </view>
       </scroll-view>
     </view>
     <view class="panelMenu11 FlexColumn">
       <view class="text04 text05">模型</view>
       <view class="panelMenu111 FlexRow">
-        <view class="btn btn4 btn{{item.CSS}} FlexRow" wx:for="{{AIVersion}}" wx:key="index" capture-bind:tap="selectBtn" data-id="2" data-index="{{index}}">
+        <view class="btn btn4 btn{{item.CSS}} FlexRow" wx:for="{{AIVersionArr}}" wx:key="index" capture-bind:tap="selectBtn" data-id="2" data-index="{{index}}">
           <view class="btn41">{{item.Version}}</view>
           <text>{{item.Content}}</text>
         </view>

pages/main/wordsinput.wxss

@@ -247,17 +247,17 @@
 }
 .panelMenu111{
   width:100%;
-  margin: 30rpx 0 0 30rpx;
+  margin: 30rpx 0 0 60rpx;
   justify-content: flex-start;
   align-items: flex-start;
 }
 .panelMenu1110{
   width:100%;
-  margin: 30rpx 0 -20rpx 0;
+  margin: 30rpx 0 -20rpx 20rpx;
   white-space: nowrap;
 }
 .panelMenu1111{
-  width:1108rpx;
+  width:1008rpx;
   height:260rpx;
   margin-left: 20rpx;
   flex-wrap: wrap;
@@ -287,7 +287,7 @@
 }
 .btn4{
   height:126rpx;
-  margin: 0 10rpx;
+  margin: 0 20rpx 0 0;
   font-size: 24rpx;
 }
 

utils/main.js

@@ -135,10 +135,41 @@ function onSelect(obj,event,callback){
   callback(obj,event,result);
 }
 
+function checkGenerating(){
+  if (app.globalData.Generating){
+    let intervalGenerate=setInterval(function(){
+      console.log(new Date().getTime());
+      if (!app.globalData.Generating){
+        clearInterval(intervalGenerate);
+        wx.showModal({
+          title: '通知',
+          content: '文章生成好了。',
+          cancelText:"不去",
+          confirmText:"去看",
+          complete: (res) => {
+            if (res.confirm) {
+              let next='article?ID=MAX';
+              wx.reLaunch({
+                url: 'index',
+                complete:function(){
+                  wx.navigateTo({
+                    url: next,
+                  })
+                }
+              })
+            }
+          }
+        })
+      }
+    },1000);
+  }
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
   getLocalHost: getLocalHost,
   getWindowHeight: getWindowHeight,
   onSelect:onSelect,
+  checkGenerating:checkGenerating,
 }