diff --git a/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java b/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java index 3cf0f80644..b5aa2b650d 100644 --- a/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java +++ b/libraries/mogo-tanlu-api/src/main/java/com/zhidao/mogo/tanlu/api/MogoTanluApiProvider.java @@ -3,15 +3,10 @@ package com.zhidao.mogo.tanlu.api; import android.content.Context; import android.util.ArrayMap; -import androidx.annotation.NonNull; - import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.analytics.AnalyticsUtils; -import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.TanluUploadParams; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.TanluUploadParams; import com.mogo.utils.logger.Logger; import com.zhidao.roadcondition.service.MainService; import com.zhidao.roadcondition.service.UploadParams; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index be7bb6d82a..237537b3db 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -37,8 +37,8 @@ import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.TanluUploadParams; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.TanluUploadParams; import com.mogo.utils.NetworkUtils; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -77,15 +77,15 @@ import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_NO_REPLY_S import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_PUB_ROAD_CONDITION; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_PUB_TROUBLE_HELP; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_SHARE_DIALOG_CLOSE; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_ACCIDENT; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_BLOCK; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_CLOSURE; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_DENSE_FOG; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_ROAD_ICY; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_STAGNANT_WATER; -import static com.mogo.service.tanlu.IMogoTanluProvider.TYPE_TRAFFIC_CHECK; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_ACCIDENT; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_BLOCK; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_CLOSURE; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_DENSE_FOG; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_REAL_TIME_TRAFFIC; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_ROAD_CONSTRUCTION; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_ROAD_ICY; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_STAGNANT_WATER; +import static com.mogo.service.share.IMogoTanluProvider.TYPE_TRAFFIC_CHECK; /** * 分享框的逻辑都放到这里吧 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt index 17ec692ef6..f80afbfa52 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt @@ -2,7 +2,7 @@ package com.mogo.module.share.bean import com.mogo.commons.data.BaseData import com.mogo.module.share.R -import com.mogo.service.tanlu.IMogoTanluProvider.* +import com.mogo.service.share.IMogoTanluProvider.* /** * 可配置按钮封装 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 8b8eaa14ee..c3d16fe965 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -17,8 +17,8 @@ import com.mogo.service.IMogoServiceApis import com.mogo.service.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics import com.mogo.service.statusmanager.IMogoStatusManager -import com.mogo.service.tanlu.IMogoTanluProvider -import com.mogo.service.tanlu.TanluUploadParams +import com.mogo.service.share.IMogoTanluProvider +import com.mogo.service.share.TanluUploadParams import com.mogo.utils.logger.Logger import kotlin.random.Random diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 238667d7fb..bf5bcf8365 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -18,8 +18,8 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.TanluUploadParams; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.TanluUploadParams; import com.mogo.utils.logger.Logger; diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 7dd041a33e..07d436adba 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -9,7 +9,7 @@ import android.widget.TextView import com.mogo.module.share.R import com.mogo.module.share.bean.FixableButton import com.mogo.module.share.constant.ShareConstants -import com.mogo.service.tanlu.IMogoTanluProvider +import com.mogo.service.share.IMogoTanluProvider import com.mogo.utils.glide.GlideApp import com.mogo.utils.logger.Logger import com.mogo.utils.network.utils.GsonUtil diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt index 62cc8b2584..855e5bfbbd 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/UploadHelper.kt @@ -1,15 +1,11 @@ package com.mogo.module.share.manager import android.content.Context -import android.content.Intent import com.mogo.commons.debug.DebugConfig import com.mogo.commons.voice.AIAssist import com.mogo.map.MogoLatLng -import com.mogo.map.location.MogoLocation import com.mogo.module.share.R -import com.mogo.module.share.ShareControl -import com.mogo.module.share.dialog.LaucherShareDialog -import com.mogo.service.tanlu.TanluUploadParams +import com.mogo.service.share.TanluUploadParams import com.mogo.utils.NetworkUtils import com.mogo.utils.TipDrawable import com.mogo.utils.TipToast diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt index 242faf2381..987454e88b 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/AccidentStrategyReceiver.kt @@ -6,8 +6,8 @@ import com.mogo.module.share.strategyreceiver.AccidentStrategyPushWrapper.Compan import com.mogo.module.share.strategyreceiver.AccidentStrategyPushWrapper.Companion.TYPE_BLOCK import com.mogo.service.IMogoServiceApis import com.mogo.service.connection.IMogoOnMessageListener -import com.mogo.service.tanlu.IMogoTanluProvider -import com.mogo.service.tanlu.TanluUploadParams +import com.mogo.service.share.IMogoTanluProvider +import com.mogo.service.share.TanluUploadParams import com.mogo.utils.logger.Logger /** diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 1cc241dddc..b8ba3c7cc8 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -11,9 +11,8 @@ import com.mogo.module.share.constant.HttpConstant import com.mogo.module.share.manager.ServiceApisManager import com.mogo.module.share.net.ShareApiService import com.mogo.service.IMogoServiceApis -import com.mogo.service.tanlu.IMogoTanluProvider -import com.mogo.service.tanlu.TanluUploadParams -import com.mogo.utils.DeviceIdUtils +import com.mogo.service.share.IMogoTanluProvider +import com.mogo.service.share.TanluUploadParams import com.mogo.utils.logger.Logger import com.mogo.utils.network.RequestOptions import com.mogo.utils.network.utils.GsonUtil diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/callback/UploadShareCallback.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/callback/UploadShareCallback.java index c0ae07ea7a..550b674874 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/callback/UploadShareCallback.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/callback/UploadShareCallback.java @@ -5,7 +5,7 @@ import com.mogo.commons.data.BaseData; /** * @author lixiaopeng - * @description 上报分享 + * @description 上报分享 废弃 * @since 2020-01-09 */ public interface UploadShareCallback { diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java deleted file mode 100644 index 7766ac1280..0000000000 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java +++ /dev/null @@ -1,1713 +0,0 @@ -package com.mogo.module.tanlu.fragment; - -import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.Rect; -import android.os.Bundle; -import android.os.CountDownTimer; -import android.os.Handler; -import android.text.TextUtils; -import android.view.MotionEvent; -import android.view.View; -import android.view.animation.Interpolator; -import android.view.animation.LinearInterpolator; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.commons.data.BaseData; -import com.mogo.commons.mvp.IView; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.mvp.Presenter; -import com.mogo.commons.voice.AIAssist; -import com.mogo.commons.voice.IMogoVoiceCmdCallBack; -import com.mogo.map.MogoLatLng; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.location.MogoLocation; -import com.mogo.map.marker.IMogoMarker; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.marker.IMogoMarkerManager; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.map.marker.anim.OnMarkerAnimationListener; -import com.mogo.map.model.MogoPoi; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.map.navi.MogoNaviInfo; -import com.mogo.map.navi.MogoTraffic; -import com.mogo.map.search.geo.IMogoGeoSearch; -import com.mogo.map.search.geo.IMogoGeoSearchListener; -import com.mogo.map.search.geo.MogoGeocodeAddress; -import com.mogo.map.search.geo.MogoGeocodeResult; -import com.mogo.map.search.geo.MogoPoiItem; -import com.mogo.map.search.geo.MogoRegeocodeResult; -import com.mogo.map.search.geo.query.MogoGeocodeQuery; -import com.mogo.map.search.poisearch.IMogoPoiSearch; -import com.mogo.map.search.poisearch.IMogoPoiSearchListener; -import com.mogo.map.search.poisearch.MogoPoiResult; -import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery; -import com.mogo.map.uicontroller.EnumMapUI; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.module.common.entity.MarkerExploreWay; -import com.mogo.module.common.entity.MarkerExploreWayItem; -import com.mogo.module.common.entity.MarkerLocation; -import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.common.entity.MarkerUserInfo; -import com.mogo.module.tanlu.R; -import com.mogo.module.tanlu.callback.DataSetChangedAdapter; -import com.mogo.module.tanlu.callback.NaviCallback; -import com.mogo.module.tanlu.callback.RoadLineCallback; -import com.mogo.module.tanlu.callback.UploadShareCallback; -import com.mogo.module.tanlu.callback.VoiceSearchCallback; -import com.mogo.module.tanlu.constant.TanluConstants; -import com.mogo.module.tanlu.model.Center; -import com.mogo.module.tanlu.model.Information; -import com.mogo.module.tanlu.model.Items; -import com.mogo.module.tanlu.model.NaviResult; -import com.mogo.module.tanlu.model.PathLineResult; -import com.mogo.module.tanlu.model.TanluModelData; -import com.mogo.module.tanlu.model.VoiceSearchResult; -import com.mogo.module.tanlu.model.event.ControlClickUpInfo; -import com.mogo.module.tanlu.model.event.DataErrorInfo; -import com.mogo.module.tanlu.model.event.GetInfoError; -import com.mogo.module.tanlu.model.event.MarkerInfo; -import com.mogo.module.tanlu.model.event.PushTypeInfo; -import com.mogo.module.tanlu.model.event.SharedialogEvent; -import com.mogo.module.tanlu.model.event.StartPlayInfo; -import com.mogo.module.tanlu.model.event.VoiceControlUpInfo; -import com.mogo.module.tanlu.util.LocationUtils; -import com.mogo.module.tanlu.util.Utils; -import com.mogo.module.tanlu.view.NetErrorDialog; -import com.mogo.module.tanlu.view.UploadFailedDialog; -import com.mogo.service.IMogoServiceApis; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.adas.IMogoADASController; -import com.mogo.service.analytics.IMogoAnalytics; -import com.mogo.service.cardmanager.IMogoCardManager; -import com.mogo.service.datamanager.IMogoDataChangedListener; -import com.mogo.service.fragmentmanager.IMogoFragmentManager; -import com.mogo.service.imageloader.IMogoImageloader; -import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.service.intent.IMogoIntentManager; -import com.mogo.service.map.IMogoMapService; -import com.mogo.service.module.IMogoActionListener; -import com.mogo.service.module.IMogoActionManager; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.module.MogoAction; -import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.utils.TipToast; -import com.mogo.utils.logger.Logger; -import com.shuyu.gsyvideoplayer.GSYVideoManager; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import static android.view.View.OVER_SCROLL_NEVER; -import static com.mogo.module.tanlu.video.VideoInitKt.initVideo; - -/** - * @author lixiaopeng - * @description 探路卡片 - * @since 2020-01-02 - */ -public class TanluCardViewFragment extends MvpFragment> - implements IView, - IMogoMarkerClickListener, - IMogoModuleLifecycle, - IMogoMapListener, - IMogoPoiSearchListener, - IMogoLocationListener, - View.OnClickListener, - IMogoDataChangedListener, - IMogoGeoSearchListener { - - private static final String TAG = "TanluCardViewFragment"; - //map - private IMogoMarkerManager mMarkerManager; - private IMogoMapService mMogoMapService; - private IMogoCardManager iMogoCardManager; - private IMogoStatusManager mMogoStatusManager; - private IMogoIntentManager mogoIntentManager; - private IMogoMapUIController mMApUIController; - private IMogoAnalytics mAnalytics; - private IMogoGeoSearch mIMogoGeoSearch; - private IMogoFragmentManager mIMogoFragmentManager; - private IMogoImageloader mogoImageloader; - private IMogoADASController mADASController; - - //语音上一条，下一条 - private IMogoServiceApis mIMogoServiceApis; - private IMogoActionManager mActionManager; - - //声音控制文字 - private String voiceGetInfoMationTts; - // private String[] searchingVoiceStrings; - private String[] searchfaileVoiceStrings; - private String voiceShareSuccessTts; - - private List markerExploreWayList = new ArrayList<>(); - private int mCurrentPosition = 0; //卡片媒体当前位置 - private Bitmap mMarkerIcon; - private Bitmap multiMarkerIcon; - private TanluModelData mTanluModelData; - private List passedByPoints; - private IMogoRegisterCenter mMogoRegisterCenter; - private String mKeywords; - private boolean isCurrentPage; - //新修改 - private RecyclerView mLoopRecyclerView; -// private TanluSlideAdapter mTanluSlideAdapter; - private RelativeLayout mEmptyLayout; - private TextView mEmptyTv; - - - @Override - protected int getLayoutId() { - return R.layout.tanlu_main_media_recycler; - } - - @Override - protected void initViews() { - initVideo(); - initInterface(); - - mLoopRecyclerView = findViewById(R.id.tanlu_rloop_recycleview); - mEmptyLayout = findViewById(R.id.layout_empty_data_show); - mEmptyTv = findViewById(R.id.tv_main_empty); - mEmptyTv.setOnClickListener(this); - mEmptyLayout.setVisibility(View.VISIBLE); - mLoopRecyclerView.setVisibility(View.GONE); - - mLoopRecyclerView.setHasFixedSize(true); - mLoopRecyclerView.setOverScrollMode(OVER_SCROLL_NEVER); - GridLayoutManager layoutManage = new GridLayoutManager(getContext(), 1); - mLoopRecyclerView.setLayoutManager(layoutManage); - -// mTanluSlideAdapter = new TanluSlideAdapter(getContext(), mAnalytics); -// mLoopRecyclerView.setAdapter(mTanluSlideAdapter); - - //保证滑动单页显示 -// PagerSnapHelper snapHelper = new PagerSnapHelper(); -// snapHelper.attachToRecyclerView(mLoopRecyclerView); - - //滑动监听 - mLoopRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { - @Override - public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) { -// super.onScrollStateChanged(recyclerView, newState); - if (recyclerView != null && recyclerView.getChildCount() > 0) { - try { - int currentPositionPage = ((RecyclerView.LayoutParams) recyclerView.getChildAt(0).getLayoutParams()).getViewAdapterPosition(); - Logger.e(TAG, "fragment currentPositionPage = " + currentPositionPage + " >>> size = " + markerExploreWayList.size() + " >>mCurrentPosition = " + mCurrentPosition); - if (currentPositionPage >= markerExploreWayList.size()) { - return; - } - - if (mCurrentPosition != currentPositionPage) { - mCurrentPosition = currentPositionPage; - Logger.d(TAG, "fragment-------mCurrentPosition = " + mCurrentPosition); - moveMapLocation(mCurrentPosition); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Override - public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { -// super.onScrolled(recyclerView, dx, dy); - } - }); - } - - /** - * 移动地图位置 - */ - private void moveMapLocation(int currentPositionPage) { - Logger.d(TAG, "fragment moveMapLocation size() =" + markerExploreWayList.size() + " >>>currentPositionPage = " + currentPositionPage); - if (markerExploreWayList.size() > currentPositionPage) { - MarkerExploreWay exploreWay = markerExploreWayList.get(currentPositionPage); - mActionManager.bizInvoke(TanluConstants.MODEL_NAME, currentPositionPage, markerExploreWayList.get(currentPositionPage)); - moveMapToInfoFragement(exploreWay); - } else { - Logger.e(TAG, "Fragment error markerExploreWayList.size() <= currentPositionPage "); - } - } - - /** - * 移动地图到某个位置 - * - * @param exploreWay - */ - private void moveMapToInfoFragement(MarkerExploreWay exploreWay) { - //经度 - Double longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - //纬度 - Double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - - if (exploreWay.getLocation() == null) { - return; - } - double distance = LocationUtils.getDistance(lat, longit, exploreWay.getLocation().getLat(), exploreWay.getLocation().getLon()); - Logger.e(TAG, " fragment moveMapToInfoFragement distance =" + distance); - if (distance >= 20000) { - moveToMarcker(exploreWay.getLocation().getLat(), exploreWay.getLocation().getLon()); - } else { - Rect rect = new Rect( - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_left), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_top), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_right), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_bottom)); - Logger.d(TAG, " Fragment moveMapToInfoFragement size() = " + getList(exploreWay).size()); - moveNotFresh(); - //第一个参数：调用者,第二个参数：当前自车的位置,第三个参数：需要显示在范围内的点（不包含自车的位置） - //第四个参数：显示范围的UI边界,第五个参数：是否锁定自车位置（看业务需要） - mMApUIController.showBounds(TanluConstants.MODEL_NAME, new MogoLatLng(lat, longit), - getList(exploreWay), rect, true); - } - } - - private void moveNotFresh() { - mMogoStatusManager.setUserInteractionStatus(TAG, true, false); - } - - - /** - * 构造经纬度列表 - * - * @param markerExploreWay - * @return - */ - private List getList(MarkerExploreWay markerExploreWay) { - List list = new ArrayList<>(); - if (markerExploreWay != null) { - MarkerLocation location = markerExploreWay.getLocation(); - if (location != null) { - Logger.d(TAG, "getList location.getLon() =" + location.getLon() + " >>>location.getLat()=" + location.getLat()); - MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon()); - //经度 - Double longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - //维度 - Double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - - list.add(mogoLatLng); - } else { - Logger.e(TAG, "getList() location == null"); - } - } else { - Logger.e(TAG, "getList() markerExploreWay == null"); - } - return list; - } - - - private void initInterface() { - mIMogoServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(); - mActionManager = mIMogoServiceApis.getActionManagerApi(); - mADASController = mIMogoServiceApis.getAdasControllerApi(); - - //地图marker，地图操作 - mMogoMapService = (IMogoMapService) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICES_MAP).navigation(getActivity()); - mMarkerManager = mMogoMapService.getMarkerManager(getContext()); - mMApUIController = mMogoMapService.getMapUIController(); - //地图逆序 - mIMogoGeoSearch = mMogoMapService.getGeoSearch(getContext()); - mogoImageloader = (IMogoImageloader) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_IMAGE_LOADER).navigation(); - //切换卡片操作 - iMogoCardManager = (IMogoCardManager) ARouter.getInstance().build(MogoServicePaths.PATH_CARD_MANAGER).navigation(getActivity()); - mMogoRegisterCenter = (IMogoRegisterCenter) ARouter.getInstance().build(MogoServicePaths.PATH_REGISTER_CENTER).navigation(getContext()); - mMogoRegisterCenter.registerMogoModuleLifecycle(TanluConstants.MODEL_NAME, this); - //唤醒 - mogoIntentManager = (IMogoIntentManager) ARouter.getInstance().build(MogoServicePaths.PATH_INTENT_MANAGER).navigation(getContext()); - - mMogoStatusManager = (IMogoStatusManager) ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_MANAGER).navigation(getContext()); - mAnalytics = (IMogoAnalytics) ARouter.getInstance().build(MogoServicePaths.PATH_UTILS_ANALYTICS).navigation(getContext()); - - mIMogoFragmentManager = (IMogoFragmentManager) ARouter.getInstance().build(MogoServicePaths.PATH_FRAGMENT_MANAGER).navigation(getContext()); - - mIMogoGeoSearch.setGeoSearchListener(this); - DataSetChangedAdapter.getInstance().setDelegate(this); - } - - @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - getViewLifecycleOwner().getLifecycle().addObserver(mPresenter); - EventBus.getDefault().register(this); - initModelData(); - initMap(); - initStrings(); - initListener(); - Logger.d(TAG, "onActivityCreated ------>"); - // 数据先到，卡片后创建 - initData(DataSetChangedAdapter.getInstance().getData()); - sendShareReceiver("0"); - } - - private void initModelData() { - if (mTanluModelData == null) { - mTanluModelData = new TanluModelData(getContext()); - } - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - public void onRegeocodeSearched(MogoRegeocodeResult regeocodeResult) { - Logger.d(TAG, "onRegeocodeSearched -----> "); - } - - @Override - public void onGeocodeSearched(MogoGeocodeResult geocodeResult) { - Logger.d(TAG, "onGeocodeSearched ------mKeywords =" + mKeywords); - if (geocodeResult != null) { - if (geocodeResult.getAddresses() != null && geocodeResult.getAddresses().size() > 0) { - Logger.d(TAG, "geocodeResult.getAddresses().size() = " + geocodeResult.getAddresses().size()); - MogoGeocodeAddress geocodeAddress = geocodeResult.getAddresses().get(0); - MogoLatLng latLon = geocodeAddress.getLatlng(); - Double longit; //经度 - Double lat; //维度 - if (mKeywords.equals("附近")) { - Logger.d(TAG, "附近 ----1---"); - longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - } else { - Logger.d(TAG, "其他 ---1----"); - longit = latLon.lng; - lat = latLon.lat; - } - Logger.d(TAG, "geoSearch keywords =" + mKeywords + ">>longitude= " + longit + "--latitude= " + lat); - getVoiceControlRoadData(mKeywords, lat, longit); - } else { - Logger.d(TAG, "onGeocodeSearched ------mKeywords =" + mKeywords); - handlePoi(mKeywords); - } - } else { - Logger.e(TAG, "geocodeResult.getAddresses() == null"); - speakFailVoice(searchfaileVoiceStrings[2]); - } - } - - - /** - * 初始化导航 - */ - private void initMap() { - mMogoRegisterCenter.registerMogoNaviListener(TanluConstants.MODEL_NAME, new IMogoNaviListener() { - @Override - public void onInitNaviFailure() { - } - - @Override - public void onInitNaviSuccess() { - } - - @Override - public void onNaviInfoUpdate(MogoNaviInfo naviinfo) { - } - - @Override - public void onStartNavi() { //开始导航 - Logger.d(TAG, "onStartNavi ------> "); - initModelData(); - getNavigationData(); - } - - @Override - public void onStopNavi() { - } - - @Override - public void onCalculateSuccess() { - } - - @Override - public void onoCalculateFailed() { - } - - @Override - public void onUpdateTraffic(MogoTraffic traffic) { - } - }); - - //监听marker点击 - mMogoRegisterCenter.registerMogoMarkerClickListener(TanluConstants.MODEL_NAME, new IMogoMarkerClickListener() { - @Override - public boolean onMarkerClicked(IMogoMarker marker) { - //marker 点击 - Map properties = new HashMap<>(); - properties.put("type", "2"); - mAnalytics.track(TanluConstants.LAUNCHER_ICON_CLICK, properties); - - MarkerExploreWay exploreWay = extractFromMarker(marker); - if (exploreWay == null) { // 自己打点数据 - double lat = marker.getPosition().lat; - //更新当前位置 - for (int i = 0; i < markerExploreWayList.size(); i++) { - if (markerExploreWayList.get(i).getLocation().getLat() == lat) { - mCurrentPosition = i; - break; - } - } - Logger.d(TAG, "onMarkerClicked 自己打点数据 mCurrentPosition = " + mCurrentPosition + " >>size = " + markerExploreWayList.size()); - mActionManager.bizInvoke(TanluConstants.MODEL_NAME, mCurrentPosition, markerExploreWayList.get(mCurrentPosition)); - if (markerExploreWayList.size() == 1) { - //不处理 - } else { - mLoopRecyclerView.scrollToPosition(mCurrentPosition); - } - } else { //大而全数据 - double lat = exploreWay.getLocation().getLat(); - for (int i = 0; i < markerExploreWayList.size(); i++) { - if (markerExploreWayList.get(i).getLocation().getLat() == lat) { - mCurrentPosition = i; - break; - } - } - Logger.d(TAG, "onMarkerClicked 大而全数据 mCurrentPosition = " + mCurrentPosition + " >>size = " + markerExploreWayList.size()); - mActionManager.bizInvoke(TanluConstants.MODEL_NAME, mCurrentPosition, markerExploreWayList.get(mCurrentPosition)); - if (markerExploreWayList.size() == 1) { - //不处理 - } else { - mLoopRecyclerView.scrollToPosition(mCurrentPosition); - } - } - return false; - } - }); - } - - /** - * 处理关键词搜索 - * - * @return - */ - private void handleActionFoo(String keywords) { - speakSearchingVoice(); - MogoGeocodeQuery geocodeQuery; - String cityCode = TanluServiceManager.getLocationClient().getLastKnowLocation().getCityCode(); - - geocodeQuery = new MogoGeocodeQuery(); - geocodeQuery.setLocationName(keywords); - geocodeQuery.setCity(cityCode); - mIMogoGeoSearch.getFromLocationNameAsyn(geocodeQuery); - } - - /** - * poi 搜索 - * - * @param keywords - */ - private void handlePoi(String keywords) { - String cityCode = TanluServiceManager.getLocationClient().getLastKnowLocation().getCityCode(); - MogoPoiSearchQuery poiSearchQuery = new MogoPoiSearchQuery(keywords, "", cityCode); - IMogoPoiSearch poiSearch = mMogoMapService.getPoiSearch(getContext(), poiSearchQuery); - poiSearch.setPoiSearchListener(this); - poiSearch.searchPOIAsyn(); - } - - /** - * 注册listener监听 - */ - private void initListener() { - mogoIntentManager.registerIntentListener(TanluConstants.SPECIFIEDROAD_SEARCH, mogoIntentListener); - mogoIntentManager.registerIntentListener(TanluConstants.PLAY_VIDEO_AWAKEN, mogoIntentListener); - } - - /** - * 唤醒语音 - */ - private IMogoIntentListener mogoIntentListener = new IMogoIntentListener() { - @Override - public void onIntentReceived(String intentStr, Intent intent) { - String data = intent.getStringExtra("data"); - Logger.d(TAG, "唤醒 mogoIntentListener intentStr =" + intentStr + ">>data =" + data); - if (intentStr.equals(TanluConstants.SPECIFIEDROAD_SEARCH)) { //地点堵不堵 --ok - try { - JSONObject jsonObject = new JSONObject(data); - mKeywords = jsonObject.get("location").toString(); - Logger.d(TAG, "mogoIntentListener specified mKeywords = " + mKeywords); - handleActionFoo(mKeywords); - } catch (Exception e) { - e.printStackTrace(); - } - } else if (intentStr.equals(TanluConstants.PLAY_VIDEO_AWAKEN)) { //播放路况 唤醒 - Logger.d(TAG, "mogoIntentListener 播放路况 唤醒 ----> "); - delayTime(); - } - } - }; - - - /** - * 免唤醒语音监听 - */ - private IMogoVoiceCmdCallBack mogoVoiceListener = new IMogoVoiceCmdCallBack() { - @Override - public void onCmdSelected(String cmd) { - Logger.d(TAG, "mogoVoiceListener cmd = " + cmd); - if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok - //语音会中断播放 - AIAssist.getInstance(getContext()).speakTTSVoice(getString(R.string.tanlu_prepare_play), null); - delayTime(); - } - } - - @Override - public void onCmdAction(String speakText) { - } - - @Override - public void onCmdCancel(String speakText) { - } - - @Override - public void onSpeakEnd(String speakText) { - } - - @Override - public void onSpeakSelectTimeOut(String speakText) { - } - }; - - - /** - * 上一条，下一条 - */ - private IMogoActionListener mogoActionListener = new IMogoActionListener() { - @Override - public void onActionDone(MogoAction mogoAction) { - Logger.d(TAG, "mogoActionListener mogoAction = " + mogoAction); - if (mogoAction == MogoAction.Prev) { - EventBus.getDefault().post(new VoiceControlUpInfo("1")); - } else if (mogoAction == MogoAction.Next) { - EventBus.getDefault().post(new VoiceControlUpInfo("2")); - } - } - }; - - - private void delayTime() { - new Handler().postDelayed(new Runnable() { - public void run() { - EventBus.getDefault().post(new StartPlayInfo(mCurrentPosition)); - } - }, 1500); - } - - /** - * type=1 路况 - * type=2 油价 - * type=3 交通检查 - * type=4 封路 - * - * @param type - */ - private void traceTypeData(String type) { - Map properties = new HashMap<>(); - properties.put("type", type); - mAnalytics.track(TanluConstants.LAUNCHER_SHARE_TYPE, properties); - } - - /** - * 分享/上报按钮点击 from=1 手动点击 from=2 语音打开 - * - * @param from - */ - private void traceData(String from) { - Map properties = new HashMap<>(); - properties.put("from", from); - mAnalytics.track(TanluConstants.LAUNCHER_SHARE_CLICK, properties); - } - - private void traceTanluData(String type) { - Map properties = new HashMap<>(); - properties.put("type", type); - mAnalytics.track(TanluConstants.CARNET_USER_UPLOAD, properties); - } - - /** - * 发送广播 audiofocus - */ - private void sendAudioFocusReceiver() { - Logger.d(TAG, "TanluCardViewFragment sendAudioFocusReceiver ---->"); - Intent intent = new Intent(); - intent.setAction("com.zhidao.action.audio.package"); - intent.putExtra("package", "com.mogo.module.tanlu"); - getContext().sendBroadcast(intent); - } - - /** - * 发送广播 type： 1拥堵，2交通检查，3封路，4实时路况，5积水，6积冰，7大雾，8事故 - */ - private void sendShareReceiver(String type) { - if (!type.equals("0")) { - mMogoStatusManager.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", true); - } - - Logger.d(TAG, "TanluCardViewFragment sendShareReceiver ---->"); - Intent intent = new Intent(); - intent.setAction("com.zhidao.share.roadcondition.action"); - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); - intent.putExtra("type", type); - getContext().sendBroadcast(intent); - } - - - private MarkerExploreWay extractFromMarker(IMogoMarker marker) { - if (marker == null) { - return null; - } - if (marker.getObject() instanceof MarkerShowEntity) { - MarkerShowEntity showEntity = ((MarkerShowEntity) marker.getObject()); - if (showEntity.getBindObj() instanceof MarkerExploreWay) { - return ((MarkerExploreWay) showEntity.getBindObj()); - } - } - - return null; - } - - /** - * @param view - */ - @Override - public void onClick(View view) { - int id = view.getId(); - if (id == R.id.tv_main_empty) { //上报路况 - sendShareReceiver("1"); - } - } - - private void moveToMarcker(double lat, double lon) { - MogoLatLng latLng = new MogoLatLng(lat, lon); - mMogoStatusManager.setUserInteractionStatus(TAG, true, false); - mMApUIController.moveToCenter(latLng); - } - - /** - * marker点击事件 - * - * @param marker - * @return - */ - @Override - public boolean onMarkerClicked(IMogoMarker marker) { - return true; - } - - @NonNull - @Override - protected Presenter createPresenter() { - return new Presenter(this) { - }; - } - - /** - * C位事件,如何获取数据，需要有默认数据 - * 如果只有一个数据，不显示上下切换按钮，没有数据显示空页面 - */ - @Override - public void onPerform() { - //免唤醒 - AIAssist.getInstance(getActivity()).registerUnWakeupCommand(TanluConstants.PLAY_VIDEO, - TanluConstants.CMD_PLAY_ROAD_CONDITION, mogoVoiceListener); - mActionManager.registerActionListener(TanluConstants.MODEL_NAME, mogoActionListener); - - isCurrentPage = true; - Logger.d(TAG, "tanlu卡片 onPerform 有效 ---->"); - new Handler().postDelayed(new Runnable() { - public void run() { - renderCardViews(); - } - }, 500); - } - - /** - * 根据数据展示页面 - */ - private void renderCardViews() { - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - mEmptyLayout.setVisibility(View.GONE); - mLoopRecyclerView.setVisibility(View.VISIBLE); - Logger.d(TAG, "renderCardViews size = " + markerExploreWayList.size()); -// mTanluSlideAdapter.setDatas(markerExploreWayList); -// mTanluSlideAdapter.notifyDataSetChanged(); - } else { - mLoopRecyclerView.setVisibility(View.GONE); - mEmptyLayout.setVisibility(View.VISIBLE); -// mEmptyTv.setText(Html.fromHtml(getContext().getString(R.string.main_empty_content))); - Logger.e(TAG, "renderCardViews markerExploreWayList == null "); - } - } - - @Override - public void onDataSetChanged(Object data) { - Logger.d(TAG, "receive data changed. isCurrentPage = " + isCurrentPage); - initData(data); - if (isCurrentPage) { //更新数据 - Logger.d(TAG, "receive data changed 111 -------> "); - renderCardViews(); - } - } - - private void initData(Object data) { - if (markerExploreWayList != null) { - markerExploreWayList.clear(); - } else { - markerExploreWayList = new ArrayList<>(); - } - try { - markerExploreWayList.addAll((List) data); - Logger.d(TAG, "initData size = " + markerExploreWayList.size()); - } catch (Exception e) { - Logger.e(TAG, e, "error."); - } - } - - /** - * 离开C位事件 - */ - @Override - public void onDisable() { - Logger.d(TAG, "tanlu卡片 无效 ----->"); - isCurrentPage = false; - - AIAssist.getInstance(getActivity()).unregisterUnWakeupCommand(TanluConstants.PLAY_VIDEO); - if (mActionManager != null) { - mActionManager.unregisterActionListener(TanluConstants.MODEL_NAME, mogoActionListener); - } - } - - @Override - public void accOn() { - - } - - @Override - public void onMapLoaded() { - } - - @Override - public void onTouch(MotionEvent motionEvent) { - } - - @Override - public void onPOIClick(MogoPoi poi) { - if (poi != null) { - TipToast.shortTip(poi.getName()); - TanluServiceManager.getPoiSearch().searchPOIIdAsyn(poi.getPoiId()); - } - } - - /** - * poi - * - * @param p0 - * @param p1 - */ - @Override - public void onPoiSearched(MogoPoiResult p0, int p1) { - if (p1 == 1000) { - if (p0.getPois() != null && p0.getPois().size() > 0) { - MogoPoiItem poi = p0.getPois().get(0); - MogoLatLng latLon = poi.getPoint(); - Double longit; //经度 - Double lat; //维度 - if (mKeywords.equals("附近")) { - Logger.d(TAG, "附近 -onPoiSearched---1---"); - longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - } else { - Logger.d(TAG, "其他 -onPoiSearched---1----"); - longit = latLon.lng; - lat = latLon.lat; - } - getVoiceControlRoadData(mKeywords, lat, longit); - Logger.d(TAG, "setOnPoiSearchListener keywords =" + mKeywords + ">>longitude= " + longit + "--latitude" + lat); - } else { - Logger.e(TAG, "poi == null"); - Double longit; //经度 - Double lat; //维度 - if (mKeywords.equals("附近")) { - Logger.d(TAG, "附近 -onPoiSearched---2---"); - longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - getVoiceControlRoadData(mKeywords, lat, longit); - } else { - Logger.d(TAG, "其他 -onPoiSearched---2----"); - speakFailVoice(searchfaileVoiceStrings[2]); - } - } - } else { - Logger.e(TAG, "poi search result p1 = " + p1); - speakFailVoice(searchfaileVoiceStrings[2]); - } - } - - @Override - public void onPoiItemSearched(MogoPoiItem item, int errorCode) { - if (item == null) { - return; - } - } - - @Override - public void onLocationChanged(MogoLocation location) { - } - - @Override - public void onMapClick(MogoLatLng latLng) { - - } - - @Override - public void onLockMap(boolean isLock) { - - } - - @Override - public void onMapModeChanged(EnumMapUI ui) { - Logger.d(TAG, ui.name()); - } - - @Override - public void onMapChanged(MogoLatLng location, float zoom, float tilt, float bearing) { - - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - EventBus.getDefault().unregister(this); - getViewLifecycleOwner().getLifecycle().removeObserver(mPresenter); - TanluServiceManager.getLocationClient().removeLocationListener(this); - mMogoRegisterCenter.unregisterMogoNaviListener(TanluConstants.MODEL_NAME); - Logger.d(TAG, "onDestroyView --------> "); - GSYVideoManager.releaseAllVideos(); -// if (mTanluSlideAdapter != null) { -// mTanluSlideAdapter.release(); -// } - } - - /** - * 列表滑动位置 - * - * @param event - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onButtonUpAndDown(final ControlClickUpInfo event) { - if (event != null) { - Logger.d(TAG, " onButtonUpAndDown event.type = " + event.type + " >>>mCurrentPosition = " + mCurrentPosition); - if (event.type.equals("1")) { //上一条 - if (mCurrentPosition > 0) { - mLoopRecyclerView.smoothScrollToPosition(mCurrentPosition - 1); - } else { - Logger.e(TAG, " onButtonUpAndDown 上一条 mCurrentPosition <= 0 "); - TipToast.shortTip("已经是第一条"); - } - } else if (event.type.equals("2")) { //下一条 - if (mCurrentPosition >= (markerExploreWayList.size() - 1)) { - TipToast.shortTip("已经是最后一条"); - Logger.e(TAG, " onButtonUpAndDown 下一条 mCurrentPosition >= markerExploreWayList.size() - 1"); - } else { - mLoopRecyclerView.smoothScrollToPosition(mCurrentPosition + 1); - } - } - } else { - Logger.e(TAG, "onButtonUpAndDown event == null "); - } - } - - /** - * 接收到错误数据信息 - * - * @param event - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onDataErrorInfo(final DataErrorInfo event) { - if (event == null) { - return; - } - Logger.d(TAG, " onDataErrorInfo id = " + event.id + " >>>poiType = " + event.poiType + ">>>updateType = " + event.updateType); - mTanluModelData.uploadDeleteErrorDataInfo(event.id, event.poiType, event.updateType, - new UploadShareCallback() { - @Override - public void onSuccess(BaseData data) { - Logger.d(TAG, "uploadDeleteErrorDataInfo onSuccess -----> "); - } - - @Override - public void onFail(String message, int code) { - Logger.e(TAG, "uploadDeleteErrorDataInfo onFail -----> message = " + message); - } - }); - } - - /** - * 分享弹框 - * - * @param event - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onShareDialog(final SharedialogEvent event) { - if (event == null) { - return; - } - - if (mADASController != null) { - mADASController.closeADAS(); - } -// ShareControl.getInstance(getActivity()).showDialog(); - } - - /** - * 获取情报失败 - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onGetInfoFailed(final GetInfoError error) { - mMogoStatusManager.setUploadingStatus(TanluConstants.MODEL_NAME, false); - float bearing = TanluServiceManager.getLocationClient().getLastKnowLocation().getBearing(); //角度 - Logger.d(TAG, "onGetInfoFailed bearing = " + bearing + " >>>type = " + error.type); - //失败提示框 - if (error == null) { - return; - } - - if (error.type == null) { - return; - } - - mErrorType = error.type; - if (error.type.equals("100")) { - //网络弹框 - if (errorDialog != null && errorDialog.isShowing()) { - //TODO - } else { - showNetErrorDialog(); - } - } else { - if (customDialog != null && customDialog.isShowing()) { - //TODO - } else { - showNormalDialog(error.type); - } - } - } - - private UploadFailedDialog customDialog; - private NetErrorDialog errorDialog; - private String mErrorType; - - - private void showNormalDialog(final String type) { - customDialog = new UploadFailedDialog(getActivity()); - customDialog.setContent("抱歉，无法获取到相关数据"); - customDialog.setSubContent("分享失败"); - customDialog.setOnCancelListener("取消", new View.OnClickListener() { - @Override - public void onClick(View v) { - timer.cancel(); //取消倒计时 - } - }); - customDialog.setOnOkClickListener("重新分享", new View.OnClickListener() { - @Override - public void onClick(View v) { - Logger.d(TAG, "重新分享 --------->"); - //发送广播 type：1拥堵，2交通检查，3封路 - sendShareReceiver(type); - } - }); - customDialog.show(); - timer.start(); - } - - private void showNetErrorDialog() { - errorDialog = new NetErrorDialog(getActivity()); - errorDialog.setContent("由于网络原因上传失败"); - errorDialog.setSubContent("系统将在网络恢复时自动上传"); - errorDialog.setOnCancelListener("好的", new View.OnClickListener() { - @Override - public void onClick(View v) { - timer.cancel(); - } - }); - errorDialog.show(); - timer.start(); - } - - /** - * 倒计时 - */ - CountDownTimer timer = new CountDownTimer(11000, 1000) { - @Override - public void onTick(long arg) { - int theTime = (int) (arg / 1000); - if (mErrorType.equals("100")) { //无网 - if (errorDialog != null) { - errorDialog.getTxtCancel().setText(getString(R.string.tanlu_neterror_cancle_time, theTime + "")); - } - } else { - if (customDialog != null) { - customDialog.getTxtCancel().setText(getString(R.string.tanlu_cancle_time, theTime + "")); - } - } - } - - @Override - public void onFinish() { - if (mErrorType.equals("100")) { //无网 - if (errorDialog != null) { - errorDialog.dismiss(); - } - } else { - if (customDialog != null) { - customDialog.dismiss(); - } - } - } - }; - - - /** - * 接收到分享对应数据打点 - * - * @param event - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onMarkerInfo(final MarkerInfo event) { - if (event == null) { - return; - } - Logger.d(TAG, "onMarkerInfo event.type =" + event.type + " >>event.lat = " + event.lat + " >>event.lon = " + event.lon + " >>event.imageUrl =" + event.imageUrl); - - String poiType = ""; -// if (event.type.equals(TanluConstants.TANLU_ROAD_CONGESTION_COMPAT)) { //上报路况 -// poiType = "100"; -// mMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); -// } else { -// poiType = "-1"; -// } - - double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - double lon = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - Logger.d(TAG, "onMarkerInfo share onCompleted ---poiType =" + poiType); - if (!poiType.equals("-1")) { - Logger.d(TAG, "onMarkerInfo share onCompleted ---!poiType------->"); - MogoMarkerOptions options = new MogoMarkerOptions() - .icon(mMarkerIcon) - .latitude(lat) //event.lat - .owner("share_tag") - .longitude(lon); //event.lon - final IMogoMarker mogoMarker = mMarkerManager.addMarker("share_tag", options); //随便传tag，不可点击 share_tag TanluConstants.MODEL_NAME - Logger.d(TAG, "getMathRandom() = " + getMathRandom()); - AIAssist.getInstance(getContext()).speakTTSVoice(( - String.format(voiceShareSuccessTts, getMathRandom())), null); -// ShareControl.getInstance(getActivity()).dismissDialog(); - - //开启动画 - mogoMarker.startScaleAnimation(0, 1, 0, 1, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { - @Override - public void onAnimStart() { - Logger.d(TAG, " onAnimStart ---1----> "); - } - - @Override - public void onAnimEnd() { - Logger.d(TAG, " onAnimEnd -----1---> "); - showJumpAnimation(mogoMarker); - } - }); - } else { - Logger.d(TAG, "onMarkerInfo share onCompleted ---!poiType--- else ---->"); - } - - mMogoStatusManager.setUploadingStatus(TanluConstants.MODEL_NAME, false); - - //请求分享接口,只有封路和交通检查走新接口，老接口只有上报拥堵使用，并且定时任务都是拥堵的type - if (poiType.equals("100") || poiType.equals("-1")) { - Logger.d(TAG, "poiType = 100 || -1 "); - } else { - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - MarkerExploreWay markerExploreWay = markerExploreWayList.get(0); - if (markerExploreWay.getUserInfo() != null && !TextUtils.isEmpty(poiType)) { //上报路况不使用这个接口 - uploadShareInfo(poiType, event.imageUrl, markerExploreWay.getUserInfo().getUserName(), - markerExploreWay.getUserInfo().getUserHead()); - } else { - Logger.e(TAG, "onMarkerInfo markerExploreWay.getUserInfo() == null"); - uploadShareInfo(poiType, event.imageUrl, "", ""); - } - } else { - Logger.e(TAG, "onMarkerInfo share markerExploreWayList = null"); - uploadShareInfo(poiType, event.imageUrl, "", ""); - } - } - } - - private void showJumpAnimation(final IMogoMarker mogoMarker) { - if (mogoMarker == null) { - return; - } - - mogoMarker.startJumpAnimation(80, 300, new Interpolator() { - @Override - public float getInterpolation(float input) { - if (input <= 0.5) { - return (float) (0.5f - 2.0 * (0.5 - input) * (0.5 - input)); - } else { - return (float) (0.5f - Math.sqrt(input - 0.5f) * (1.5f - input)); - } - } - }, new OnMarkerAnimationListener() { - @Override - public void onAnimStart() { -// Logger.d(TAG, " onAnimStart ----2--> "); - } - - @Override - public void onAnimEnd() { -// Logger.d(TAG, " onAnimEnd ----2--> "); - } - }); - } - - - /** - * 上报分享信息 - */ - private void uploadShareInfo(final String poiType, String poiImgUrl, String nickname, String headImgUrl) { - double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - double lon = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - float bearing = TanluServiceManager.getLocationClient().getLastKnowLocation().getBearing(); //角度 - - String addressStr = TanluServiceManager.getLocationClient().getLastKnowLocation().getAddress(); - Logger.d(TAG, "uploadShareInfo lat =" + lat + ">>>lon =" + lon + ">>>addressStr =" + addressStr + " >>bearing =" + bearing); - mTanluModelData.addTrafficCheckInfo(poiType, poiImgUrl, nickname, headImgUrl, lat, lon, addressStr, bearing, - new UploadShareCallback() { - @Override - public void onSuccess(BaseData data) { - Logger.d(TAG, "uploadShareInfo onSuccess -----> poiType = " + poiType); - } - - @Override - public void onFail(String message, int code) { - Logger.e(TAG, "uploadShareInfo onFail -----> poiType = " + poiType); - } - }); - } - - - /** - * push 类型，1为导航数据，2为通勤族 - * - * @param event - */ - @Subscribe(threadMode = ThreadMode.MAIN) - public void onPushInfo(final PushTypeInfo event) { - if (event != null && TextUtils.isEmpty(event.type)) { - Logger.d(TAG, " onPushInfo event.type =" + event.type); - if (event.type.equals("1")) { - getNaviRoadLineInfo(); - } else if (event.type.equals("2")) { - getRoadLineData(); - } - } else { - Logger.e(TAG, "event == null "); - } - } - - - /** - * 导航路线数据事件 - */ - public void getNavigationData() { - if (mADASController != null) { - mADASController.closeADAS(); - } - - mTanluModelData.getNaviInformation(mMogoMapService.getNavi(getContext()).getCalculatedPathPos(), - new NaviCallback() { - @Override - public void onSuccess(NaviResult data) { - List informationList = data.getResult().getInformations(); - Logger.d(TAG, "getNavigationData onSuccess informationList =" + informationList); - if (informationList == null || (informationList != null && informationList.size() == 0)) { - return; - } - - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - markerExploreWayList.clear(); //刷新之前先删除之前的，然后再添加成请求的 - mCurrentPosition = 0; - } - - //转换数据结构 - convertData(informationList); - //切换到探路卡片 - if (!isCurrentPage) { - iMogoCardManager.switch2(TanluConstants.MODEL_NAME); - } - - //清除探路之前的数据 - mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME); - - //打点 - ArrayList optionList = new ArrayList<>(); - for (int i = 0; i < informationList.size(); i++) { - //根据type确定添加的图片 - String trafficType = informationList.get(i).trafficInfoType; -// if (trafficType.equals("traffic_jam")) { //拥堵 -// multiMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up); -// } - - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(markerExploreWayList.get(i)); - markerShowEntity.setTextContent(informationList.get(i).addr); - markerShowEntity.setMarkerType(TanluConstants.MODEL_NAME); - MogoMarkerOptions options = new MogoMarkerOptions() - .object(markerShowEntity) - .icon(multiMarkerIcon) - .latitude(informationList.get(i).lat) - .owner(TanluConstants.MODEL_NAME) - .longitude(informationList.get(i).lon); - - optionList.add(options); - mMarkerManager.addMarker(TanluConstants.MODEL_NAME, options); - } - Logger.d(TAG, "getNavigationData optionList.size() = " + optionList.size()); -// mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true); - - mLoopRecyclerView.scrollToPosition(0); - - //播报 -// speakFailVoice(getString(R.string.tanlu_navi_voice_play)); - - //自身位置和第一个情报自适应显示 - Rect rect = new Rect( - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_left), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_top), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_right), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_bottom)); - - mMogoStatusManager.setUserInteractionStatus(TAG, true, true); - //经度 - Double longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - //纬度 - Double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - //第一个参数：调用者,第二个参数：当前自车的位置,第三个参数：需要显示在范围内的点（不包含自车的位置） - //第四个参数：显示范围的UI边界,第五个参数：是否锁定自车位置（看业务需要） - if (markerExploreWayList.size() > 0) { - mMApUIController.showBounds(TanluConstants.MODEL_NAME, new MogoLatLng(lat, longit), - getList(markerExploreWayList.get(0)), rect, true); - } - } - - @Override - public void onFail(String message, int code) { - Logger.d(TAG, "getNavigationData message = " + message + ">>>code =" + code); - } - }); - } - - /** - * 通勤族 事件，监听消息自己请求路线数据 - */ - public void getRoadLineData() { - mTanluModelData.getRoadLineData(new RoadLineCallback() { - @Override - public void onSuccess(PathLineResult o) { - //绘制线路线 - if (o != null && o.getResult() != null && o.getResult().getPointList() != null - && o.getResult().getPointList().size() > 0) { - drawMapLine(o.getResult().getPointList()); - } else { - Logger.e(TAG, "getRoadLineData onSuccess o.getPointList() == null"); - } - } - - @Override - public void onFail(String message, int code) { - Logger.e(TAG, "getRoadLineData onFail message =" + message + ">>>code =" + code); - } - }); - } - - /** - * 导航路线，监听消息自己请求路线数据 - */ - public void getNaviRoadLineInfo() { - mTanluModelData.getNaviRoadLineInfo(new RoadLineCallback() { - @Override - public void onSuccess(PathLineResult o) { - //绘制线路线 - if (o != null && o.getResult() != null && o.getResult().getPointList() != null - && o.getResult().getPointList().size() > 0) { - drawMapLine(o.getResult().getPointList()); - } else { - Logger.e(TAG, "getNaviRoadLineInfo onSuccess o.getPointList() == null"); - } - } - - @Override - public void onFail(String message, int code) { - Logger.e(TAG, "getNaviRoadLineInfo onFail message =" + message + ">>>code =" + code); - } - }); - } - - /** - * 绘制线路 - */ - private void drawMapLine(List
pointList) { - //避免人为操作，刷新 - mMogoStatusManager.setUserInteractionStatus(TanluConstants.MODEL_NAME, true, true); - - int intervalNum = Utils.getIntervalValue(pointList.size()); - Logger.d(TAG, "drawMapLine intervalNum = " + intervalNum + ">>> pointList.size =" + pointList.size()); - int listSize = pointList.size(); - passedByPoints = new ArrayList<>(); - - //沿途最多15个点 - for (int i = 0; i < listSize; i += intervalNum) { - passedByPoints.add(new MogoLatLng(pointList.get(i).getLat(), (pointList.get(i).getLon()))); - } - - Logger.d(TAG, "drawMapLine passedByPoints.size() ----> " + passedByPoints.size()); - MogoLatLng startLatLng = new MogoLatLng(pointList.get(0).getLat(), pointList.get(0).getLon()); - MogoLatLng endLatLng = new MogoLatLng(pointList.get(listSize - 1).getLat(), pointList.get(listSize - 1).getLon()); - mMarkerManager.addRouteWay(getContext(), startLatLng, endLatLng, passedByPoints); - } - - - /** - * 声音控制道路数据 - */ - public void getVoiceControlRoadData(String keywords, final double lat, final double lon) { - if (mADASController != null) { - mADASController.closeADAS(); - } - - String adCode = TanluServiceManager.getLocationClient().getLastKnowLocation().getAdCode(); - String cityCode = TanluServiceManager.getLocationClient().getLastKnowLocation().getCityCode(); - //移动到具体位置 - mMogoStatusManager.setUserInteractionStatus(TanluConstants.MODEL_NAME, true, true); - moveToMarcker(lat, lon); - - inputlon = lon; - inputlat = lat; - - if (mIMogoFragmentManager.getStackSize() > 0) { - mIMogoFragmentManager.clearAll(); - } - - Logger.d(TAG, "getVoiceControlRoadData lat =" + lat + ">>>lon =" + lon + ">>>cityCode= " + cityCode + " >>>adCode = " + adCode); - mTanluModelData.getVoiceControlRoadData(keywords, cityCode, lon, lat, adCode, new VoiceSearchCallback() { - @Override - public void onSuccess(VoiceSearchResult o) { - String discription = o.getResult().getDescription(); - Logger.d(TAG, "getVoiceControlRoadData onSuccess ----1--->"); - if (o.getResult().getInformations() != null && o.getResult().getInformations().size() > 0) { - Logger.d(TAG, "getVoiceControlRoadData onSuccess ----2--->"); - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - markerExploreWayList.clear(); //刷新之前先删除之前的，然后再添加成请求的 - mCurrentPosition = 0; - } - - //转换数据结构 - convertData(o.getResult().getInformations()); - //切换到探路卡片 - if (!isCurrentPage) { - iMogoCardManager.switch2(TanluConstants.MODEL_NAME); - } - - speakSuccessVoice(o.getResult().getInformations(), discription == null ? "" : discription); - - List informationList = o.getResult().getInformations(); - Logger.d(TAG, "getVoiceControlRoadData onSuccess informationList =" + informationList); - if (informationList == null || (informationList != null && informationList.size() == 0)) { - return; - } - //清除探路之前的数据 - mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME); - //添加埋点数据 - datalon = informationList.get(0).lon; - datalat = informationList.get(0).lat; - - //打点 - ArrayList optionList = new ArrayList<>(); - for (int i = 0; i < informationList.size(); i++) { - //根据type确定添加的图片 - String trafficType = informationList.get(i).trafficInfoType; - - MarkerShowEntity markerShowEntity = new MarkerShowEntity(); - markerShowEntity.setBindObj(markerExploreWayList.get(i)); - markerShowEntity.setTextContent(informationList.get(i).addr); - markerShowEntity.setMarkerType(TanluConstants.MODEL_NAME); - MogoMarkerOptions options = new MogoMarkerOptions() - .object(markerShowEntity) - .icon(multiMarkerIcon) - .latitude(informationList.get(i).lat) - .owner(TanluConstants.MODEL_NAME) - .longitude(informationList.get(i).lon); - -// optionList.add(options); - mMarkerManager.addMarker(TanluConstants.MODEL_NAME, options); - } - Logger.d(TAG, "getVoiceControlRoadData optionList.size() = " + optionList.size()); - mMogoStatusManager.setUserInteractionStatus(TanluConstants.MODEL_NAME, true, true); -// mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true); - - //展示6个在区域内显示 - showBonndsRoadtion(); - - //直接使用当前数据list，作为切换的数据源，切换左侧列表到最新的数据 - mLoopRecyclerView.scrollToPosition(0); - } else { - if (!TextUtils.isEmpty(discription)) { - Logger.d(TAG, "getVoiceControlRoadData discription != null else ----1--->"); - AIAssist.getInstance(getContext()).speakTTSVoice(discription, null); - } else { - Logger.d(TAG, "getVoiceControlRoadData discription == null else ----2--->"); -// AIAssist.getInstance(getContext()).speakTTSVoice("未找到其他车主分享的路况信息", null); - } - } - } - - @Override - public void onFail(String message, int code) { - Logger.e(TAG, "getVoiceControlRoadData onFail message = " + message + ">>>code= " + code); - speakFailVoice(searchfaileVoiceStrings[2]); - } - }); - } - - - private void showBonndsRoadtion() { - Logger.e(TAG, "showBonndsRoadtion getMogoList markerExploreWayList.size() = " + markerExploreWayList.size()); - //经度 - Double longit = TanluServiceManager.getLocationClient().getLastKnowLocation().getLongitude(); - //纬度 - Double lat = TanluServiceManager.getLocationClient().getLastKnowLocation().getLatitude(); - - Rect rect = new Rect( - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_left), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_top), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_right), - (int) getContext().getResources().getDimension(R.dimen.tanlu_module_map_bottom)); - - moveNotFresh(); - - //第一个参数：调用者,第二个参数：当前自车的位置,第三个参数：需要显示在范围内的点（不包含自车的位置） - //第四个参数：显示范围的UI边界,第五个参数：是否锁定自车位置（看业务需要） - mMApUIController.showBounds(TanluConstants.MODEL_NAME, new MogoLatLng(lat, longit), - getMogoList(), rect, true); - Logger.d(TAG, " getMogoList() = " + getMogoList().size()); - } - - - /** - * 构造经纬度列表 - * - * @return - */ - private List getMogoList() { - List list = new ArrayList<>(); - if (markerExploreWayList != null && markerExploreWayList.size() > 0) { - if (markerExploreWayList.size() < 6) { - for (int i = 0; i < markerExploreWayList.size(); i++) { - MarkerLocation location = markerExploreWayList.get(i).getLocation(); - if (location != null) { - MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon()); - list.add(mogoLatLng); - } else { - Logger.e(TAG, "getMogoList() < 6 location == null"); - } - } - } else { - for (int i = 0; i < 6; i++) { - MarkerLocation location = markerExploreWayList.get(i).getLocation(); - if (location != null) { - MogoLatLng mogoLatLng = new MogoLatLng(location.getLat(), location.getLon()); - list.add(mogoLatLng); - } else { - Logger.e(TAG, "getMogoList() location == null"); - } - } - } - } else { - Logger.e(TAG, "getMogoList() markerExploreWay == null"); - } - return list; - } - - - /** - * 将探路的数据结构转换成 MarkerExploreWay的列表 - */ - private void convertData(List informations) { - if (markerExploreWayList != null) { - markerExploreWayList.clear(); - } - - for (int i = 0; i < informations.size(); i++) { - MarkerExploreWay markerExploreWay = new MarkerExploreWay(); - markerExploreWay.setAddr(informations.get(i).addr); - markerExploreWay.setCityName(informations.get(i).cityName); - markerExploreWay.setDistance(informations.get(i).distance); - markerExploreWay.setFileType(informations.get(i).type); - markerExploreWay.setItems(convertMediaData(informations.get(i).items)); - markerExploreWay.setLocation(convertLocation(informations.get(i))); - markerExploreWay.setUserInfo(convertUserInfo(informations.get(i))); - - markerExploreWayList.add(markerExploreWay); - } - - //更新数据 - renderCardViews(); - } - - /** - * 转换媒体数据 - * - * @param items - * @return - */ - private List convertMediaData(ArrayList items) { - List exploreWayItems = new ArrayList<>(); - MarkerExploreWayItem item = new MarkerExploreWayItem(); - if (items != null && items.size() > 0) { - item.setThumbnail(items.get(0).getThumbnail()); - item.setUrl(items.get(0).getUrl()); - - exploreWayItems.add(item); - } - - return exploreWayItems; - } - - - private MarkerLocation convertLocation(Information information) { - MarkerLocation location = new MarkerLocation(); - location.setAddress(information.addr); - location.setAngle(0); - location.setLat(information.lat); - location.setLon(information.lon); - - return location; - } - - - private MarkerUserInfo convertUserInfo(Information information) { - MarkerUserInfo userInfo = new MarkerUserInfo(); - userInfo.setUserHead(information.headImgUrl); - userInfo.setUserName(information.nickName); - - return userInfo; - } - - - Random random = new Random(); - - private void speakSuccessVoice(List informations, String - trafficStatus) { - Logger.d(TAG, "speakSuccessVoice informations.size() = " + informations.size()); - switch (informations.size()) { - case 0: - speakFailVoice(searchfaileVoiceStrings[random.nextInt(3)]); - break; - - case 1: - trackVoiceSearch(1); - AIAssist.getInstance(getContext()).speakTTSVoice(( - String.format(voiceGetInfoMationTts, "1") + trafficStatus), null); - break; - - case 2: - trackVoiceSearch(1); - AIAssist.getInstance(getContext()).speakTTSVoice(( - String.format( - voiceGetInfoMationTts, - "2" - ) + trafficStatus), null); - break; - case 3: - trackVoiceSearch(1); - AIAssist.getInstance(getContext()).speakTTSVoice(( - String.format( - voiceGetInfoMationTts, - "3" - ) + trafficStatus), null); - break; - - default: - trackVoiceSearch(1); - AIAssist.getInstance(getContext()).speakTTSVoice(( - String.format( - voiceGetInfoMationTts, - "多" - ) + trafficStatus), null); - } - } - - private void initStrings() { - voiceGetInfoMationTts = - getContext().getResources().getString(R.string.voice_get_informations_tts); -// searchingVoiceStrings = -// getContext().getResources().getStringArray(R.array.searching_voice_string_array); - searchfaileVoiceStrings = - getContext().getResources().getStringArray(R.array.search_fail_voice_array); - voiceShareSuccessTts = getContext().getResources().getString(R.string.tanlu_share_success); - } - - private void speakFailVoice(String string) { - AIAssist.getInstance(getContext()).speakTTSVoice(string, null); - } - - private void speakSearchingVoice() { -// AIAssist.getInstance(getContext()).speakTTSVoice(searchingVoiceStrings[random.nextInt(3)], null); - } - - - Double inputlon = 0.0;//经度 - Double inputlat = 0.0; //维度 - Double datalon = 0.0; //经度 - Double datalat = 0.0; //维度 - - //上报语音搜索 - private void trackVoiceSearch(int type) { - Map properties = new HashMap<>(); - properties.put("type", type); - properties.put("searchtext", mKeywords); - properties.put("inputlon", inputlon); - properties.put("inputlat", inputlat); - properties.put("datalon", datalon); - properties.put("datalat", datalat); - mAnalytics.track(TanluConstants.CARNET_VOICE_SEARCH, properties); - } - - private String getMathRandom() { - Random random = new Random(); - int temp = random.nextInt(50) + 10; - - return String.valueOf(temp); - } -} - - diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java index e7485bdc8c..c184721629 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewProvider.java @@ -2,34 +2,21 @@ package com.mogo.module.tanlu.fragment; import android.content.Context; import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.map.MogoLatLng; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.tanlu.callback.DataSetChangedAdapter; import com.mogo.module.tanlu.model.event.MarkerInfo; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.service.module.ModuleType; import com.mogo.module.tanlu.constant.TanluConstants; -import com.mogo.service.tanlu.IMogoTanluUiProvider; +import com.mogo.service.share.IMogoTanluUiProvider; import com.mogo.utils.logger.Logger; import org.greenrobot.eventbus.EventBus; import io.reactivex.Single; -import io.reactivex.SingleEmitter; import io.reactivex.SingleOnSubscribe; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; /** diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceManager.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceManager.java index 3709aed460..78d541c5d8 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceManager.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluServiceManager.java @@ -25,7 +25,6 @@ import com.zhidao.carchattingprovider.CallChattingProviderConstant; * 持有服务接口实例 */ public class TanluServiceManager { - private static String TAG = "TanluServiceManager"; private static IMogoMapService mMapService; private static IMogoPoiSearch mPoiSearch; private static IMogoLocationClient mLocationClient; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 823faa7f2f..a8d0ffe1ac 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java @@ -31,7 +31,7 @@ import com.mogo.service.module.IMogoSearchManager; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; -import com.mogo.service.tanlu.IMogoTanluProvider; +import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.zhidao.carchattingprovider.CallChattingProviderConstant; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index f2565bbf67..a0ab65878a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -3,10 +3,8 @@ package com.mogo.module.v2x.scenario.scene.road; import android.view.View; import android.view.ViewGroup; -import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; -import com.mogo.module.service.ServiceConst; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; @@ -15,8 +13,6 @@ import com.mogo.module.v2x.scenario.scene.livecar.V2XRoadLiveCarScenario; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.utils.ADASUtils; import com.mogo.module.v2x.utils.V2XUtils; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.TanluUploadParams; import com.mogo.service.windowview.IMogoTopViewStatusListener; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index 66aecbd070..25d0dd1959 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -31,8 +31,8 @@ import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.IMogoTanluUiProvider; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.IMogoTanluUiProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.mogo.skin.support.IMogoSkinSupportInstaller; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluProvider.java similarity index 98% rename from services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java rename to services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluProvider.java index 77cebf1b3a..994e811744 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluProvider.java @@ -1,4 +1,4 @@ -package com.mogo.service.tanlu; +package com.mogo.service.share; import com.alibaba.android.arouter.facade.template.IProvider; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluUiProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java similarity index 96% rename from services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluUiProvider.java rename to services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java index 1b7ce77f3c..53d0aa6cd6 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/IMogoTanluUiProvider.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java @@ -1,4 +1,4 @@ -package com.mogo.service.tanlu; +package com.mogo.service.share; import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.map.MogoLatLng; diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java b/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java similarity index 98% rename from services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java rename to services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java index e63f637d79..448a918057 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/tanlu/TanluUploadParams.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java @@ -1,4 +1,4 @@ -package com.mogo.service.tanlu; +package com.mogo.service.share; import com.mogo.map.MogoLatLng; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index add6d7a185..b8e1a6b07b 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -39,12 +39,11 @@ import com.mogo.service.share.IMogoShareManager; import com.mogo.service.statusmanager.IMogoMsgCenter; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.strategy.IMogoRefreshStrategyController; -import com.mogo.service.tanlu.IMogoTanluProvider; -import com.mogo.service.tanlu.IMogoTanluUiProvider; +import com.mogo.service.share.IMogoTanluProvider; +import com.mogo.service.share.IMogoTanluUiProvider; import com.mogo.service.windowview.IMogoTopViewManager; import com.mogo.service.windowview.IMogoWindowManager; import com.mogo.skin.support.IMogoSkinSupportInstaller; -import com.mogo.skin.support.MogoSkinManager; import com.mogo.skin.support.SkinSupportInstallerConstants; import com.mogo.utils.logger.Logger;