diff --git a/app/libs/armeabi-v7a/libmsc.so b/app/libs/armeabi-v7a/libmsc.so index e02fc91..1113761 100644 Binary files a/app/libs/armeabi-v7a/libmsc.so and b/app/libs/armeabi-v7a/libmsc.so differ diff --git a/app/src/main/assets/tts/common.jet b/app/src/main/assets/tts/common.jet index a2fdf73..39525c5 100644 Binary files a/app/src/main/assets/tts/common.jet and b/app/src/main/assets/tts/common.jet differ diff --git a/app/src/main/assets/tts/xiaofeng.jet b/app/src/main/assets/tts/xiaofeng.jet index b3e2066..dbf32ce 100644 Binary files a/app/src/main/assets/tts/xiaofeng.jet and b/app/src/main/assets/tts/xiaofeng.jet differ diff --git a/app/src/main/assets/tts/xiaoyan.jet b/app/src/main/assets/tts/xiaoyan.jet index 2d266f5..c547ee0 100644 Binary files a/app/src/main/assets/tts/xiaoyan.jet and b/app/src/main/assets/tts/xiaoyan.jet differ diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java index 4444b58..60ffed9 100644 --- a/app/src/main/java/chaoran/business/activity/MainActivity.java +++ b/app/src/main/java/chaoran/business/activity/MainActivity.java @@ -7,6 +7,7 @@ import android.content.SharedPreferences; import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -32,11 +33,11 @@ import chaoran.business.engine.VoiceEngine; /** * 提供文字转语音功能,实时播报PDA状态 */ -public class MainActivity extends AppCompatActivity implements ResultListener { +public class MainActivity extends AppCompatActivity implements ResultListener{ private WebView webView; private Adapter adapter; - private VoiceEngine voiceEngine; + //private VoiceEngine voiceEngine; private SettingEngine settingEngine; private ProgressBar progressBar; private ActionBar actionBar; @@ -48,11 +49,13 @@ public class MainActivity extends AppCompatActivity implements ResultListener { setContentView(R.layout.activity_main); initView(); initData(); + } private void initData() { BrandEnum brand = BrandEnum.code(Build.MANUFACTURER); Toast.makeText(this, Build.MANUFACTURER, Toast.LENGTH_LONG).show(); + Log.i("brand===",brand.toString()); switch (brand) { case UROBO: adapter = new UroBoAdapter(this, this); @@ -75,7 +78,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener { @SuppressLint("JavascriptInterface") private void initView() { actionBar = getSupportActionBar(); - voiceEngine = new TekVoiceEngine(this); + // voiceEngine = new TekVoiceEngine(this); settingEngine = new NetworkSettingEngine(this); webView = findViewById(R.id.webView); progressBar = findViewById(R.id.loading); @@ -85,7 +88,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener { //设置接口进行windows暴露 settings.setDomStorageEnabled(true); //语音引擎 - webView.addJavascriptInterface(voiceEngine, "TekVoiceEngine"); + // webView.addJavascriptInterface(voiceEngine, "TekVoiceEngine"); //网络设置展示 webView.addJavascriptInterface(settingEngine, "NetworkSettingEngine"); //重新加载页面 @@ -160,8 +163,8 @@ public class MainActivity extends AppCompatActivity implements ResultListener { @Override protected void onResume() { //再次唤醒该页面时,重新加载页面和语音配置 - webView.loadUrl(url()); - voiceEngine.reload(); + //webView.loadUrl(url()); + // voiceEngine.reload(); super.onResume(); } diff --git a/app/src/main/res/layout/activity_setting_voice.xml b/app/src/main/res/layout/activity_setting_voice.xml index 5b5671f..69918f6 100644 --- a/app/src/main/res/layout/activity_setting_voice.xml +++ b/app/src/main/res/layout/activity_setting_voice.xml @@ -113,7 +113,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:max="200" - android:min="100" + android:min="0" android:id="@+id/voice_speed" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2393031..4956bff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ 主页 - 601c9ec6 + 602e1727 缓冲进度为%d%%,播放进度为%d%%