yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

Browse Source
This commit is contained in:
zhangyuanzhen
2020-01-17 14:54:29 +08:00
parent 064f50a948 70d2e92560
commit ee6814f839
15 changed files with 369 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config.gradle
View File

@@ -101,8 +101,8 @@ ext {
// 在线车辆
moduleonlinecar : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}",
// 长链
socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0',
socketsdkconnsvrprotoco : 'com.zhidao.ptech:connsvr-protoco:0.1.23',
@@ -113,8 +113,5 @@ ext {
// 统一登录
accountsdk : "com.zhidao.accountservice:account-sdk:1.0.4",
modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}",
]
}

57
foudations/mogo-utils/src/main/java/com/mogo/utils/glide/GlideBlurTransformation.java Normal file
View File

@@ -0,0 +1,57 @@
package com.mogo.utils.glide;
import android.content.Context;
import android.graphics.Bitmap;
import android.renderscript.Allocation;
import android.renderscript.Element;
import android.renderscript.RenderScript;
import android.renderscript.ScriptIntrinsicBlur;
import androidx.annotation.NonNull;
import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
/**
* 使用Glide加载图片时，使该图片进行高斯模糊
* 基本用法：Glide.with(this).load(userInfo.headImgurl).apply(RequestOptions.bitmapTransform(GlideBlurTransformation(this))).into(ivCardBg)
*
* @author tongchenfei
*/
public class GlideBlurTransformation extends CenterCrop {
private static final float DEFAULT_BLUR_RADIUS = 25F;
private Context context;
private float blurRadius;
public GlideBlurTransformation(Context context) {
this(context, DEFAULT_BLUR_RADIUS);
}
public GlideBlurTransformation(Context context, float blurRadius) {
this.context = context;
this.blurRadius = blurRadius;
}
@Override
protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform,
int outWidth, int outHeight) {
Bitmap bitmap = super.transform(pool, toTransform, outWidth, outHeight);
return blurBitmap(bitmap, blurRadius, (int) (outWidth * 0.5), (int) (outHeight * 0.5));
}
private Bitmap blurBitmap(Bitmap bitmap, float blurRadius, int outWidth, int outHeight) {
Bitmap inputBitmap = Bitmap.createScaledBitmap(bitmap, outWidth, outHeight, false);
Bitmap outBitmap = Bitmap.createBitmap(inputBitmap);
RenderScript renderScript = RenderScript.create(context);
ScriptIntrinsicBlur blurScript = ScriptIntrinsicBlur.create(renderScript,
Element.U8_4(renderScript));
Allocation tmpIn = Allocation.createFromBitmap(renderScript, inputBitmap);
Allocation tmpOut = Allocation.createFromBitmap(renderScript, outBitmap);
blurScript.setRadius(blurRadius);
blurScript.setInput(tmpIn);
blurScript.forEach(tmpOut);
tmpOut.copyTo(outBitmap);
return outBitmap;
}
}

2
libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
View File

@@ -405,7 +405,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
Logger.e( TAG, "latlng = null or is illegal" );
return;
}
mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) );
mMapView.getMap().moveCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) );
}
@Override

56
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
View File

