Merge remote-tracking branch 'origin/dev' into dev

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -48,7 +48,6 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher;
 import com.mogo.module.service.marker.MapMarkerManager;
 import com.mogo.module.service.network.RefreshCallback;
 import com.mogo.module.service.network.RefreshModel;
-import com.mogo.module.service.network.bean.TtsConfigEntity;
 import com.mogo.module.service.ttsConfig.TtsConfigModleData;
 import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData;
 import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse;
@@ -333,8 +332,9 @@ public class MogoServices implements IMogoMapListener,
                 }
                 mIsMainPageFirstResume = false;
                 LauncherCardRefresher.getInstance(mContext).stop();
-
-                playAppTts();
+             
+                mTtsModle.playTts();
+//                playAppTts();
 
 
             } else {
@@ -390,7 +390,7 @@ public class MogoServices implements IMogoMapListener,
         if (DebugConfig.isLauncher()) {
             return;
         }
-        mTtsModle.playTts();
+       
     }
 
     /**

modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.SubscribeImpl;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.module.service.network.RefreshModel;
@@ -41,9 +42,9 @@ public class TtsConfigModleData {
      */
     public void playTts() {
 
-        Log.d("zytest", "playTts获取语音配置的网络请求");
-
-
+        if (DebugConfig.isLauncher()) {
+            return;
+        }
         mTtsConfigApiService.inquireForTts()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -59,8 +60,8 @@ public class TtsConfigModleData {
                     public void onSuccess(TtsConfigEntity o) {
                         super.onSuccess(o);
                         Log.e("zytest", "播放语音了====" + o.getResult().getWord());
-                        if  (!TextUtils.isEmpty( o.getResult().getWord())) {
-                            AIAssist.getInstance(getApp().getApplicationContext()).speakTTSVoice( o.getResult().getWord());
+                        if (!TextUtils.isEmpty(o.getResult().getWord())) {
+                            AIAssist.getInstance(getApp().getApplicationContext()).speakTTSVoice(o.getResult().getWord());
                         }
                     }
                 });

modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java

@@ -29,6 +29,7 @@ public class TtsConfigProvider implements IProvider {
         if (mTtsModleData == null) {
             mTtsModleData = new TtsConfigModleData();
         }
+
         mTtsModleData.playTts();
     }
 }