getCalculatedPathPos() {
+ if (mDelegate != null) {
+ return mDelegate.getCalculatedPathPos();
+ }
+ return null;
+ }
+
@Override
public OnCalculatePathItemClickInteraction getItemClickInteraction() {
if (mDelegate != null) {
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
index c4a2495369..244745cff1 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java
@@ -108,6 +108,13 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme
mLoadingView.setVisibility( View.GONE );
}
+ @Override
+ public void exit() {
+ if ( mExit != null ) {
+ mExit.performClick();
+ }
+ }
+
@Override
public Animation onCreateAnimation( int transit, boolean enter, int nextAnim ) {
TranslateAnimation animation = null;
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
index eada7ed782..8a640f2ab7 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java
@@ -1,19 +1,19 @@
package com.mogo.module.apps;
-import android.content.Intent;
-
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.mvp.Presenter;
+import com.mogo.module.apps.applaunch.AppLaunchFilter;
+import com.mogo.module.apps.applaunch.AppLauncher;
+import com.mogo.module.apps.applaunch.CardAppLauncher;
import com.mogo.module.apps.model.AppInfo;
import com.mogo.module.apps.model.AppsModel;
-import com.mogo.module.apps.utils.LaunchUtils;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.analytics.IMogoAnalytics;
+import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.utils.ThreadPoolService;
-import com.mogo.utils.TipToast;
import com.mogo.utils.UiThreadHandler;
import java.util.HashMap;
@@ -30,9 +30,16 @@ public class AppsPresenter extends Presenter< AppsView > {
private static final String TAG = "AppsPresenter";
private IMogoAnalytics mAnalytics;
+ private AppLaunchFilter mLauncher;
+
+ private IMogoCardManager mCardManager;
public AppsPresenter( AppsView view ) {
super( view );
+ mCardManager = ( IMogoCardManager ) ARouter.getInstance().build( MogoServicePaths.PATH_CARD_MANAGER ).navigation( getContext() );
+ CardAppLauncher cardAppLauncher = new CardAppLauncher( this, mCardManager );
+ cardAppLauncher.setNext( new AppLauncher() );
+ mLauncher = cardAppLauncher;
}
@Override
@@ -68,9 +75,9 @@ public class AppsPresenter extends Presenter< AppsView > {
trackAppClicked( appInfo );
try {
- LaunchUtils.launchByPkg( getContext(), appInfo.getPackageName() );
+ mLauncher.launch( getContext(), appInfo );
} catch ( Exception e ) {
- TipToast.shortTip( R.string.module_apps_str_no_app );
+
}
}
@@ -92,5 +99,12 @@ public class AppsPresenter extends Presenter< AppsView > {
super.onDestroy( owner );
AppsListChangedLiveData.getInstance().release();
mView = null;
+ mLauncher.destroy();
+ }
+
+ public void exit() {
+ if ( mView != null ) {
+ mView.exit();
+ }
}
}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsView.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsView.java
index 03ca995a0b..8539b2e7be 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsView.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsView.java
@@ -20,4 +20,9 @@ public interface AppsView extends IView {
* @param appInfos
*/
void renderApps( Map< Integer, List< AppInfo > > appInfos );
+
+ /**
+ * 退出列表页面
+ */
+ void exit();
}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLaunchFilter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLaunchFilter.java
new file mode 100644
index 0000000000..a934c9895a
--- /dev/null
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLaunchFilter.java
@@ -0,0 +1,18 @@
+package com.mogo.module.apps.applaunch;
+
+import android.content.Context;
+
+import com.mogo.module.apps.model.AppInfo;
+
+/**
+ * @author congtaowang
+ * @since 2020-02-09
+ *
+ * 按指定方式启动指定的app
+ */
+public interface AppLaunchFilter {
+
+ void launch( Context context, AppInfo appInfo );
+
+ void destroy();
+}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java
new file mode 100644
index 0000000000..0ce9ae3b23
--- /dev/null
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/AppLauncher.java
@@ -0,0 +1,38 @@
+package com.mogo.module.apps.applaunch;
+
+import android.content.Context;
+
+import com.mogo.module.apps.R;
+import com.mogo.module.apps.model.AppInfo;
+import com.mogo.module.apps.utils.LaunchUtils;
+import com.mogo.utils.TipToast;
+import com.mogo.utils.logger.Logger;
+
+/**
+ * @author congtaowang
+ * @since 2020-02-09
+ *
+ * 描述
+ */
+public class AppLauncher extends BaseAppLauncher {
+
+ private static final String TAG = "AppLauncher";
+
+ @Override
+ public void launch( Context context, AppInfo appInfo ) {
+ try {
+ LaunchUtils.launchByPkg( context, appInfo.getPackageName() );
+ } catch ( Exception e ) {
+ Logger.e( TAG, e, "error." );
+ TipToast.shortTip( R.string.module_apps_str_no_app );
+ }
+ }
+
+ @Override
+ public void destroy() {
+ if ( getNext() != null ) {
+ getNext().destroy();
+ setNext( null );
+ }
+ }
+}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java
new file mode 100644
index 0000000000..7b6cadd640
--- /dev/null
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/BaseAppLauncher.java
@@ -0,0 +1,20 @@
+package com.mogo.module.apps.applaunch;
+
+/**
+ * @author congtaowang
+ * @since 2020-02-09
+ *
+ * 描述
+ */
+public abstract class BaseAppLauncher implements AppLaunchFilter {
+
+ private AppLaunchFilter mNext;
+
+ public AppLaunchFilter getNext() {
+ return mNext;
+ }
+
+ public void setNext( AppLaunchFilter next ) {
+ this.mNext = next;
+ }
+}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java
new file mode 100644
index 0000000000..fb0906f4c4
--- /dev/null
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/applaunch/CardAppLauncher.java
@@ -0,0 +1,57 @@
+package com.mogo.module.apps.applaunch;
+
+import android.content.Context;
+
+import com.mogo.module.apps.AppsPresenter;
+import com.mogo.module.apps.model.AppInfo;
+import com.mogo.service.cardmanager.IMogoCardManager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author congtaowang
+ * @since 2020-02-09
+ *
+ * 描述
+ */
+public class CardAppLauncher extends BaseAppLauncher {
+
+ private static Map< String, String > sCardApps = new HashMap<>();
+
+ static {
+ sCardApps.put( "com.zhidao.roadcondition.split", "CARD_TYPE_ROAD_CONDITION" );
+ sCardApps.put( "com.zhidao.roadcondition", "CARD_TYPE_ROAD_CONDITION" );
+ sCardApps.put( "com.zhidao.imdemo", "CARD_TYPE_CARS_CHATTING" );
+ }
+
+ private AppsPresenter mAppsPresenter;
+ private IMogoCardManager mCardManager;
+
+ public CardAppLauncher( AppsPresenter mAppsPresenter, IMogoCardManager mCardManager ) {
+ this.mAppsPresenter = mAppsPresenter;
+ this.mCardManager = mCardManager;
+ }
+
+ @Override
+ public void launch( Context context, AppInfo appInfo ) {
+ if ( sCardApps.containsKey( appInfo.getPackageName() ) ) {
+ mCardManager.switch2( sCardApps.get( appInfo.getPackageName() ) );
+ mAppsPresenter.exit();
+ } else {
+ if ( getNext() != null ) {
+ getNext().launch( context, appInfo );
+ }
+ }
+ }
+
+ @Override
+ public void destroy() {
+ mAppsPresenter = null;
+ mCardManager = null;
+ if ( getNext() != null ) {
+ getNext().destroy();
+ setNext( null );
+ }
+ }
+}
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/CardAppInfo.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/CardAppInfo.java
new file mode 100644
index 0000000000..50a5fa55f6
--- /dev/null
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/CardAppInfo.java
@@ -0,0 +1,17 @@
+package com.mogo.module.apps.model;
+
+/**
+ * @author congtaowang
+ * @since 2020-02-09
+ *
+ * 描述
+ */
+public class CardAppInfo extends AppInfo {
+
+ private String mCardType;
+
+ public CardAppInfo( AppInfo app, String cardType ) {
+ super( app.getName(), app.getPackageName(), app.getVersionName(), app.getVersionCode(), app.getIcon() );
+ this.mCardType = cardType;
+ }
+}
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
index a09010b15f..84157f6a84 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
@@ -6,6 +6,7 @@ package com.mogo.module.common.entity;
*/
public class MarkerNoveltyInfo {
private String type;
+ private String sn;
private MarkerLocation location;
/**
* @see MarkerPoiTypeEnum
@@ -45,6 +46,13 @@ public class MarkerNoveltyInfo {
this.type = type;
}
+ public String getSn() {
+ return sn;
+ }
+
+ public void setSn(String sn) {
+ this.sn = sn;
+ }
public class ContentData {
private String content;
@@ -53,6 +61,7 @@ public class MarkerNoveltyInfo {
private String infoId;
private long likeNum;
private String title;
+ private String gasPrices;
private boolean displayNavigation;
private String styleType;
@@ -120,6 +129,14 @@ public class MarkerNoveltyInfo {
this.styleType = styleType;
}
+ public String getGasPrices() {
+ return gasPrices;
+ }
+
+ public void setGasPrices(String gasPrices) {
+ this.gasPrices = gasPrices;
+ }
+
@Override
public String toString() {
return "ContentData{" +
@@ -129,6 +146,7 @@ public class MarkerNoveltyInfo {
", infoId='" + infoId + '\'' +
", likeNum=" + likeNum +
", title='" + title + '\'' +
+ ", gasPrices='" + gasPrices + '\'' +
", displayNavigation=" + displayNavigation +
", styleType='" + styleType + '\'' +
'}';
@@ -139,6 +157,7 @@ public class MarkerNoveltyInfo {
public String toString() {
return "MarkerNoveltyInfo{" +
"type='" + type + '\'' +
+ ", sn='" + sn + '\'' +
", location=" + location +
", poiType='" + poiType + '\'' +
", contentData=" + contentData +
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 077f7c1a62..02e0ffbcfe 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
@@ -123,8 +123,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition );
mUploadRoadCondition.setOnClickListener( view -> {
- ShareControl shareControl = new ShareControl();
- shareControl.showDialog( getActivity() );
+ ShareControl.getInstance(getActivity()).showDialog();
} );
mVRMode = findViewById( R.id.module_entrance_id_vr_mode );
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index db8a39c780..44a29e9d19 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -1,6 +1,7 @@
package com.mogo.module.main;
import android.os.Bundle;
+import android.os.Handler;
import android.view.View;
import android.widget.FrameLayout;
@@ -234,7 +235,7 @@ public class MainActivity extends MvpActivity implement
// 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。
mMogoModuleHandler.loadModules();
loadContainerModules();
- loadCardModules();
+ new Handler().postDelayed(() -> loadCardModules(), 5000);
// 显示左边遮罩
mLeftShadowFrame.setVisibility(View.VISIBLE);
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
index 169aefc806..8657696fd6 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
@@ -45,7 +45,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener {
override fun onCalculateSuccess() {
var calculatedStrategies = SearchServiceHolder.getNavi()
.calculatedStrategies
-
if (calculatedStrategies != null && calculatedStrategies.size > 0) {
mAdapter.setDatas(calculatedStrategies)
mAdapter.selectTag = calculatedStrategies[0].tagId
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
index 11b2d0f32f..e9f5c31658 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
@@ -406,6 +406,8 @@ public class MogoServiceProvider implements IMogoModuleProvider,
// 部分非用户操作导致地图视图变化：绘线、圈点等不触发用户刷新
// 消费状态
if ( mStatusManager.isUserInteracted() ) {
+ mLastCustomRefreshCenterLocation = latLng;
+ mLastZoomLevel = zoom;
return;
}
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
index 76d27221e9..0224679a7e 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/IShareControl.java
@@ -15,7 +15,7 @@ public interface IShareControl {
* 显示对话框
*/
@Keep
- void showDialog(Context context);
+ void showDialog(/*Context context*/);
/**
* 对话框消失
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 63cbde8c1e..43ce0868aa 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
@@ -1,6 +1,9 @@
package com.mogo.module.share;
import android.content.Context;
+
+import com.mogo.map.MogoNavi;
+import com.mogo.map.impl.amap.navi.NaviClient;
import com.mogo.module.share.dialog.LaucherShareDialog;
/**
@@ -9,15 +12,36 @@ import com.mogo.module.share.dialog.LaucherShareDialog;
* @since 2020-01-10
*/
public class ShareControl implements IShareControl {
+
+ private static volatile ShareControl sInstance;
+ private Context mContext;
+
+ private ShareControl(Context context) {
+ mContext = context;
+ }
+
+ public static ShareControl getInstance(Context context) {
+ if (sInstance == null) {
+ synchronized (ShareControl.class) {
+ if (sInstance == null) {
+ sInstance = new ShareControl(context);
+ }
+ }
+ }
+ return sInstance;
+ }
+
+
@Override
- public void showDialog(Context context) {
- LaucherShareDialog shareDialog = new LaucherShareDialog(context);
+ public void showDialog() {
+ LaucherShareDialog shareDialog = new LaucherShareDialog(mContext);
shareDialog.setCanceledOnTouchOutside(true);
shareDialog.show();
}
@Override
public void dismissDialog() {
-
+ LaucherShareDialog shareDialog = new LaucherShareDialog(mContext);
+ shareDialog.dismiss();
}
}
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
index dda05a1b52..b351b8936d 100644
--- 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
@@ -329,7 +329,6 @@ public class TanluCardViewFragment extends MvpFragment>
@Override
public void onStartNavi() { //开始导航
- Logger.d(TAG, "onStartNavi -------> ");
initModelData();
getNavigationData();
}
@@ -441,6 +440,7 @@ public class TanluCardViewFragment extends MvpFragment>
sendShareReceiver("1");
Logger.d(TAG, "mogoIntentListener 上报路况 ----> ");
traceTypeData("1");
+ ShareControl.getInstance(getActivity()).dismissDialog();
} else if (intentStr.equals(TanluConstants.SHARE_ROAD_CLOSURE)) { //分享封路(封路了) --ok
traceData("2");
sendShareReceiver("3");
@@ -452,8 +452,7 @@ public class TanluCardViewFragment extends MvpFragment>
Logger.d(TAG, "mogoIntentListener 分享交通检查 ----> ");
traceTypeData("3");
} else if (intentStr.equals(TanluConstants.GO_TO_SHARE)) { //我要分享 --ok
- ShareControl shareControl = new ShareControl();
- shareControl.showDialog(getActivity());
+ ShareControl.getInstance(getActivity()).showDialog();
Logger.d(TAG, "mogoIntentListener 我要分享 ----> ");
}
}
@@ -906,7 +905,7 @@ public class TanluCardViewFragment extends MvpFragment>
/**
- * 上报分享信息 TODO
+ * 上报分享信息
*/
private void uploadShareInfo(String poiType, String poiImgUrl, String nickname, String headImgUrl) {
double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
@@ -951,7 +950,7 @@ public class TanluCardViewFragment extends MvpFragment>
/**
- * 导航路线数据事件 TODO
+ * 导航路线数据事件
*/
public void getNavigationData() {
// Double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
@@ -969,11 +968,16 @@ public class TanluCardViewFragment extends MvpFragment>
// }
// });
- mTanluModelData.getNaviInformation(new NaviCallback() {
+ mTanluModelData.getNaviInformation(mMogoMapService.getNavi(getContext()).getCalculatedPathPos(),
+ new NaviCallback() {
@Override
public void onSuccess(NaviResult data) {
- Log.d(TAG, "getNavigationData onSuccess ----->");
List informationList = data.getResult().getInformations();
+ Log.d(TAG, "getNavigationData onSuccess informationList =" + informationList);
+ if (informationList == null || (informationList != null && informationList.size() == 0)) {
+ return;
+ }
+
//清除探路之前的数据
mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME);
@@ -999,7 +1003,6 @@ public class TanluCardViewFragment extends MvpFragment>
.longitude(informationList.get(i).lon);
optionList.add(options);
- Log.d(TAG, "lat =" + informationList.get(i).lat + ">>>lon =" + informationList.get(i).lon);
}
Logger.d(TAG, "getNavigationData optionList.size() = " + optionList.size());
mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true);
@@ -1117,6 +1120,11 @@ public class TanluCardViewFragment extends MvpFragment>
speakSuccessVoice(o.getResult().getInformations(), discription == null ? "" : discription);
List informationList = o.getResult().getInformations();
+ Log.d(TAG, "getVoiceControlRoadData onSuccess informationList =" + informationList);
+ if (informationList == null || (informationList != null && informationList.size() == 0)) {
+ return;
+ }
+
//清除探路之前的数据
mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME);
//添加埋点数据
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java
index 456fc5225b..f62763b6b2 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/NaviRoadRequest.java
@@ -8,10 +8,10 @@ import java.util.List;
* @since 2020-02-03
*/
public class NaviRoadRequest {
- public List coordinates;
+ public List coordinates;
public int limit;
- public NaviRoadRequest(List coordinates, int limit) {
+ public NaviRoadRequest(List coordinates, int limit) {
this.coordinates = coordinates;
this.limit = limit;
}
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
index e460cdc528..24e6d147a6 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/model/TanluModelData.java
@@ -10,6 +10,7 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.network.Utils;
+import com.mogo.map.MogoLatLng;
import com.mogo.module.tanlu.callback.AlongTheWayCallback;
import com.mogo.module.tanlu.callback.NaviCallback;
import com.mogo.module.tanlu.callback.RoadLineCallback;
@@ -287,14 +288,34 @@ public class TanluModelData {
}
/**
- * 获取导航沿途情报 TODO
+ * 组装需要的请求list
+ *
+ * @return
*/
- public void getNaviInformation(final NaviCallback callback) {
- Gson gson = new Gson();
+ private List getLatLngRequest(List latLnglist) {
+ List resultList = new ArrayList<>();
+ for (int i = 0; i < latLnglist.size(); i++) {
+ resultList.add(latLnglist.get(i).lng + "," + latLnglist.get(i).lat);
+ }
+ return resultList;
+ }
+
+ /**
+ * 获取导航沿途情报
+ */
+ public void getNaviInformation(List mogoLatLnglist, final NaviCallback callback) {
+ Gson gson = new Gson();
+ if (mogoLatLnglist == null) {
+ return;
+ }
+
+ NaviRoadRequest naviRoadRequest = new NaviRoadRequest(getLatLngRequest(mogoLatLnglist), 10);
+ String naviStr = gson.toJson(naviRoadRequest);
+ Log.d(TAG, "getNaviInformation naviStr = " + naviStr);
final Map params = new ParamsProvider.Builder(mContext)
.append("sn", Utils.getSn())
-// .append("data", uploadShareStr)
+ .append("data", naviStr)
.build();
mTanluApiService.getNaviInformation(params)
diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
index e0239d7ee5..02f0674e68 100644
--- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
+++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/SimpleCoverVideoPlayer.kt
@@ -2,6 +2,7 @@ package com.mogo.module.tanlu.video
import android.content.Context
import android.util.AttributeSet
+import android.util.Log
import android.view.Surface
import android.view.View
import android.widget.ImageView
@@ -77,6 +78,33 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer {
override fun changeUiToCompleteShow() {
super.changeUiToCompleteShow()
// setViewShowState(mBottomContainer, View.INVISIBLE)
+ Log.d("liyz", "changeUiToCompleteShow ------------>")
+ }
+
+ override fun hideAllWidget() {
+ super.hideAllWidget()
+ Log.d("liyz", "hideAllWidget ------------>")
+ mBottomContainer.visibility = View.VISIBLE
+ }
+
+ override fun changeUiToPrepareingClear() {
+ super.changeUiToPrepareingClear()
+ mBottomContainer.visibility = View.VISIBLE
+ }
+
+ override fun changeUiToPlayingBufferingClear() {
+ super.changeUiToPlayingBufferingClear()
+ mBottomContainer.visibility = View.VISIBLE
+ }
+
+ override fun changeUiToClear() {
+ super.changeUiToClear()
+ mBottomContainer.visibility = View.VISIBLE
+ }
+
+ override fun changeUiToCompleteClear() {
+ super.changeUiToCompleteClear()
+ mBottomContainer.visibility = View.INVISIBLE
}
override fun onAutoCompletion() {
diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
index 40a085df42..fcb133f346 100644
--- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
+++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
@@ -66,7 +66,8 @@
android:layout_below="@+id/layout_top_view"
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginRight="@dimen/tanlu_module_card_margin_left"
- android:background="@drawable/shape_bg_222533_9px">
+ >
+
96px
90px
700px
- 10px
+ 5px
72px
25px
diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
index 08d5243a1f..57993dcf50 100644
--- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
@@ -15,7 +15,7 @@
96px
100px
700px
- 10px
+ 5px
135px
50px
diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
index 131282c5a1..a2953cf57c 100644
--- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml
@@ -15,7 +15,7 @@
96px
144px
760px
- 10px
+ 5px
135px
50px