@@ -7,14 +7,12 @@ package com.mogo.module.common.entity;
public class MarkerNoveltyInfo {
private String type;
private MarkerLocation location;
private MarkerUserInfo userInfo;
/**
* @see MarkerPoiTypeEnum
*/
private String poiType;
private ContentData contentData;
public ContentData getContentData() {
return contentData;
}
@@ -47,21 +45,16 @@ public class MarkerNoveltyInfo {
this.type = type;
}
public MarkerUserInfo getUserInfo() {
return userInfo;
}
public void setUserInfo(MarkerUserInfo userInfo) {
this.userInfo = userInfo;
}
public class ContentData {
private String content;
private String iconUrl;
private String imgUrl;
private String infoId;
private Long likeNum;
private long likeNum;
private String title;
private boolean displayNavigation;
private String styleType;
public String getContent() {
return content;
@@ -95,11 +88,11 @@ public class MarkerNoveltyInfo {
this.infoId = infoId;
}
public Long getLikeNum() {
public long getLikeNum() {
return likeNum;
}
public void setLikeNum(Long likeNum) {
public void setLikeNum(long likeNum) {
this.likeNum = likeNum;
}
@@ -111,5 +104,44 @@ public class MarkerNoveltyInfo {
this.title = title;
}
public boolean isDisplayNavigation() {
return displayNavigation;
}
public void setDisplayNavigation(boolean displayNavigation) {
this.displayNavigation = displayNavigation;
}
public String getStyleType() {
return styleType;
}
public void setStyleType(String styleType) {
this.styleType = styleType;
}
@Override
public String toString() {
return "ContentData{" +
"content='" + content + '\'' +
", iconUrl='" + iconUrl + '\'' +
", imgUrl='" + imgUrl + '\'' +
", infoId='" + infoId + '\'' +
", likeNum=" + likeNum +
", title='" + title + '\'' +
", displayNavigation=" + displayNavigation +
", styleType='" + styleType + '\'' +
'}';
}
}
@Override
public String toString() {
return "MarkerNoveltyInfo{" +
"type='" + type + '\'' +
", location=" + location +
", poiType='" + poiType + '\'' +
", contentData=" + contentData +
'}';
}
}

14
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java
View File

@@ -56,6 +56,11 @@ import java.util.List;
* @since 2020-01-03
* <p>
* 数据刷新策略
* <p>
* 1. 位置移动触发刷新
* 2. 用户手势交互导致地图视图移动跨过当前视图
* 3. 用户手势缩小比例尺级别达2级
* 4. 用户交互语音导致地图视图移动，缩放，不触发刷新
*/
@Route( path = ServiceConst.PATH_REFRESH_STRATEGY )
public class MogoServiceProvider implements IMogoModuleProvider,
@@ -143,7 +148,6 @@ public class MogoServiceProvider implements IMogoModuleProvider,
public void onSuccess() {
// 用户手动操作地图刷新成功后，设置状态为 true，引发延时策略
mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, true, true );
mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, false, false );
}
@Override
@@ -452,6 +456,8 @@ public class MogoServiceProvider implements IMogoModuleProvider,
} else {
float distance = Utils.calculateLineDistance( mLastAutoRefreshLocation, new MogoLatLng( location.getLatitude(), location.getLongitude() ) );
if ( distance > mAutoRefreshStrategy.getDistance() ) {
// 触发自动刷新之前，将未消费的用户状态清除
mStatusManager.setUserInteractionStatus( ServiceConst.TYPE, false, false );
notifyRefreshData( mLastAutoRefreshLocation, getQueryRadius(), mAutoRefreshCallback );
}
}
@@ -464,9 +470,13 @@ public class MogoServiceProvider implements IMogoModuleProvider,
if ( mStatusManager.isSearchUIShow() ) {
return;
}
if ( mStatusManager.isUserInteracted() ) {
return;
}
Logger.d( TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新" );
Logger.i( TAG, "刷新半径 = %d, 点 = %s", radius, latLng );
int amount = mLastZoomLevel >= 10 ? 5 : 10;
mRefreshModel.refreshData( latLng, radius, mLastZoomLevel >= 10 ? 5 : 10, callback );
Logger.i( TAG, "刷新半径 = %d, 点 = %s, amount = %d", radius, latLng, amount );
}
@Override

94
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/TanluCardViewFragment.java
View File

