diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 6fadf4f8ae..6c1f333468 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -306,7 +306,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { } MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder")); - MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG)); MogoModulePaths.addBaseModule(new MogoModule(ShareConstants.TAG, ShareConstants.MODEL_NAME)); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_TANLU_API, "TanluApi")); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_TRAFFIC_UPLOAD, "TrafficUpload")); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 776f75f0d6..4d9c01e2d7 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -63,11 +63,6 @@ public class EntranceFragment extends MvpFragment { if (mListener != null) { mListener.affirm(); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java deleted file mode 100644 index a2c88194a1..0000000000 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.module.service.ttsConfig; - -import com.mogo.module.service.network.bean.TtsConfigEntity; - -import io.reactivex.Observable; -import retrofit2.http.GET; - -/** - * @author :zhuangyan - * @date : 2020/11/16 15:09 - * @desc : - */ -public interface TtsConfigApiService { - /** - * 查询语音Tts 的 - * - */ - @GET("/dataService/car/ttsWord/no/getTTSWord/v1") - Observable inquireForTts(); -} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java deleted file mode 100644 index fbb47f5f0a..0000000000 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigModleData.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.mogo.module.service.ttsConfig; - -import android.text.TextUtils; -import android.util.Log; - -import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.voice.AIAssist; -import com.mogo.eagle.core.network.RequestOptions; -import com.mogo.eagle.core.network.SubscribeImpl; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.constants.HostConst; -import com.mogo.module.service.network.bean.TtsConfigEntity; - -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static com.mogo.commons.AbsMogoApplication.getApp; - -/** - * @author :zhuangyan - * @date : 2020/11/16 15:04 - * @desc : - */ -public class TtsConfigModleData { - private static final String TAG = "TrafficModelData"; - private final TtsConfigApiService mTtsConfigApiService; - - - public TtsConfigModleData() { - mTtsConfigApiService = MogoApisHandler.getInstance().getApis().getNetworkApi().create(TtsConfigApiService.class, HostConst.DATA_SERVICE_HOST); - } - - /** - * 独立app根据后台配置 播放tts - * - * @param - * @param - * @param - */ - public void playTts() { - - if (DebugConfig.isLauncher()) { - return; - } - mTtsConfigApiService.inquireForTts() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new SubscribeImpl(RequestOptions.create(getApp().getApplicationContext())) { - @Override - public void onError(Throwable e) { - super.onError(e); - Log.e("zytest", e.toString()); - - } - - @Override - 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()); - } - } - }); - - } - -} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java deleted file mode 100644 index 9e546142c0..0000000000 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.module.service.ttsConfig; - -import android.content.Context; -import android.text.TextUtils; -import android.util.Log; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.facade.template.IProvider; -import com.mogo.commons.voice.AIAssist; -import com.mogo.module.service.ServiceConst; -import com.mogo.module.service.network.RefreshCallback; -import com.mogo.module.service.network.bean.TtsConfigEntity; - -/** - * @author :zhuangyan - * @date : 2020/11/16 15:01 - * @desc :进入页面的时候 根据配置 播放tts语音 - */ -@Route(path = ServiceConst.PATH_TTS_CONFIG) -public class TtsConfigProvider implements IProvider { - private final String TAG = "TtsConfigProvider"; - private Context mContext; - private TtsConfigModleData mTtsModleData; - - @Override - public void init(Context context) { - mContext = context; - Log.d(TAG, "TtsConfigProvider provider init……"); - if (mTtsModleData == null) { - mTtsModleData = new TtsConfigModleData(); - } - - mTtsModleData.playTts(); - } -} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java deleted file mode 100644 index ec5c7790a6..0000000000 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/utils/LocationParseUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.module.service.utils; - -import com.mogo.eagle.core.data.map.MogoLatLng; -import com.mogo.service.cloud.location.CloudLocationInfo; - -/** - * 定位数据类型转换工具 - * - * @author tongchenfei - */ -public class LocationParseUtil { - - public static MogoLatLng cloudLocationToMogoLatLng(CloudLocationInfo info) { - if (info == null) { - return null; - } - return new MogoLatLng(info.getLat(), info.getLon()); - } -}