From 8ce4133e503deec960927c8d3f86762f913714cc Mon Sep 17 00:00:00 2001
From: JiangQiang <qiangge12340@163.com>
Date: Thu, 27 May 2021 18:14:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E8=AE=AF=E9=A3=9E=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/libs/armeabi-v7a/libmsc.so                | Bin 5954032 -> 5954032 bytes
 app/src/main/assets/tts/common.jet            | Bin 4307506 -> 4307496 bytes
 app/src/main/assets/tts/xiaofeng.jet          | Bin 1333604 -> 1333594 bytes
 app/src/main/assets/tts/xiaoyan.jet           | Bin 4104543 -> 4104533 bytes
 .../business/activity/MainActivity.java       |  15 +++++++++------
 .../res/layout/activity_setting_voice.xml     |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/libs/armeabi-v7a/libmsc.so b/app/libs/armeabi-v7a/libmsc.so
index e02fc91843894332ddfe73e03c6dcb463d947845..11137619cf35cc26c776449c78444fc0b24d922c 100644
GIT binary patch
delta 306
zcmWN=$4&xK0EW?s4ZB#eg1whvW+*lk>;>#?H;(u2d<PT0#0S#E^*oOo9>M=4r~dsH
ztLrBX#Au|6W?E<^P8;oX&`B5F^w3L!KKdD8kRgUiGQuchj5EO`Dbh?a%?z{5G0y^v
zEV0ZAtE{ok2Aeo!aDTioO2219YhA}Tf#aAr&$xwb5E_%SzP0(lgkQDDQ(v>1)4UdR
zOSg4LcXdyTx~~UX(y|`vksj-bp6Z#N>xEwGl~%N>*LtJ3dZ+jLppW{b&-(IPi(WsH
E|4(;<&j0`b

delta 306
zcmWN=S587f0EW?sy?4cqii%z44$K`ZcClmEH$i!G4<>wx3(~~ryB=Ryg8xZQ_4_YY
z)lX`OQA-{5G|)&B&9u-;8|`$^Nf+Jp&`Tfv3@}KXA%+=YlrhGcAi*S4Op|1WS>{MF
z&jO1qvCImqtdYhL{Mb^I@Ftrn+R$119@umkIOF|m$$4X3*%r%hUzNyeMziWPRIls0
zp_{s;+q$DU-PJwa*8@G&BR$p=&FiV2>A7C$rC#Z^7W77M^-k~gK_B%=pMNXS%SZel
D@*{xN

diff --git a/app/src/main/assets/tts/common.jet b/app/src/main/assets/tts/common.jet
index a2fdf732bc8843cdee08ca52f103007420bc7624..39525c5f792b4c185ff1afbda90c4ece18cd8c40 100644
GIT binary patch
delta 261
zcmWNLw@$-Q002$sz4u-oEtCXsLNf<nf^eh=7BfV|3ld^DzJ(cyf$xG3z{5$Wo9^rH
zqx4x2x8rtpA4Sn?XttiSr-#Ro6q@H*BP5|(kJDNuu7q+(-}3AwZ8TeH(ch5{DM_bv
zNw@S!uk=a349K7i$*_#bsEo<DOvt26$+XPKtjx*0EXblP$+E1-s;tSnY{;f;Nsw*X
ukzLu7eJRU<9LkX#OGT=3BBydDvDBn4=W-#JawXT2$c+^9x8L0T{`><nQc-XK

delta 271
zcmWNL$4&xK000qt@4c62!?waKHb6hcg%G){2O?ZdjEC`CJezp%yYvIx!z7bA&F9}o
z{wt%_p_8_9x!h}Lwx841<5Q?)+U=(GPzg~vZd8*-6bd1E>!vSBz1dE(9!Hdkilu7&
zj`T=gdZkbLWk3dHNQPxZMrBOKWkM!pN~UE-W@S$1WkD8YNtR_rR%K1rWkWV)OSWZ4
zc4be3?8|{1%8?vPK~CgU&g5J!B$7)hN=dT4SjuuG*K#Abawiq3N=@#+dHDVL2N|7F
AaR2}S

diff --git a/app/src/main/assets/tts/xiaofeng.jet b/app/src/main/assets/tts/xiaofeng.jet
index b3e2066728499dae5d0a37520484775162962d55..dbf32ce3e6f4d66b4543c1f435e8c5915402b9ad 100644
GIT binary patch
delta 124
zcmWN_DGtI=7=_U?&of*26{d&>s`=JXiR3kDz&u1lYe)cbH`Ij9pjilYC+AnE-#T@r
zE5j>_qKD<hEnLqROBz;H$Skq_(fLE{V%wR2R^jfmyztGx5iQXc9nlp%(H8?T6eBSf
V6EPJtF&7K56f3b7n-5z%{Q>aJCDH%@

delta 134
zcmWN_I}U<C6a~=ni$4%QTX>b#MDI|6YoN4rAViz7ATo`KvAB)PA#pR-E=0PM^KJ8A
zn;#oA?yZ!1NLAn5^?Z@EqxY_mRCHp>%$8bqVxQjKZBf;>d!vy+?+=-If#?x^Vn7Uu
f5iuqLVnR%b88IgoL`X!$l8A{Fu_iVjY~}O^VHYQr

diff --git a/app/src/main/assets/tts/xiaoyan.jet b/app/src/main/assets/tts/xiaoyan.jet
index 2d266f537579b17b33f0ea6452e49f68b7dcdeb9..c547ee0eca7cbdc281ef04ea55c167abeabe06a7 100644
GIT binary patch
delta 252
zcmWN_H%`M~06<}f-g~d1{IpOUzzNN~v*1V(EM|y^7o>>c9fU)00q(%eJ(%$Dq)+en
z`>*m-mUNSD-ixB>J+wQo`ODLDNJ|z)-U?}`H<PRpCvm8StXJf3S*zX2%Kw2>q)+-~
zKn7(<hGj%XWlY9pLMCNOre#KEWlrX0K^A36mSsg&Wlh#)LpEhgwxudNvMYPCFF_9E
pP>$qSPNXKMawg|;A+gluQm*7$5@|?NZsb<(<X#>m{o=9u`43#<PIUkP

delta 262
zcmWNLH%<dV003=r&N<nHC7E>Cb0(d63unuM<|r)e1_@D2!83RSAK(wv{DX=sMjA~u
zKi_}F-<<m{-Rz@KD7=Pt=Q(?NcnnFdy<XM~Nr>uktC6;%PzmW<FMCOw?M|BaIHFEe
ztu^9zq$qvTF9R|tLozHQGAd&-E)y~-Q!*_xGAna3FAK6LOR_90vMOt`E*r8bTT+s;
yY|D=9%AN$-mjgMJBRQ6eoXDx1$+=ueB$rZ^n&f-2)a6R9<wkDhPLeMg<<Eaj!A_I_

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" />
 
             <TextView />
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 @@
     <string name="title_activity_main">主页</string>
 
     <!--    讯飞离线语音appid-->
-    <string name="app_id">601c9ec6</string>
+    <string name="app_id">602e1727</string>
 
     <!--    讯飞离线语音弹出框格式-->
     <string name="tts_toast_format" formatted="false">缓冲进度为%d%%，播放进度为%d%%</string>