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

app/build.gradle

@@ -15,9 +15,17 @@ android {
     }
     buildTypes {
         release {
+            ndk {
+                abiFilters = ['armeabi', 'armeabi-v7a','arm64-v8a']
+            }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            ndk {
+                abiFilters = ['armeabi', 'armeabi-v7a','arm64-v8a']
+            }
+        }
     }
 }
 

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

@@ -24,6 +24,5 @@ public class EyeApplication extends BaseApplication {
 				LogUtil.e(json);
 			}
 		});
-		BDttsUtils.getInstance();//初始化百度语音
 	}
 }

app/src/main/java/com/oo/eye/activity/EyeTestActivity.java

@@ -238,8 +238,10 @@ public class EyeTestActivity extends BaseActivity {
     }
 
     private void speak(String text) {
+        if (BDttsUtils.getInstance()!=null) {
             BDttsUtils.getInstance().speak(text);
         }
+    }
 
     /**
      * 描画E字

app/src/main/java/com/oo/eye/activity/EyeTestMainActivity.java

@@ -7,6 +7,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.app.baselibrary.base.common.BaseActivity;
+import com.app.baselibrary.commonUtil.BDttsUtils;
 import com.app.baselibrary.commonUtil.LogUtil;
 import com.app.baselibrary.commonUtil.ToastUtil;
 import com.oo.eye.EyeConfig;
@@ -51,6 +52,9 @@ public class EyeTestMainActivity extends BaseActivity {
 
     @Override
     protected void init() {
+        if (BDttsUtils.getInstance()!=null) {
+            BDttsUtils.getInstance().speak("");
+        }
     }
 
     protected void onResume() {

library/baselibrary/src/main/java/com/app/baselibrary/base/app/BaseApplication.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 
-import com.app.baselibrary.commonUtil.BDttsUtils;
 import com.app.baselibrary.commonUtil.PreferencesUtils;
 import com.facebook.drawee.backends.pipeline.Fresco;
 
@@ -27,8 +26,6 @@ public class BaseApplication extends Application {
         mBaseApplication = this;
         Fresco.initialize(this);
         PreferencesUtils.putLong( "device_on_time", System.currentTimeMillis() / 1000);
-        BDttsUtils.getInstance();//初始化百度语音
-
     }
 
     public static Context getAppContext() {