diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index b3e06f0569..509b373035 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -208,6 +208,9 @@ public class TopViewAnimHelper { // 顶部view还没有内容，需要整体下移 currentAnimatingView = view; viewCaches.add(view); +// if (naviBg.getVisibility() == View.VISIBLE) { +// tvNextRoad.setTextSize(getDimen(R.dimen.dp_34)); +// } topContainer.addView(view, params); topContainer.setChildAddedListener(child -> { @@ -219,7 +222,8 @@ public class TopViewAnimHelper { constraintSet.clone(topMotionLayout); - constraintSet.clear(R.id.module_entrance_id_top_container, ConstraintSet.BOTTOM); + constraintSet.clear(R.id.module_entrance_id_top_container, + ConstraintSet.BOTTOM); constraintSet.connect(R.id.module_entrance_id_top_container, ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP); // if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { @@ -237,6 +241,10 @@ public class TopViewAnimHelper { constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); + + constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, + R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, + (int) getDimen(R.dimen.dp_316)); } constraintSet.applyTo(topMotionLayout); ivTurnIcon.getLayoutParams().height = @@ -312,6 +320,10 @@ public class TopViewAnimHelper { // 顶部view仅剩一个view，需要整体上移 currentAnimatingView = view; isTopViewOut = true; +// if (naviBg.getVisibility() == View.VISIBLE) { +// tvNextRoad.setTextSize(getDimen(R.dimen +// .module_ext_navi_info_panel_next_info_road_textSize)); +// } if (naviBg.getVisibility() == View.VISIBLE) { remainDistanceGroup.setVisibility(View.VISIBLE); remainTimeGroup.setVisibility(View.VISIBLE); @@ -336,6 +348,8 @@ public class TopViewAnimHelper { constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, tvNextDistance.getId(), ConstraintSet.LEFT, 0); + constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, + R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0); } constraintSet.applyTo(topMotionLayout); @@ -381,6 +395,9 @@ public class TopViewAnimHelper { // naviBg.getLayoutParams().height = // (int) topMotionLayout.getContext().getResources().getDimension(R.dimen // .module_ext_navi_info_panel_height); + constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, + R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, + 0); constraintSet.applyTo(topMotionLayout); scene = Scene.NAVI_WITH_ROAD_EVENT; } else { @@ -397,6 +414,9 @@ public class TopViewAnimHelper { constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); + constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, + R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, + (int) getDimen(R.dimen.dp_316)); // ivTurnIcon.getLayoutParams().height = // (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_height); // ivTurnIcon.getLayoutParams().width = diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 946efb92ea..a587e80c8f 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -33,7 +33,7 @@ app:layout_constraintHorizontal_bias="0.501" app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container" app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container" - app:layout_constraintTop_toBottomOf="@id/module_entrance_id_top_container" /> + app:layout_constraintTop_toTopOf="@id/module_entrance_id_top_motion_layout" /> 12px 10px 40px - 28px + 34px 24px 28px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index be1987aaa6..3c05370d14 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -86,7 +86,7 @@ 12px 10px 40px - 28px + 34px 24px 28px 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 5aea7fe123..056450ac89 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 @@ -45,17 +45,17 @@ public class LaucherShareDialog implements View.OnClickListener { private boolean isShown = false; - private ImageView ivBlock; - private ImageView ivTrafficCheck; - private ImageView ivClosure; - private ImageView ivNeedHelp; + private TextView tvBlock; + private TextView tvTrafficCheck; + private TextView tvClosure; + private TextView tvNeedHelp; - private ImageView ivAccident; - private ImageView ivRealTimeTraffic; - private ImageView ivStagnantWater; - private ImageView ivRoadIcy; - private ImageView ivDenseFog; - private ImageView ivConstruction; + private TextView tvAccident; + private TextView tvRealTimeTraffic; + private TextView tvStagnantWater; + private TextView tvRoadIcy; + private TextView tvDenseFog; + private TextView tvConstruction; private Context mContext; private IMogoAnalytics mAnalytics; @@ -83,89 +83,89 @@ public class LaucherShareDialog implements View.OnClickListener { }); - ivBlock = body.findViewById(R.id.ivBlock); - ivTrafficCheck = body.findViewById(R.id.ivTrafficCheck); - ivClosure = body.findViewById(R.id.ivClosure); - ivNeedHelp = body.findViewById(R.id.ivSeekHelp); + tvBlock = body.findViewById(R.id.tvBlock); + tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck); + tvClosure = body.findViewById(R.id.tvClosure); + tvNeedHelp = body.findViewById(R.id.tvSeekHelp); - ivAccident = body.findViewById(R.id.ivAccident); - ivRealTimeTraffic = body.findViewById(R.id.ivRealTimeTraffic); - ivStagnantWater = body.findViewById(R.id.ivStagnantWater); - ivRoadIcy = body.findViewById(R.id.ivRoadIcy); - ivDenseFog = body.findViewById(R.id.ivDenseFog); - ivConstruction = body.findViewById(R.id.ivConstruction); + tvAccident = body.findViewById(R.id.tvAccident); + tvRealTimeTraffic = body.findViewById(R.id.tvRealTimeTraffic); + tvStagnantWater = body.findViewById(R.id.tvStagnantWater); + tvRoadIcy = body.findViewById(R.id.tvRoadIcy); + tvDenseFog = body.findViewById(R.id.tvDenseFog); + tvConstruction = body.findViewById(R.id.tvConstruction); } private void initListener() { - ivBlock.setOnClickListener(this); - ivNeedHelp.setOnClickListener(this); - ivTrafficCheck.setOnClickListener(this); - ivClosure.setOnClickListener(this); + tvBlock.setOnClickListener(this); + tvNeedHelp.setOnClickListener(this); + tvTrafficCheck.setOnClickListener(this); + tvClosure.setOnClickListener(this); - ivAccident.setOnClickListener(this); - ivRealTimeTraffic.setOnClickListener(this); - ivStagnantWater.setOnClickListener(this); - ivRoadIcy.setOnClickListener(this); - ivDenseFog.setOnClickListener(this); - ivConstruction.setOnClickListener(this); + tvAccident.setOnClickListener(this); + tvRealTimeTraffic.setOnClickListener(this); + tvStagnantWater.setOnClickListener(this); + tvRoadIcy.setOnClickListener(this); + tvDenseFog.setOnClickListener(this); + tvConstruction.setOnClickListener(this); } @Override public void onClick(View view) { int id = view.getId(); - if (id == R.id.ivBlock) { + if (id == R.id.tvBlock) { //拥堵 Logger.d(TAG,"点击拥堵"); traceTanluData("1"); sendShareReceiver(ShareConstants.TYPE_BLOCK); traceTypeData("1"); dismiss(); - } else if (id == R.id.ivTrafficCheck) { + } else if (id == R.id.tvTrafficCheck) { //交通检查 Logger.d(TAG,"点击交通检查"); traceData("1"); sendShareReceiver(ShareConstants.TYPE_TRAFFIC_CHECK); traceTypeData("3"); dismiss(); - } else if (id == R.id.ivClosure) { + } else if (id == R.id.tvClosure) { //封路 Logger.d(TAG,"点击封路"); traceData("1"); sendShareReceiver(ShareConstants.TYPE_CLOSURE); traceTypeData("4"); dismiss(); - } else if (id == R.id.ivSeekHelp) { + } else if (id == R.id.tvSeekHelp) { // 故障求助 Logger.d(TAG,"点击求助"); SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true); dismiss(); - } else if (id == R.id.ivAccident) { + } else if (id == R.id.tvAccident) { // 事故 Logger.d(TAG,"点击事故"); sendShareReceiver(ShareConstants.TYPE_ACCIDENT); dismiss(); - } else if (id == R.id.ivConstruction) { + } else if (id == R.id.tvConstruction) { // 道路施工 Logger.d(TAG,"点击道路施工"); sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION); dismiss(); - } else if (id == R.id.ivRealTimeTraffic) { + } else if (id == R.id.tvRealTimeTraffic) { // 实时路况 Logger.d(TAG,"点击实时路况"); sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC); dismiss(); - } else if (id == R.id.ivStagnantWater) { + } else if (id == R.id.tvStagnantWater) { // 道路积水 Logger.d(TAG,"点击道路积水"); sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER); dismiss(); - } else if (id == R.id.ivRoadIcy) { + } else if (id == R.id.tvRoadIcy) { // 道路结冰 Logger.d(TAG,"点击道路结冰"); sendShareReceiver(ShareConstants.TYPE_ROAD_ICY); dismiss(); - } else if (id == R.id.ivDenseFog) { + } else if (id == R.id.tvDenseFog) { // 浓雾 Logger.d(TAG,"点击浓雾"); sendShareReceiver(ShareConstants.TYPE_DENSE_FOG); diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png index 25a48d3421..9dd6d425c9 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png index 84938b8857..b504cffe87 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png index 191880b2b9..6a16103d0e 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png index 87f712f8c7..7defe6986d 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png index 57e9e67c75..d20dacee3a 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png index f41703de30..3c2ba1225c 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png index 3ff45f0ed0..53585d40d1 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png index 4f6774eae8..30f26921aa 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png index 32224d0816..f125b9f22e 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png index e27aa13c0a..1b5af5fe54 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png index 5a3fbe67df..cfcb9eb87f 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png index e13c42513d..0a54b48bad 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png index 85ab743696..160cdee6a6 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png index 049d213148..d9434fe5f1 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png index 1e25f9439b..a050e2b61c 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png index 56f1d320ab..4b82b87aa7 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png index b360bb4960..9edf8ac119 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png index 79ee716a3f..6ac62048b6 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png index 60bcfd519d..de26656f73 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png index 776f73a59c..a4660d5e0b 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index 7d79054f71..c21f932227 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -24,249 +24,148 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/share_module_title_margin_top" android:text="我要分享" + android:textColor="@color/white" android:drawableLeft="@drawable/module_share_title_icon" android:drawableRight="@drawable/module_share_title_icon" android:drawablePadding="@dimen/dp_40" - android:textColor="@color/white" android:textSize="@dimen/share_module_title_content" android:textStyle="bold" app:layout_constraintEnd_toEndOf="@+id/vBg" app:layout_constraintStart_toStartOf="@+id/vBg" app:layout_constraintTop_toTopOf="@+id/vBg" /> - - - - - + app:layout_constraintLeft_toLeftOf="@+id/vBg" + android:layout_marginStart="@dimen/dp_116" + android:layout_marginTop="@dimen/dp_78" + android:drawablePadding="@dimen/dp_30" /> - - - + android:drawablePadding="@dimen/dp_30" /> - - - + android:textColor="#fff" + android:gravity="center" + android:drawablePadding="@dimen/dp_30" /> - - - + android:textColor="#fff" + android:gravity="center" + android:drawablePadding="@dimen/dp_30" /> - - - + android:layout_marginEnd="@dimen/dp_116" + android:textColor="#fff" + android:gravity="center" + android:drawablePadding="@dimen/dp_30" /> - + android:textColor="#fff" + android:gravity="center" + app:layout_constraintTop_toBottomOf="@+id/tvBlock" + app:layout_constraintLeft_toLeftOf="@+id/tvBlock" + android:layout_marginTop="@dimen/dp_62" + android:drawablePadding="@dimen/dp_30" /> - + android:layout_marginTop="@dimen/dp_62" + android:drawablePadding="@dimen/dp_30" /> - + android:layout_marginTop="@dimen/dp_62" + android:drawablePadding="@dimen/dp_30" /> - + android:layout_marginTop="@dimen/dp_62" + android:gravity="center" + android:drawablePadding="@dimen/dp_30" /> + android:layout_marginTop="@dimen/dp_62" + android:gravity="center" + android:drawablePadding="@dimen/dp_30" /> \ No newline at end of file