@@ -50,7 +50,10 @@ import com.mogo.map.search.poisearch.MogoPoiResult;
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.service.receiver.MogoReceiver;
import com.mogo.module.share.ShareControl;
import com.mogo.module.tanlu.R;
@@ -62,6 +65,7 @@ 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.InformationAndLiveCarResult;
import com.mogo.module.tanlu.model.Items;
import com.mogo.module.tanlu.model.PathLineResult;
import com.mogo.module.tanlu.model.TanluModelData;
import com.mogo.module.tanlu.model.VoiceSearchResult;
@@ -294,7 +298,6 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getViewLifecycleOwner().getLifecycle().addObserver(mPresenter);
Logger.d(TAG, "onActivityCreated -------> ");
EventBus.getDefault().register(this);
initInterface();
initModelData();
@@ -357,9 +360,10 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
mEmptyLayout.setVisibility(View.GONE);
mRootLayout.setVisibility(View.VISIBLE);
Logger.d(TAG, "onMarkerClicked registerMogoMarkerClickListener = ");
Log.d(TAG, "onMarkerClicked registerMogoMarkerClickListener --1---- ");
MarkerExploreWay exploreWay = extractFromMarker(marker);
if (exploreWay == null) {
Log.e(TAG, "onMarkerClicked registerMogoMarkerClickListener --2---- ");
return false;
}
@@ -370,6 +374,8 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
handleData(exploreWay);
}
Log.d(TAG, "onMarkerClicked registerMogoMarkerClickListener --3----size() = " + markerExploreWayList.size());
//更新位置currentPosition
for (int i = 0; i < markerExploreWayList.size(); i++) {
if (markerExploreWayList.get(i) == exploreWay) {
@@ -413,7 +419,6 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
mogoIntentManager.registerIntentListener(TanluConstants.GO_TO_SHARE, mogoIntentListener);
}
/**
* 唤醒语音
*/
@@ -459,7 +464,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
Logger.d(TAG, "免唤醒 onCmdSelected mogoVoiceListener cmd =" + cmd);
if (cmd.equals(TanluConstants.PLAY_VIDEO)) { //播放路况 --ok
//TODO
FullMediaActivity.Companion.launch(getActivity(), mVideoUrl, mImageUrl, mTitle, mGenerateTime);
}
}
@@ -537,7 +542,6 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
}
} else if (id == R.id.tv_main_empty) { //上报路况
Logger.d(TAG, "tv_main_empty click -----> ");
sendShareReceiver("1");
}
}
@@ -661,6 +665,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
}
/**
* TODO
* C位事件,如何获取数据，需要有默认数据
* 如果只有一个数据，不显示上下切换按钮，没有数据显示空页面
*/
@@ -673,6 +678,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
Logger.d(TAG, "tanlu卡片 onPerform 有效 ---->");
mMarkerManager = mMogoMapService.getMarkerManager(getActivity());
List<IMogoMarker> markers = mMarkerManager.getMarkers(TanluConstants.MODEL_NAME);
if (markers != null && markers.size() > 0) {
mEmptyLayout.setVisibility(View.GONE);
mRootLayout.setVisibility(View.VISIBLE);
@@ -685,6 +691,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
markerExploreWayList.add(exploreWay);
}
Log.e("TAG", "tanlu卡片 onPerform 有效 markerExploreWayList.size() =" + markerExploreWayList.size());
if (markers.size() == 1) {
mPreviousTv.setVisibility(View.GONE);
mNextTv.setVisibility(View.GONE);
@@ -702,11 +709,17 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
refreshVideoData(markerExploreWay);
}
}
} else {
mEmptyLayout.setVisibility(View.VISIBLE);
mRootLayout.setVisibility(View.GONE);
mEmptyTv.setText(Html.fromHtml(getContext().getString(R.string.main_empty_content)));
}
//TODO liyz
getRoadLineData();
}
/**
@@ -830,7 +843,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
/**
* 上报分享信息
* 上报分享信息 TODO
*/
private void uploadShareInfo(String poiType, String poiImgUrl, String nickname, String headImgUrl) {
double lat = TanluServiceHandler.getLocationClient().getLastKnowLocation().getLatitude();
@@ -965,6 +978,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
String cityCode = TanluServiceHandler.getLocationClient().getLastKnowLocation().getCityCode();
//移动到具体位置
mMogoStatusManager.setUserInteractionStatus(TanluConstants.MODEL_NAME, true, true);
MogoLatLng latLng = new MogoLatLng(lat, lon);
mMApUIController.moveToCenter(latLng);
@@ -976,12 +990,15 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
Logger.d(TAG, "getVoiceControlRoadData discription = " + discription);
if (o.getResult().getInformations() != null && o.getResult().getInformations().size() > 0) {
if (markerExploreWayList != null && markerExploreWayList.size() > 0) {
markerExploreWayList.clear(); //
markerExploreWayList.clear(); //刷新之前先删除之前的，然后再添加成请求的
currentPosition = 0;
}
//转换数据结构
convertData(o.getResult().getInformations());
//切换到探路卡片
if (!isCurrentPage) {
//切换探路卡片
iMogoCardManager.switch2(TanluConstants.MODEL_NAME);
}
@@ -990,13 +1007,13 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
List<Information> informationList = o.getResult().getInformations();
//清除探路之前的数据
mMarkerManager.removeMarkers(TanluConstants.MODEL_NAME);
mMogoStatusManager.setUserInteractionStatus(TanluConstants.MODEL_NAME, true, false);
//打点
ArrayList<MogoMarkerOptions> optionList = new ArrayList<>();
for (int i = 0; i < informationList.size(); i++) {
//根据type确定添加的图片
String trafficType = informationList.get(i).trafficInfoType;
Log.e(TAG, "trafficType =" + trafficType);
if (trafficType.equals("traffic_jam")) { //拥堵
multiMarkerIcon = BitmapFactory.decodeResource(getResources(), R.drawable.tanlu_marker_block_up);
} else if (trafficType.equals("car_checking")) { //查车
@@ -1014,6 +1031,7 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
.longitude(informationList.get(i).lon);
optionList.add(options);
Log.e(TAG, "lat =" + informationList.get(i).lat + ">>>lon =" + informationList.get(i).lon);
}
Logger.d(TAG, "getVoiceControlRoadData optionList.size() = " + optionList.size());
mMarkerManager.addMarkers(TanluConstants.MODEL_NAME, optionList, true);
@@ -1035,6 +1053,64 @@ public class TanluCardViewFragment extends MvpFragment<IView, Presenter<IView>>
});
}
/**
* 将探路的数据结构转换成 MarkerExploreWay的列表
*/
private void convertData(List<Information> informations) {
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);
}
Log.e(TAG, "convertData markerExploreWayList.size() =" + markerExploreWayList.size());
}
/**
* 转换媒体数据
* @param items
* @return
*/
private List<MarkerExploreWayItem> convertMediaData(ArrayList<Items> items) {
List<MarkerExploreWayItem> 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<Information> informations, String

5
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/FullMediaActivity.kt
View File

@@ -49,7 +49,6 @@ class FullMediaActivity : AppCompatActivity(), View.OnClickListener {
}
}
private var control = HideControl()
private var gsyVideoOptionBuilder = GSYVideoOptionBuilder()
private var videoUrl: String? = null
@@ -103,12 +102,12 @@ class FullMediaActivity : AppCompatActivity(), View.OnClickListener {
video_view.onCompletionListener(object :
MediaCoverVideoPlayer.CompletionListener {
override fun onCompletion() {
Log.d("liyz", "FullMediaActivity ---- onCompletion ");
GSYVideoManager.releaseAllVideos()
Log.d("liyz", "FullMediaActivity ----> onAutoCompletion ")
finish()
}
})
video_view
video_view.loadCoverImage(thumbUrl!!)
//设置url，点击播放
gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(true)

19
modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/video/MediaCoverVideoPlayer.kt
View File

@@ -5,6 +5,7 @@ import android.util.AttributeSet
import android.util.Log
import android.view.View
import android.widget.ImageView
import android.widget.SeekBar
import com.bumptech.glide.Glide
import com.mogo.module.tanlu.R
import com.shuyu.gsyvideoplayer.GSYVideoManager
@@ -110,6 +111,12 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer {
override fun onAutoCompletion() {
super.onAutoCompletion()
mProgressBar.progress = 0
completionListener.let {
it.onCompletion()
}
Log.d("liyz", "MediaCoverVideoPlayer onAutoCompletion ------->")
}
override fun showWifiDialog() {
@@ -136,17 +143,16 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer {
}
/**
* 多次回调 TODO
* 多次回调
*/
override fun onCompletion() {
super.onCompletion()
Log.d("liyz", "MediaCoverVideoPlayer onCompletion --------->")
completionListener.let {
it.onCompletion()
}
}
override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
super.onProgressChanged(seekBar, progress, fromUser)
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
@@ -156,9 +162,6 @@ class MediaCoverVideoPlayer : StandardGSYVideoPlayer {
}
}
mFullPauseBitmap = null
Log.d("liyz", "recycle.")
}
}

