1.0.0

app.js

@@ -13,7 +13,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.0.0.3",
+    Version: "1.0.0.9",
     IsProduction: false,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",

pages/main/addItem.js

@@ -6,7 +6,7 @@ const app = getApp();
 var field = "";
 var tempCursor = 0, btnName = "";
 var arrSoundMark = [];
-var isUpload = true;
+var isUnload = true;
 
 var isEdit = true;
 
@@ -34,30 +34,38 @@ Page({
       title: '编辑 段落' + fieldid,
     });
   },
-  onShow: function () {
+  onShow: function (e) {
+    console.log("onShow:" + JSON.stringify(e));
     var that = this;
-    var list = wx.getStorageSync("CardList");
+    if (isEdit) {
+      var list = wx.getStorageSync("CardList");
 
-    var card = {};
-    for (var i = 0; i < list.length; i++) {
-      if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
-        var content = main.encryptUrl(list[i].Content[this.data.FieldNumber].Content);
-        this.setData({
-          Field: content,
-        });
+      var card = {};
+      for (var i = 0; i < list.length; i++) {
+        if (that.data.MiaoguoCardID == list[i].MiaoguoCardID) {
+          var content = main.encryptUrl(list[i].Content[this.data.FieldNumber].Content);
+          this.setData({
+            Field: content,
+          });
 
-        if (!wx.getStorageSync("TempCardInfoAddItem")) {
-          wx.setStorageSync("TempCardInfoAddItem", content);
-        }
+          if (!wx.getStorageSync("TempCardInfoAddItem")) {
+            wx.setStorageSync("TempCardInfoAddItem", content);
+          }
 
-        break;
+          break;
+        }
       }
     }
+    isUnload = true;
 
-    isUpload = true;
+    if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+      setTimeout(function () {
+        isEdit = true;
+      }, 600);
+    }
   },
   onUnload: function () {
-    if (isUpload) {
+    if (isUnload) {
       var content = wx.getStorageSync("TempCardInfoAddItem");
       if (content != undefined) {
         this.updateField(content);
@@ -71,10 +79,13 @@ Page({
       this.setData({
         Field: e.detail.value,
       });
-      //console.log("bindinputField:" + field);
+      console.log("bindinputField:" + field);
     }
   },
   addSymbol: function (e) {
+    console.log("addSymbol");
+    isEdit = true;
+    var that = this;
     btnName = e.currentTarget.dataset.id;
     if (btnName == "[读]") {
       this.setData({
@@ -95,23 +106,30 @@ Page({
       this.setData({
         LineSign: "[线]",
       });
-    } 
+    }
 
-    if (!this.data.Focus){
-      field=field+btnName;
+    if (!this.data.Focus) {
+      field = field + btnName;
       this.setData({
         Field: field,
       });
     }
     //console.log("addSymbol:" + field); 
+
+    setTimeout(function () {
+      that.setData({
+        Focus: true,
+      });
+    }, 600);
   },
-  onBindFocus:function(){
+  onBindFocus: function () {
     this.setData({
       Focus: true,
     });
   },
   onBindblur: function (e) {
-    //console.log("onBindblur:" + field + " btnName:" + btnName);
+    var that = this;
+    console.log("onBindblur:" + field + " btnName:" + btnName + " isEdit:" + isEdit);
     if (isEdit) {
       var systemInfo = wx.getSystemInfoSync();
       if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
@@ -141,7 +159,7 @@ Page({
       field = str1 + btnName + str2;
       this.setData({
         Field: field,
-        Focus:false,
+        Focus: false,
         Cursor: tempCursor + cur,
       });
 
@@ -150,7 +168,7 @@ Page({
       if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
         setTimeout(function () {
           isEdit = true;
-        }, 500);
+        }, 600);
       }
     }
   },
@@ -162,17 +180,21 @@ Page({
     this.updateField();
   },
   clear: function () {
+    console.log("clear");
     this.setData({
       Field: "",
-      Focus: true,
+      Focus: false,
       Cursor: 0,
     });
+    btnName = "";
+    field = "";
+    isEdit = false;
     this.updateField();
   },
   closeAddItem: function (e) {
     var isSave = e.currentTarget.dataset.idsave;
     if (isSave == "true") {
-      isUpload = false;
+      isUnload = false;
       wx.removeStorageSync("TempCardInfoAddItem");
       this.updateField();
     }
@@ -203,10 +225,9 @@ Page({
     wx.setStorageSync("CardList", list);
   },
   uploadImage: function () {
-    wx.showLoading({
-      title: '请稍候',
-    });
-    var that=this;
+    console.log("uploadImageStart");
+    isEdit = false;
+    var that = this;
     wx.chooseImage({
       count: 1,
       sizeType: ['compressed'],
@@ -214,22 +235,19 @@ Page({
       success(res) {
         // tempFilePath可以作为img标签的src属性显示图片
         const tempFilePaths = res.tempFilePaths;
-        console.log(tempFilePaths[0]);
-
-        var url = common.Encrypt("MiaoguoUploadFile");
-        wx.uploadFile({
-          url: app.globalData.serverUrl + url,
-          filePath: tempFilePaths[0],
-          name: 'file',
-          success(res) {
-            wx.hideLoading();
-            var str = "[图 url='" + tempFilePaths[0] + "']" + "https://#####4#####/" +res.data+ "[/图]";
-            that.addSymbol({ currentTarget: { dataset: { id: str } } });
-          }
+        //console.log(tempFilePaths[0]);
+        field = field + "[图 url='" + tempFilePaths[0] + "']" + tempFilePaths[0] + "[/图]";
+
+        console.log("uploadImageEnd:" + field);
+
+        that.setData({
+          Field: field,
+          Focus: false,
         });
+
       },
-      fail:function(){
-        wx.hideLoading();
+      fail: function () {
+
       }
     });
   },

pages/main/addItem.wxml

@@ -4,25 +4,25 @@
       <view class="panelSave1 FlexRow" bindtap="onSearch">
         <view class="add">+</view> 资料
       </view>
-      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" wx:if="{{SoundSign=='[读]'}}">
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
         <image class="universalpic_read_begin_gray_20x20" src='../images/universalpic_read_begin_gray_20x20.png' />
       </view>
-      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" wx:if="{{SoundSign=='[/读]'}}">
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
         <image class="universalpic_read_end_white_38x22" src='../images/universalpic_read_end_white_38x22.png' />
       </view>
-      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[线]'}}">
+      <view class="panelSave2 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
         <image class="universalpic_editbar_underline_gray_14x20" src='../images/universalpic_editbar_underline_gray_14x20.png' />
       </view>
-      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" wx:if="{{LineSign=='[/线]'}}">
+      <view class="panelSave3 panelSave1 FlexRow" bindtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
         <image class="universalpic_underline_end_white_30x22" src='../images/universalpic_underline_end_white_30x22.png' />
       </view>
-      <view class="panelSave2 panelSave1 FlexRow" bindtap="uploadImage">
+      <view class="panelSave2 panelSave1 FlexRow" catchtap="uploadImage">
         <image class="universalpic_picture_gray_26x26" src='../images/universalpic_picture_gray_26x26.png' />
       </view>
 
     </view>
     <view class='right FlexRow'>
-      <view class="clear" bindtap="clear">清空</view>
+      <view class="clear" catchtap="clear">清空</view>
     </view>
   </view>
   <view class='lineFooter'></view>

pages/main/detail.js

@@ -200,7 +200,8 @@ Page({
 
     function formatList(list) {
       for (var i = 0; i < list.length; i++) {
-        list[i].ContentNew = main.changeStringToView(list[i].Content);
+        if (list[i].Content)
+          list[i].ContentNew = main.changeStringToView(list[i].Content);
       }
       return list;
     }

pages/main/detail.wxml

@@ -57,9 +57,9 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="1">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+        <image class="imageBishun" wx:if="{{item.Type=='image'  && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" />
 
-        <image class="imageFree" mode='widthFix' wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+        <image class="imageFree" mode='widthFix' wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' catchtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
 
   </block>
   </view>
@@ -73,7 +73,7 @@
     </view>
 
     <view class='right2 FlexRow' wx:if="{{IsShowAnswer[0]==0}}">
-      <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_20p_34x34.png' />
+      <image class="universalpic_show_white_30x30" src='../images/universalpic_show_{{Color.IconColor}}_30x30.png' />
     </view>
     <view class='right2 FlexRow' catchtap='onShowAnswer' data-start="true" wx:if="{{IsShowAnswer[0]==1}}">
       <image class="universalpic_hide_white_34x34" src='../images/universalpic_hide_{{Color.IconColor}}_34x34.png' />
@@ -103,9 +103,9 @@
 
         <text class="textPinyin" wx:if="{{item.Type=='sound'}}" catchtap="playSound" data-content="{{item.Content}}" data-soundmark="{{item.SoundMark}}" data-fieldid="{{itemParent}}">{{item.Content}}</text>
 
-        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' bindtap='showImage' data-name="{{item.Content}}" />
+        <image class="imageBishun" wx:if="{{item.Type=='image' && !item.Url}}" src='{{item.Content}}' catchtap='showImage' data-name="{{item.Content}}" />
 
-        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' bindtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
+        <image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image' && item.Url}}" src='{{item.Url}}' catchtap='showImage' data-name="{{item.Url}}" binderror="onBindError" />
 
         </block>
       </view>

pages/main/detail.wxss

@@ -132,6 +132,11 @@
   background-color: rgba(255,255,255,0.2);
   margin-top: 66rpx;
 }
+.universalpic_show_white_30x30{
+  width: 36rpx;
+  height: 36rpx;
+  margin: 52rpx 50rpx 0 50rpx;
+}
 
 .universalpic_hide_white_34x34 {
   width: 36rpx;

pages/main/searchCardList.wxml

@@ -20,7 +20,7 @@
           </view>
         </view>
         <view class="panelItem2">
-          {{item.LimitTimeStr}}
+          {{item.CreateTimeStr}}
         </view>
       </view>
     </block>

pages/main/searchWeb1.wxss

@@ -25,7 +25,7 @@
 .universalpic_search_gray_30x30{
   width:30rpx;
   height:30rpx;
-  margin: 0 10rpx 0 30rpx;
+  margin: 0 20rpx 0 30rpx;
 }
 
 .input{