Merge branch 'master' of git.iouou.cn:xucongqi/haihang

app/src/main/java/com/oo/eye/EyeApplication.java

 package com.oo.eye;
 
 import com.app.baselibrary.base.app.BaseApplication;
+import com.app.baselibrary.commonUtil.BDttsUtils;
 import com.app.baselibrary.commonUtil.LogUtil;
 import com.oo.eye.db.DbManager;
 import com.oo.seex.netlibrary.net.BaseApiConfig;
@@ -24,5 +25,6 @@ public class EyeApplication extends BaseApplication {
 				LogUtil.e(json);
 			}
 		});
+		BDttsUtils.getInstance();//初始化百度语音
 	}
 }

library/baselibrary/src/main/java/com/app/baselibrary/commonUtil/BDttsUtils.java

@@ -188,27 +188,35 @@ public class BDttsUtils {
      * 释放资源
      */
     public void release() {
-        this.mSpeechSynthesizer.release();
+        if (this != null && mSpeechSynthesizer != null) {
+            this.mSpeechSynthesizer.release();
+        }
     }
 
     /**
      * 停止正在执行的任务
      */
     public void stop() {
-        this.mSpeechSynthesizer.stop();
+        if (this != null && mSpeechSynthesizer != null) {
+            this.mSpeechSynthesizer.stop();
+        }
     }
 
     /**
      * 暂停正在执行的任务
      */
     public void pause() {
-        this.mSpeechSynthesizer.pause();
+        if (this != null && mSpeechSynthesizer != null) {
+            this.mSpeechSynthesizer.pause();
+        }
     }
 
     /**
      * 恢复暂停的任务
      */
     public void resume() {
-        this.mSpeechSynthesizer.resume();
+        if (this != null && mSpeechSynthesizer != null) {
+            this.mSpeechSynthesizer.resume();
+        }
     }
 }