24
modules/mogo-module-tanlu/src/main/res/layout/tanlu_activity_media_full.xml
View File

@@ -19,17 +19,17 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout_media"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_132"
android:layout_height="@dimen/tanlu_module_full_top_height"
android:background="@color/color_191C25"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_media_back"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_marginLeft="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_36"
android:layout_width="@dimen/tanlu_module_full_back_width"
android:layout_height="@dimen/tanlu_module_full_back_height"
android:layout_marginLeft="@dimen/tanlu_module_full_margin_left"
android:layout_marginTop="@dimen/tanlu_module_full_margin_top"
android:clickable="true"
android:src="@drawable/public_arrow_back_iv"
app:layout_constraintLeft_toLeftOf="parent"
@@ -37,15 +37,15 @@
<TextView
android:id="@+id/tv_media_title_content"
android:layout_width="@dimen/dp_660"
android:layout_width="@dimen/tanlu_module_full_margin_width"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginTop="@dimen/tanlu_module_full_margin_top"
android:ellipsize="end"
android:gravity="center"
android:maxWidth="@dimen/dp_560"
android:maxWidth="700px"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="@dimen/dp_38"
android:textSize="@dimen/tanlu_module_full_title_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -54,11 +54,11 @@
android:id="@+id/tv_media_title_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_42"
android:layout_marginRight="@dimen/dp_100"
android:layout_marginTop="@dimen/tanlu_module_full_margin_top"
android:layout_marginRight="@dimen/tanlu_module_full_margin_right"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dp_26"
android:textSize="@dimen/tanlu_module_full_title_time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

