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

Merge branch 'dev' into qa_1.1

Browse Source
This commit is contained in:
董宏宇
2020-07-28 19:28:18 +08:00
parent 421a4bde57 b8de235aa7
commit 3ab54e0c80
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -379,7 +379,7 @@ public class TopViewAnimHelper {
// 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
// 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
ivTurnIcon.getId(), ConstraintSet.BOTTOM);
ivTurnIcon.getId(), ConstraintSet.BOTTOM,(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
// constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP,
// ivTurnIcon.getId(), ConstraintSet.TOP);
// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
@@ -560,7 +560,8 @@ public class TopViewAnimHelper {
// 调整约束
constraintSet.clone(topMotionLayout);
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
ivTurnIcon.getId(), ConstraintSet.BOTTOM);
ivTurnIcon.getId(), ConstraintSet.BOTTOM,
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
tvNextDistance.getId(), ConstraintSet.BOTTOM,

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
View File

@@ -194,9 +194,9 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
tvDistance.setText(distance);
SpanUtils.with(tvDistance)
.append("" + distance)
.setFontSize(80)
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize(30)
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
.create();
tvEventTime.setText(eventTime);
}

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
View File

@@ -98,9 +98,9 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
}
SpanUtils.with(mTvAddressDistance)
.append("" + (int) entity.getDistance())
.setFontSize(80)
.setFontSize((int) getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize(30)
.setFontSize((int) getResources().getDimension(R.dimen.dp_30))
.create();
countDownV2XEvent(entity);
}