1.0.0.11

app.js

@@ -11,9 +11,21 @@ App({
   },
   getSystemInfo: function () {
     this.globalData.systemInfo = wx.getSystemInfoSync();
+    if (this.globalData.systemInfo.system.indexOf("Android") >= 0) {
+      this.globalData.IsIOS =false;
+      this.globalData.IsAndroid=true;
+    }
+    else if (this.globalData.systemInfo.system.indexOf("iOS") >= 0) {
+      this.globalData.IsIOS = true;
+      this.globalData.IsAndroid=false;
+    }
+
+    if (this.globalData.systemInfo.model.indexOf("iPad")>=0){
+      this.globalData.IsIPad=true;
+    }
   },
   globalData: {
-    Version: "1.0.0.10",
+    Version: "1.0.0.11",
     IsProduction: true,
     ShareTitle: "可以用来记忆一切的工具",
     SharePath: "pages/index/index",
@@ -28,6 +40,9 @@ App({
     pinyinUrl: "https://pinyin.kylx365.com/sounds/[pinyin].m4a",
     uploadImageUrl:"https://miaguo-1253256735.file.myqcloud.com/",
     BaiduToken: "",//百度开发平台token
+    IsIOS:true,
+    IsAndroid:false,
+    IsIPad:false,
     systemInfo: null,
     userInfo: null,
     SourceID: 0,//来源ID

pages/index/accredit.js

@@ -10,7 +10,7 @@ Page({
   onLoad: function (options) {
     urlRedirectTo = options.url;
     this.setData({
-      Containnerheight: common.getSystemHeight(),
+      Containnerheight: main.getWindowHeight(),
     });
 
     wx.hideShareMenu();

pages/index/index.js

@@ -55,7 +55,7 @@ Page({
       }
     }
     this.setData({
-      Containnerheight: common.getSystemHeight(),
+      Containnerheight: main.getWindowHeight(),
     });
 
     this.updateProgram();

pages/main/addItem.js

@@ -7,7 +7,6 @@ var tempCursor = 0,
   btnName = "";
 var arrSoundMark = [];
 var isUnload = true;
-var isAndroid = false;
 var isEdit = true;
 
 Page({
@@ -34,15 +33,13 @@ Page({
       title: '编辑 段落' + fieldid,
     });
 
-    if (app.globalData.systemInfo.system.indexOf("Android") >= 0) {
-      isAndroid = true;
-    }
   },
   onShow: function () {
     console.log("onShow");
     var that = this;
 
-    if (isAndroid && !isEdit) {
+    console.log("onShow:" + isEdit);
+    if (app.globalData.IsAndroid && !isEdit) {
       return;
     }
 
@@ -77,7 +74,7 @@ Page({
   },
   bindinputField: function (e) {
     var that = this;
-    if (isAndroid && !isEdit) {
+    if (app.globalData.IsAndroid && !isEdit) {
       return;
     }
 
@@ -134,13 +131,14 @@ Page({
   onBindblur: function (e) {
     var that = this;
     console.log("onBindblur:" + isEdit + " Filed:" + this.data.Field);
-    if (isAndroid && !isEdit) {
+    if (app.globalData.IsAndroid && !isEdit) {
       setTimeout(function () {
         isEdit = true;
       }, 500);
       return;
     }
     isEdit = false;
+    console.log("onBindblur:"+isEdit);
 
     this.updateField();
     tempCursor = e.detail.cursor;
@@ -177,11 +175,17 @@ Page({
 
   },
   onSearch: function (e) {
+  
     wx.setStorageSync("TempFieldNumber", this.data.FieldNumber);
     wx.navigateTo({
       url: './searchWeb',
     });
     this.updateField();
+    
+    setTimeout(function () {
+      isEdit = true;
+      console.log("onSearchEnd");
+    }, 1000);
   },
   clear: function () {
     var that = this;

pages/main/default.js

@@ -19,6 +19,12 @@ Page({
         url: './preview?type=share&id=' + id,
       });
     }
+
+    if (app.globalData.IsIPad){
+      that.setData({
+        IsIPad: "_iPad",
+      });
+    }
   },
   onShow: function () {
     var that = this;

pages/main/default.wxml

@@ -7,9 +7,9 @@
       <image class="universalpic_setup_gray_40x40" src='../images/universalpic_setup_gray_40x40.png' />
     </view>
   </view>
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="task_index_start" src='../images/task_index_start.png' bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="task_index_start" src='../images/task_index_goon.png'  bindtap="goto" data-url="detail" />
-  <image wx:if="{{TodayTaskNumber==0}}" class="task_index_start" src='../images/task_index_report.png'  bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==1}}" class="task_index_start{{IsIPad}}" src='../images/task_index_start.png' bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber>0 && IsStart==0}}" class="task_index_start{{IsIPad}}" src='../images/task_index_goon.png'  bindtap="goto" data-url="detail" />
+  <image wx:if="{{TodayTaskNumber==0}}" class="task_index_start{{IsIPad}}" src='../images/task_index_report.png'  bindtap="goto" data-url="detail" />
 
   <view class='panelBottom FlexColumn'>
 

pages/main/default.wxss

@@ -34,6 +34,13 @@
   top:523rpx;
 }
 
+.task_index_start_iPad {
+  width: 377rpx;
+  height: 240rpx;
+  position: fixed;
+  top:433rpx;
+}
+
 .panelBottom {
   position: fixed;
   bottom: 0;

pages/main/detail.js

@@ -12,6 +12,7 @@ var timeStart; //计算时长
 var TaskList = [];
 var iTimeout = 0;
 var arrImage = [], arrImage2 = [];
+var intervalSound;
 
 Page({
   data: {
@@ -38,14 +39,21 @@ Page({
   onLoad: function () {
     wx.hideShareMenu();
     var that = this;
+    var height = app.globalData.systemInfo.screenHeight * 2-110;
+    var height2=750;
+    if (app.globalData.IsIPad){
+      height=960;
+      height2=670;
+    }
     that.setData({
-      Containnerheight: main.getWindowHeight(),
+      Containnerheight: height,
+      Containnerheight2: height-height2,
       IsShowAnswer: [0, 0],
       CanUndo: 1,
     });
 
     innerAudioContext1 = wx.createInnerAudioContext();
-    this.audioCtx = wx.createAudioContext('myAudio');
+    this.audioCtx=[];
 
     this.getList();
 
@@ -82,6 +90,9 @@ Page({
 
     }
   },
+  onUnload:function(){
+    clearInterval(intervalSound);
+  },
   onPullDownRefresh: function () {
   },
   setSoundFile: function (isFinish) {//isFinish=3搁置 =2撤退 =1结束 =0正常 =-1开始
@@ -116,8 +127,8 @@ Page({
       if (wx.setBackgroundColor) {
         wx.setBackgroundColor({
           backgroundColor: color.BackColor,
-          backgroundColorTop: color.BackColor, // 顶部窗口的背景色为白色
-          backgroundColorBottom: color.BackColor2, // 底部窗口的背景色为白色
+          backgroundColorTop: color.BackColor, 
+          backgroundColorBottom: color.BackColor2, 
         })
       }
       if (wx.setNavigationBarColor) {
@@ -594,9 +605,22 @@ Page({
       url = url.replace("[token]", app.globalData.BaiduToken);
       url = url.replace("[word]", str);
     }
-    this.audioCtx.setSrc(url);
-    this.audioCtx.play();
-    //console.log(url);
+
+    var arr = url.split(",");
+    for (var i = 0; i < arr.length; i++) {
+      this.audioCtx.push(wx.createAudioContext('myAudio' + i));
+    }
+    var index = 0;
+    intervalSound = setInterval(function () {
+      that.audioCtx[index].setSrc(arr[index]);
+      that.audioCtx[index].play();
+
+      index++;
+      if (index >= arr.length) {
+        clearInterval(intervalSound);
+      }
+    }, 1000);
+    
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = TaskList[0].ContentNew.Field[fieldid];

pages/main/detail.wxml

@@ -1,4 +1,4 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight-50}}rpx;background-color:{{Color.BackColor2}}'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;background-color:{{Color.BackColor2}}'>
   <view class='panelTop FlexRow' style='background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
     <view class='panelCancel' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}">
     </view>
@@ -81,7 +81,7 @@
 
   </view>
 
-  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight-480}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtap="onShowAnswer">
+  <view class="panelField20 FlexColumn" style='min-height:{{Containnerheight2}}rpx;background-color:{{Color.BackColor2}};color:{{Color.FrontColor2}};' bindtap="onShowAnswer">
     <view class="panelField2 FlexColumn" wx:for="{{[2,3]}}" wx:key="indexParent" wx:for-index="indexParent" wx:for-item="itemParent" wx:if="{{TaskInfo.ContentNew.Field[itemParent].length>0 && IsShowAnswer[itemParent-2]}}">
       <view wx:if="{{itemParent==3}}" class="lineField" style='background-color:{{Color.FieldLineColor}};'></view>
       <view class="panelField21 panelItem FlexRow">
@@ -114,7 +114,7 @@
   </block>
 
   <!-- 最后一页 -->
-  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight-50}}rpx;background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
+  <view class='panelLast FlexColumn' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}" style='height:{{Containnerheight}}rpx;background-color:{{Color.BackColor}};color:{{Color.FrontColor}};'>
     <view class='text1'>做完了</view>
 
     <view class="panelLastTime FlexColumn">
@@ -133,7 +133,7 @@
     <view class='panelLastFooter' bindtap='onClose'>关闭</view>
   </view>
 
-  <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}"></view>
+  <view class='footer' wx:if="{{NumberNew+NumberReview+NumberHistory>0}}" bindtap="onShowAnswer" ></view>
   <view class='footer1 footer' wx:if="{{NumberNew+NumberReview+NumberHistory==0}}"></view>
 
   <block wx:if="{{IsShowAnswer[1]}}">
@@ -198,4 +198,7 @@
   </view>
 </view>
 
-<audio hidden='true' id="myAudio"></audio>
+<audio hidden='true' id="myAudio0"></audio>
+<audio hidden='true' id="myAudio1"></audio>
+<audio hidden='true' id="myAudio2"></audio>
+<audio hidden='true' id="myAudio3"></audio>

pages/main/detail.wxss

@@ -135,7 +135,7 @@
 .universalpic_show_white_30x30{
   width: 36rpx;
   height: 36rpx;
-  margin: 52rpx 50rpx 0 50rpx;
+  margin: 68rpx 50rpx 0 50rpx;
 }
 
 .universalpic_hide_white_34x34 {

pages/main/preview.js

@@ -2,12 +2,12 @@ import common from '../../utils/util';
 import main from '../../utils/main';
 
 const app = getApp();
-var iTimeout = 0;
+var iTimeout = 0, intervalSound=0;
 var arrImage = [], arrImage2 = [];
 
 Page({
   data: {
-    IsExistCard:false,
+    IsExistCard: false,
   },
   onLoad: function (options) {
     wx.hideShareMenu();
@@ -21,10 +21,12 @@ Page({
       ShowType: options.type,
       MiaoguoCardID: id,
     });
-    console.log("MiaoguoCardID:"+id);
-    this.audioCtx = wx.createAudioContext('myAudio');
+    //console.log("MiaoguoCardID:" + id);
+    
+    this.audioCtx = [];
+    
 
-    if (options.type=="share"){
+    if (options.type == "share") {
       wx.setNavigationBarTitle({
         title: "查看共享"
       });
@@ -44,8 +46,9 @@ Page({
     else
       that.init();
   },
-  onUnload:function(){
+  onUnload: function () {
     clearTimeout(iTimeout);
+    clearInterval(intervalSound);
   },
   init: function () {
     var list = wx.getStorageSync("CardList");
@@ -77,8 +80,8 @@ Page({
     arrImage = card.Images;
     arrImage2 = card.Images2;
 
-    console.log("arrImage:"+arrImage);
-    console.log("arrImage2"+arrImage2);
+    console.log("arrImage:" + arrImage);
+    console.log("arrImage2" + arrImage2);
 
     this.setData({
       ID: card.MiaoguoCardID,
@@ -153,7 +156,7 @@ Page({
       wx.hideLoading();
 
       var title = "题卡已存在！";
-      var image ="universalpic_wrong_white_120x120";
+      var image = "universalpic_wrong_white_120x120";
       if (data == 1) {
         title = "已保存";
         image = "universalpic_saved_white_120x120";
@@ -161,18 +164,18 @@ Page({
       wx.showToast({
         title: title,
         mask: true,
-        image:"../images/"+image+".png",
+        image: "../images/" + image + ".png",
         duration: 2000,
         success: function () {
           that.setData({
-            IsExistCard:true,
+            IsExistCard: true,
           });
         }
       });
     });
   },
   playSound: function (e) {
-    var that=this;
+    var that = this;
     var str = e.currentTarget.dataset.content;
     var url;
     if (str.indexOf("英 [") >= 0 || str.indexOf("美 [") >= 0) {
@@ -189,8 +192,20 @@ Page({
       url = url.replace("[word]", str);
     }
 
-    this.audioCtx.setSrc(url);
-    this.audioCtx.play();
+    var arr = url.split(",");
+    for (var i = 0; i < arr.length; i++) {
+      this.audioCtx.push(wx.createAudioContext('myAudio' + i));
+    }
+    var index = 0;
+    intervalSound = setInterval(function () {
+      that.audioCtx[index].setSrc(arr[index]);
+      that.audioCtx[index].play();
+
+      index++;
+      if (index >= arr.length) {
+        clearInterval(intervalSound);
+      }
+    }, 1000);
 
     var fieldid = e.currentTarget.dataset.fieldid;
     var content = that.data.Field[fieldid];
@@ -289,22 +304,22 @@ Page({
       });
     }
   },
-  showImage:function(e){
+  showImage: function (e) {
     var name = e.currentTarget.dataset.name;
     wx.previewImage({
       current: name,
       urls: arrImage,
     });
   },
-  onBindError:function(e){
-    for(var i=1;i<this.data.Field.length;i++){
-      for(var j=0;j<this.data.Field[i].length;j++){
-        if (this.data.Field[i][j].Type=="image"){
+  onBindError: function (e) {
+    for (var i = 1; i < this.data.Field.length; i++) {
+      for (var j = 0; j < this.data.Field[i].length; j++) {
+        if (this.data.Field[i][j].Type == "image") {
           this.data.Field[i][j].Url = this.data.Field[i][j].Content;
         }
       }
     }
-    arrImage=arrImage2;
+    arrImage = arrImage2;
     this.setData({
       Field: this.data.Field,
     });

pages/main/preview.wxml

@@ -104,4 +104,7 @@
   </view>
 </view>
 
-<audio hidden='true' id="myAudio"></audio>
+<audio hidden='true' id="myAudio0"></audio>
+<audio hidden='true' id="myAudio1"></audio>
+<audio hidden='true' id="myAudio2"></audio>
+<audio hidden='true' id="myAudio3"></audio>

pages/main/searchCard.wxml

@@ -1,20 +1,21 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="panelSearch FlexRow">
-    <view class="panelSearch1 FlexRow" bindtap="onSearch">
-      <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <view>搜索题卡</view>
+  <view class='panel'>
+    <view class="panelSearch FlexRow">
+      <view class="panelSearch1 FlexRow" bindtap="onSearch">
+        <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+        <view>搜索题卡</view>
+      </view>
     </view>
-  </view>
-  <view class='panelBtn FlexRow'>
-    <view class='text1 FlexRow' bindtap="getList" data-id="0">
-      <view>全部题卡</view>
-      <view class="text2">{{CardNumber}}</view>
+    <view class='panelBtn FlexRow'>
+      <view class='text1 FlexRow' bindtap="getList" data-id="0">
+        <view>全部题卡</view>
+        <view class="text2">{{CardNumber}}</view>
+      </view>
+      <view class='line1'></view>
+      <view class='text1' bindtap="getList" data-id="1">今日的任务</view>
     </view>
-    <view class='line1'></view>
-    <view class='text1' bindtap="getList" data-id="1">今日的任务</view>
+    <view class='lineFooter'></view>
   </view>
-  <view class='lineFooter'></view>
-
   <view class='panelBottom FlexColumn'>
 
     <view class='panelBottom1 FlexRow'>

pages/main/searchCard.wxss

@@ -5,6 +5,13 @@
   background-color: #f0f0f0;
 }
 
+
+.panel{
+  width: 100%;
+  position: fixed;
+  top:0;
+}
+
 .panelSearch {
   width: 100%;
   height: 140rpx;

pages/main/searchCard1.wxml

@@ -1,15 +1,17 @@
-<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="panelSearch FlexRow">
-    <view class="panelSearch1 FlexRow">
-      <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-      <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" />
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='panel'>
+    <view class="panelSearch FlexRow">
+      <view class="panelSearch1 FlexRow">
+        <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+        <input class='input' maxlength='50' auto-focus bindinput="onKeyInput" value="{{SearchInfo}}" />
+      </view>
     </view>
+    <view class='lineFooter'></view>
+    <view class='panelBtn FlexRow'>
+      <view class='text1' bindtap="close">取消</view>
+      <view class='line1'></view>
+      <view class='text2 text1' bindtap="onSearch">搜索</view>
+    </view>
+    <view class='lineFooter'></view>
   </view>
-  <view class='lineFooter'></view>
-  <view class='panelBtn FlexRow'>
-    <view class='text1' bindtap="close">取消</view>
-    <view class='line1'></view>
-    <view class='text2 text1' bindtap="onSearch">搜索</view>
-  </view>
-  <view class='lineFooter'></view>
 </view>

pages/main/searchCard1.wxss

@@ -5,6 +5,11 @@
   background-color: #F0F0F0;
 }
 
+.panel{
+  width: 100%;
+  position: fixed;
+  top:0;
+}
 .panelSearch{
   width:100%;
   height:140rpx;

pages/main/searchWeb2.js

@@ -135,10 +135,15 @@ Page({
       this.data.CSS[css].Tag = tag;
       if (tag == "发音")
         this.data.CSS[css].SoundMark = soundmark;
-      if (tag == "拼音"){
+      if (tag == "拼音") {
         var pinyin = main.getPinyin(content);
         if (pinyin)
           this.data.CSS[css].SoundMark = pinyin;
+      } 
+      if (tag == "读写") {
+        var pinyin = main.getPinyin(e.currentTarget.dataset.pinyin);
+        if (pinyin)
+          this.data.CSS[css].SoundMark = pinyin;
       }
 
       this.data.CSS[css].Number = "1";
@@ -157,14 +162,6 @@ Page({
     }
     else {
       this.data.CSS[css].Number = Number(this.data.CSS[css].Number) + 1;
-      //if (wx.getStorageSync("TempFieldNumber")) {
-        // this.data.CSS[css].Css1 = "";
-        // this.data.CSS[css].Css2 = "";
-        // this.data.CSS[css].Number = "";
-        // this.data.CSS[css].Content = "";
-        // this.data.CSS[css].Type = "";
-        // this.data.CSS[css].Tag = "";
-      //}
     }
 
     this.setData({
@@ -209,7 +206,7 @@ Page({
               if (item.Tag == "发音") {
                 str = "[读 src='" + item.SoundMark+"']" + item.Content + "[/读]";
               }
-              else if (item.Tag == "拼音") {
+              else if (item.Tag == "拼音" || item.Tag == "读写") {
                 if (item.SoundMark)
                   str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
                 else

pages/main/searchWeb2.wxml

@@ -41,7 +41,7 @@
       <view class="panelTitle1">读写</view>
     </view>
     <view class="panelItem FlexRow">
-      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-tag="读写">
+      <view class="{{CSS['CHN_TianKong_'+index].Css1}} panelItemFrame FlexRow" wx:for="{{Result.CHN.TianKong}}" wx:key="index" bindtap='getInputData' data-type="sound" data-content="{{item}}" data-css="CHN_TianKong_{{index}}" data-pinyin="{{Result.CHN.PinYin[0].pinyin}}" data-tag="读写">
         <view class="{{CSS['CHN_TianKong_'+index].Css2}} panelSelect0">{{CSS['CHN_TianKong_'+index].Number}}</view>
         <view class="text1">{{item}}</view>
       </view>

pages/main/setting.js

@@ -4,8 +4,8 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["较早的", "较近的"];
-var arrUserName = ["程杰", "程晟涵", "洪立人", "唱意班主任"];
-var arrUserID = [1, 2, 3, 4];
+var arrUserName = ["程杰", "程晟涵", "唱意班主任", "teresa", "古利古拉"];
+var arrUserID = [1, 2, 4, 8, 9];
 
 Page({
   data: {

utils/main.js

@@ -175,6 +175,9 @@ function getWindowHeight() {
     )) {
       height = 596;
     }
+    else if (app.globalData.systemInfo.model.indexOf("iPad") >= 0) {
+      height = 470;
+    }
   }
 
   height = height * 2;
@@ -184,8 +187,9 @@ function getWindowHeight() {
   else {
     height = height + 50;
   }
-  //console.log("height:" + height);
+  console.log("height:" + height);
 
+  //var height = app.globalData.systemInfo.screenHeight * 2;
   return height;
 }
 
@@ -277,15 +281,15 @@ function EncryptUrl(str) {
   if (str) {
     str = str.replace(/baidu.com/g, "#####1#####");
     str = str.replace(/iciba.com/g, "#####2#####");
-    str = str.replace(/kylx365.com/g, "#####3#####");
-    str = str.replace(/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
-
+    str = str.replace(/https:\/\/pinyin.kylx365.com\/sounds/g, "#####3#####");
+    str = str.replace(/https:\/\/miaguo-1253256735.file.myqcloud.com/g, "#####4#####");
   }
 
-  if (str.substr(0,1)=="\n")
-    str=str.substr(1);
+  if (str.substr(0, 1) == "\n")
+    str = str.substr(1);
   return str;
 }
+
 function DecryptUrl(str) {
   if (str.constructor == Array) {
     if (str.length > 0)
@@ -296,8 +300,8 @@ function DecryptUrl(str) {
   if (str) {
     str = str.replace(/#####1#####/g, "baidu.com");
     str = str.replace(/#####2#####/g, "iciba.com");
-    str = str.replace(/#####3#####/g, "kylx365.com");
-    str = str.replace(/#####4#####/g, "miaguo-1253256735.file.myqcloud.com");
+    str = str.replace(/#####3#####/g, "https://pinyin.kylx365.com/sounds");
+    str = str.replace(/#####4#####/g, "https://miaguo-1253256735.file.myqcloud.com");
   }
   return str;
 }
@@ -336,7 +340,7 @@ function changeStringToView(field) {
           if (arr[k].indexOf("[图") >= 0 && arr[k].indexOf("[/图]") > 0) {
             var obj = {};
             obj.Type = "image";
-            if (arr[k].indexOf("[图]") >= 0){
+            if (arr[k].indexOf("[图]") >= 0) {
               obj.Content = arr[k].substring(arr[k].indexOf("[图]") + 3, arr[k].indexOf("[/图]"));
               result.Images.push(obj.Content);
               result.Images2.push(obj.Content);
@@ -344,8 +348,8 @@ function changeStringToView(field) {
             else {
               var temp = arr[k].substring(arr[k].indexOf("[图"), arr[k].indexOf("[/图]"));
               obj.Url = temp.substring(temp.indexOf("url=") + 5, temp.indexOf("]") - 1);
-              temp=temp.substr(temp.indexOf("]")+1);
-              obj.Content=temp;
+              temp = temp.substr(temp.indexOf("]") + 1);
+              obj.Content = temp;
               result.Images.push(obj.Url);
               result.Images2.push(obj.Content);
             }
@@ -448,8 +452,8 @@ function getDetailColor(index) {
       Name: "每次更换配色",
     },
     {
-      ID:1,
-      Name:"黑白",
+      ID: 1,
+      Name: "黑白",
       BackColor: "#ffffff",
       BackColor1: "#D2D2D2",
       FrontColor: "#1E1E1E",
@@ -461,7 +465,7 @@ function getDetailColor(index) {
       FieldLineColor: "#4B3840",
       IconColor: "black",
       FrontColorNavigationBar: "#000000",
-      BtnPressDownColor:"#F0F0F0",
+      BtnPressDownColor: "#F0F0F0",
     },
     {
       ID: 2,
@@ -580,19 +584,25 @@ function getDetailColor(index) {
     return arr[index];
   else if (index == 0)
     return arr[common.random(1, arr.length - 1)];
-  else if (index==-1)
+  else if (index == -1)
     return arr;
 }
 
 function getPinyin(pinyin) {
+  var result = [];
   var arr = getPinyinArray();
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i][1] == pinyin) {
-      var url = app.globalData.pinyinUrl;
-      url = url.replace("[pinyin]", arr[i][0]);
-      return url;
+  var pinyinArray = pinyin.split(" ");
+  for (var j = 0; j < pinyinArray.length; j++) {
+    for (var i = 0; i < arr.length; i++) {
+      if (arr[i][1] == pinyinArray[j]) {
+        var url = app.globalData.pinyinUrl;
+        url = url.replace("[pinyin]", arr[i][0]);
+        result.push(url);
+        break;
+      }
     }
   }
+  return result.join(",");
 }
 
 function getPinyinArray() {

utils/util.js

@@ -14,6 +14,9 @@ function formatTime(date) {
   return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
 }
 
+function checkIsArray(obj) {
+  return Object.prototype.toString.call(obj) === '[object Array]';
+}
 
 function formatDateCHS(date) {
   if (date) {
@@ -260,31 +263,6 @@ function isExistStr(str1, str2) {
   return result;
 }
 
-function getSystemHeight() {
-  var systemInfo = wx.getSystemInfoSync();
-  var height = systemInfo.windowHeight;
-  if (systemInfo.model) {
-    if (height == 603 && systemInfo.model.indexOf("Plus") > 0) {
-      height = 625;
-    }
-    else if (height == 504 && (
-      systemInfo.model.indexOf("iPhone 6<") >= 0
-      || systemInfo.model.indexOf("iPhone 7<") >= 0
-      || systemInfo.model.indexOf("iPhone 6s<") >= 0
-      || systemInfo.model.indexOf("iPhone 5") >= 0
-      || systemInfo.model.indexOf("iPhone SE") >= 0
-    )) {
-      height = 596;
-    }
-  }
-
-  height = height * 2;
-  if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-    height = height + 168;
-  }
-  return height;
-}
-
 //获取存储数据，若不存在，则获得缺省值。
 function getStorageValue(obj, name, defaultStatus, callback) {
   wx.getStorage({
@@ -380,9 +358,9 @@ module.exports = {
   getEnumerationNameByDescription: getEnumerationNameByDescription,
   isExistStr: isExistStr,
   getStorageValue: getStorageValue,
-  getSystemHeight: getSystemHeight,
   ReplaceAllString: ReplaceAllString,
   addDate: addDate,
   diffDate: diffDate,
-  Trim: Trim
+  Trim: Trim,
+  checkIsArray: checkIsArray,
 }