61
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_660"
android:layout_height="@dimen/dp_660"
android:layout_width="@dimen/tanlu_module_card_width"
android:layout_height="@dimen/tanlu_module_card_width"
android:background="@drawable/tanlu_gradual_change_bg">
<!--正常显示数据-->
@@ -21,15 +21,15 @@
android:id="@+id/tv_information_media_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_58"
android:layout_marginRight="@dimen/dp_24"
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginTop="@dimen/tanlu_module_card_address_margin_top"
android:layout_marginRight="@dimen/tanlu_module_card_margin_left"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:text="@string/main_empty_location"
android:textColor="@color/white"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/tanlu_module_card_address_size"
android:textStyle="bold" />
<TextView
@@ -37,12 +37,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_information_media_content"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_1"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginTop="@dimen/tanlu_module_card_distance_margin_top"
android:layout_marginBottom="@dimen/tanlu_module_card_distance_margin_bottom"
android:text="666KM"
android:textColor="@color/color_99FFFFFF"
android:textSize="@dimen/dp_26"
android:textSize="@dimen/tanlu_module_card_distance_size"
android:textStyle="bold" />
<TextView
@@ -52,20 +52,20 @@
android:layout_below="@+id/tv_information_media_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_24"
android:layout_marginRight="@dimen/tanlu_module_card_margin_left"
android:text="2019-10-10"
android:textColor="@color/color_99FFFFFF"
android:textSize="@dimen/dp_26" />
android:textSize="@dimen/tanlu_module_card_distance_size" />
</RelativeLayout>
<!--视频播放器和图片播放器-->
<RelativeLayout
android:id="@+id/media_layout"
android:layout_width="@dimen/dp_596"
android:layout_height="@dimen/dp_355"
android:layout_width="@dimen/tanlu_module_card_video_width"
android:layout_height="@dimen/tanlu_module_card_video_height"
android:layout_below="@+id/layout_top_view"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24"
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">
<com.mogo.module.tanlu.video.SimpleCoverVideoPlayer
@@ -85,14 +85,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/media_layout"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginLeft="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_24">
android:layout_marginTop="@dimen/tanlu_module_card_video_marginbottom"
android:layout_marginLeft="@dimen/tanlu_module_card_margin_left"
android:layout_marginRight="@dimen/tanlu_module_card_margin_left">
<TextView
android:id="@+id/tv_previous_res"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_90"
android:layout_width="@dimen/tanlu_module_card_previous_width"
android:layout_height="@dimen/tanlu_module_card_previous_height"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/dp_40"
android:background="@drawable/shape_bg_222533"
@@ -101,12 +101,12 @@
android:drawablePadding="@dimen/dp_40"
android:text="@string/tanlu_previous"
android:textColor="@color/white"
android:textSize="@dimen/dp_28" />
android:textSize="@dimen/tanlu_module_card_next_size" />
<TextView
android:id="@+id/tv_next_res"
android:layout_width="@dimen/dp_300"
android:layout_height="@dimen/dp_90"
android:layout_width="@dimen/tanlu_module_card_previous_width"
android:layout_height="@dimen/tanlu_module_card_previous_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
@@ -117,7 +117,7 @@
android:gravity="center_vertical"
android:text="@string/tanlu_next"
android:textColor="@color/white"
android:textSize="@dimen/dp_28" />
android:textSize="@dimen/tanlu_module_card_next_size" />
</RelativeLayout>
</RelativeLayout>
@@ -125,7 +125,7 @@
<!--空数据显示-->
<RelativeLayout
android:id="@+id/layout_empty_data_show"
android:layout_width="@dimen/dp_660"
android:layout_width="@dimen/tanlu_module_card_width"
android:layout_height="match_parent"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
@@ -135,7 +135,9 @@
android:id="@+id/iv_main_empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_122"
android:layout_marginLeft="@dimen/tanlu_module_card_empty_maginleft"
android:layout_marginRight="@dimen/tanlu_module_card_empty_maginleft"
android:layout_marginTop="@dimen/tanlu_module_card_empty_magintop"
android:src="@mipmap/main_view_empty_bg" />
<TextView
@@ -143,10 +145,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_main_empty"
android:layout_marginTop="@dimen/dp_70"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/tanlu_module_card_empty_tv_magintop"
android:text="@string/main_empty_content"
android:textColor="@color/white"
android:textSize="@dimen/dp_34" />
android:textSize="@dimen/tanlu_module_card_address_size" />
</RelativeLayout>
</RelativeLayout>

15
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover.xml
View File

@@ -33,11 +33,11 @@
<LinearLayout
android:id="@+id/layout_bottom"
android:layout_width="@dimen/dp_760"
android:layout_height="@dimen/dp_144"
android:layout_width="@dimen/tanlu_module_full_bottom_width"
android:layout_height="@dimen/tanlu_module_full_bottom_height"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginBottom="@dimen/tanlu_module_full_bottom_margin"
android:background="@drawable/shape_bg_99191c25_4px"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -60,21 +60,22 @@
android:id="@+id/fullscreen"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:visibility="gone"
android:scaleType="centerInside" />
</LinearLayout>
<ImageView
android:id="@+id/start"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:layout_width="@dimen/tanlu_module_full_start_width"
android:layout_height="@dimen/tanlu_module_full_start_height"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="@dimen/dp_96"
android:layout_height="@dimen/dp_96"
android:layout_width="@dimen/tanlu_module_full_loading_width"
android:layout_height="@dimen/tanlu_module_full_loading_height"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:indeterminateDrawable="@drawable/loading_bg"

12
modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_video_cover_media.xml
View File

@@ -35,10 +35,10 @@
<LinearLayout
android:id="@+id/layout_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_72"
android:layout_height="@dimen/tanlu_module_bottom_height"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_5"
android:layout_marginBottom="@dimen/tanlu_module_bottom_margin"
android:background="@color/color_99191C25"
android:gravity="center_vertical"
android:orientation="horizontal">
@@ -67,16 +67,16 @@
<ImageView
android:id="@+id/start"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:layout_width="@dimen/tanlu_module_start_width"
android:layout_height="@dimen/tanlu_module_start_width"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:layout_width="@dimen/tanlu_module_loading_width"
android:layout_height="@dimen/tanlu_module_loading_height"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:indeterminateDrawable="@drawable/loading_bg"

43
modules/mogo-module-tanlu/src/main/res/values-ldpi/dimens.xml
View File

@@ -1,4 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--bottom top -->
<dimen name="tanlu_module_start_width">56px</dimen>
<dimen name="tanlu_module_start_height">56px</dimen>
<dimen name="tanlu_module_loading_width">48px</dimen>
<dimen name="tanlu_module_loading_height">48px</dimen>
<dimen name="tanlu_module_bottom_height">72px</dimen>
<dimen name="tanlu_module_bottom_margin">5px</dimen>
<dimen name="tanlu_module_full_start_width">56px</dimen>
<dimen name="tanlu_module_full_start_height">56px</dimen>
<dimen name="tanlu_module_full_loading_width">96px</dimen>
<dimen name="tanlu_module_full_loading_height">96px</dimen>
<dimen name="tanlu_module_full_bottom_height">144px</dimen>
<dimen name="tanlu_module_full_bottom_width">760px</dimen>
<dimen name="tanlu_module_full_bottom_margin">10px</dimen>
<dimen name="tanlu_module_full_top_height">72px</dimen>
<dimen name="tanlu_module_full_back_width">25px</dimen>
<dimen name="tanlu_module_full_back_height">25px</dimen>
<dimen name="tanlu_module_full_margin_left">16px</dimen>
<dimen name="tanlu_module_full_margin_right">48px</dimen>
<dimen name="tanlu_module_full_margin_top">22px</dimen>
<dimen name="tanlu_module_full_margin_width">700px</dimen>
<dimen name="tanlu_module_card_width">352px</dimen>
<dimen name="tanlu_module_card_margin_left">12px</dimen>
<dimen name="tanlu_module_card_address_margin_top">32px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">4px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">1px</dimen>
<dimen name="tanlu_module_card_video_width">327px</dimen>
<dimen name="tanlu_module_card_video_height">189px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">10px</dimen>
<dimen name="tanlu_module_card_previous_width">160px</dimen>
<dimen name="tanlu_module_card_previous_height">48px</dimen>
<dimen name="tanlu_module_card_empty_magintop">65px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">109px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">28px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">20px</dimen>
<dimen name="tanlu_module_full_title_time">14px</dimen>
<dimen name="tanlu_module_card_address_size">18px</dimen>
<dimen name="tanlu_module_card_distance_size">14px</dimen>
<dimen name="tanlu_module_card_next_size">15px</dimen>
</resources>

49
modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
View File

@@ -1,9 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="tanlu_module_marginleft">4px</dimen>
<!--bottom top -->
<dimen name="tanlu_module_start_width">106px</dimen>
<dimen name="tanlu_module_start_height">106px</dimen>
<dimen name="tanlu_module_loading_width">48px</dimen>
<dimen name="tanlu_module_loading_height">48px</dimen>
<dimen name="tanlu_module_bottom_height">72px</dimen>
<dimen name="tanlu_module_bottom_margin">5px</dimen>
<dimen name="tanlu_module_666px">666px</dimen>
<dimen name="tanlu_module_full_start_width">106px</dimen>
<dimen name="tanlu_module_full_start_height">106px</dimen>
<dimen name="tanlu_module_full_loading_width">96px</dimen>
<dimen name="tanlu_module_full_loading_height">96px</dimen>
<dimen name="tanlu_module_full_bottom_height">144px</dimen>
<dimen name="tanlu_module_full_bottom_width">760px</dimen>
<dimen name="tanlu_module_full_bottom_margin">10px</dimen>
<dimen name="tanlu_module_full_top_height">135px</dimen>
<dimen name="tanlu_module_full_back_width">50px</dimen>
<dimen name="tanlu_module_full_back_height">50px</dimen>
<dimen name="tanlu_module_full_margin_left">30px</dimen>
<dimen name="tanlu_module_full_margin_right">92px</dimen>
<dimen name="tanlu_module_full_margin_top">40px</dimen>
<dimen name="tanlu_module_full_margin_width">800px</dimen>
<dimen name="tanlu_module_card_width">660px</dimen>
<dimen name="tanlu_module_card_margin_left">24px</dimen>
<dimen name="tanlu_module_card_address_margin_top">58px</dimen>
<dimen name="tanlu_module_card_distance_margin_bottom">8px</dimen>
<dimen name="tanlu_module_card_distance_margin_top">2px</dimen>
<dimen name="tanlu_module_card_video_width">613px</dimen>
<dimen name="tanlu_module_card_video_height">355px</dimen>
<dimen name="tanlu_module_card_video_marginbottom">20px</dimen>
<dimen name="tanlu_module_card_previous_width">300px</dimen>
<dimen name="tanlu_module_card_previous_height">90px</dimen>
<dimen name="tanlu_module_card_empty_magintop">75px</dimen>
<dimen name="tanlu_module_card_empty_maginleft">205px</dimen>
<dimen name="tanlu_module_card_empty_tv_magintop">25px</dimen>
<!--字体-->
<dimen name="tanlu_module_full_title_content">38px</dimen>
<dimen name="tanlu_module_full_title_time">26px</dimen>
<dimen name="tanlu_module_card_address_size">34px</dimen>
<dimen name="tanlu_module_card_distance_size">26px</dimen>
<dimen name="tanlu_module_card_next_size">28px</dimen>
</resources>
</resources>

9
services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
View File

@@ -66,7 +66,14 @@ public class MogoStatusManager implements IMogoStatusManager {
@Override
public boolean isUserInteracted() {
return get_bool_val( StatusDescriptor.USER_INTERACTED );
try {
return get_bool_val( StatusDescriptor.USER_INTERACTED );
} catch ( Exception e ) {
return false;
} finally {
// 恢复消费过的状态
mStatus.put( StatusDescriptor.USER_INTERACTED, false );
}
}
@Override