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 6066b2456c..403b350379 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 @@ -1,30 +1,20 @@ package com.mogo.module.extensions.entrance; -import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.Message; -import android.transition.AutoTransition; -import android.transition.Transition; -import android.transition.TransitionManager; import android.util.Log; -import android.view.LayoutInflater; import android.view.View; -import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.constraintlayout.motion.widget.MotionLayout; -import androidx.constraintlayout.motion.widget.MotionScene; import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.constraintlayout.widget.ConstraintSet; -import androidx.constraintlayout.widget.Group; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; @@ -47,8 +37,6 @@ import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.extensions.R; -import com.mogo.module.extensions.navi.NaviInfoView; -import com.mogo.module.extensions.navi.NaviInfoView2; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.share.ShareControl; import com.mogo.service.IMogoServiceApis; @@ -63,7 +51,6 @@ import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.ResourcesHelper; -import com.mogo.utils.logger.Logger; import java.util.HashMap; import java.util.Map; diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView2.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView2.java deleted file mode 100644 index a907ee7994..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView2.java +++ /dev/null @@ -1,170 +0,0 @@ -package com.mogo.module.extensions.navi; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; -import androidx.constraintlayout.motion.widget.MotionLayout; -import androidx.constraintlayout.widget.ConstraintLayout; - -import com.mogo.map.impl.amap.utils.IconTypeUtils; -import com.mogo.map.navi.MogoNaviInfo; - -import java.text.SimpleDateFormat; -import java.util.Calendar; - -/** - * @author congtaowang - * @since 2019-10-03 - *

- * 描述 - */ -public abstract class BaseNaviInfoView2 extends ConstraintLayout { - - public BaseNaviInfoView2(Context context ) { - this( context, null ); - } - - public BaseNaviInfoView2(Context context, @Nullable AttributeSet attrs ) { - this( context, attrs, 0 ); - } - - public BaseNaviInfoView2(Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { - super( context, attrs, defStyleAttr ); - } - - public void notifyChanged( MogoNaviInfo naviInfo ) { - - } - - protected void fillNextCrossTurning( TextView target, int nextIconType ) { - target.setText( "后" + IconTypeUtils.getNameByIconType( nextIconType ) ); - } - - protected void fillNextCrossIconType( ImageView target, int iconId ) { - if ( iconId > 0 ) { - target.setImageResource( iconId ); - } - } - - protected void fillNextCrossDistance( TextView target, TextView unit, int distance ) { - if ( distance >= 1000 ) { - target.setText( String.format( "%.1f", distance / 1000f ) ); - unit.setText( "km" ); - } else { - target.setText( distance + "" ); - unit.setText( "m" ); - } - } - - protected void fillFormatSurplusDistance( int m, StringBuilder builder ) { - if ( m >= 1000 ) { - builder.append( String.format( "%.1fkm", m / 1000f ) ); - } else { - builder.append( m ).append( "m" ); - } - } - - protected String getFormatSurplusDistance( int m ) { - if ( m >= 1000 ) { - mFormatSurplusDistanceUnit = "km"; - return String.format( "%.1f", m / 1000f ); - } else { - mFormatSurplusDistanceUnit = "m"; - return String.format( "%d", m ); - } - } - - private String mFormatSurplusDistanceUnit = ""; - - protected String getFormatSurplusDistanceUnit() { - return mFormatSurplusDistanceUnit; - } - - protected String getFormatSurplusTime( int seconds ) { - if ( seconds > 60 * 60 ) { - mFormatSurplusDistanceUnit = "h"; - return String.format( "%.1f", ( ( float ) seconds ) / 60 * 60 ); - } - - if ( seconds > 60 ) { - mFormatSurplusTimeUnit = "min"; - return String.format( "%.1f", ( ( float ) seconds ) / 60 ); - } - - mFormatSurplusTimeUnit = "s"; - return String.format( "%d", seconds ); - } - - private String mFormatSurplusTimeUnit = ""; - - protected String getFormatSurplusTimeUnit() { - return mFormatSurplusTimeUnit; - } - - protected void fillFormatTime( int seconds, StringBuilder builder ) { - int days = seconds / ( 24 * 60 * 60 ); - if ( days > 0 ) { - builder.append( days ).append( "天" ); - } - seconds -= days * 24 * 60 * 60; - int hours = seconds / ( 60 * 60 ); - if ( hours > 0 ) { - builder.append( hours ).append( "小时" ); - } - seconds -= hours * 60 * 60; - int min = seconds / 60; - builder.append( min > 1 ? min : 1 ).append( "分钟" ); - } - - protected String getArriveTime( int seconds ) { - int days = seconds / ( 24 * 60 * 60 ); - if ( days > 0 ) { - return String.format( "%d天后", days ); - } else { - seconds -= days * 24 * 60 * 60; - int hours = seconds / ( 60 * 60 ); - seconds -= hours * 60 * 60; - int min = seconds / 60; - Calendar calendar = Calendar.getInstance(); - int curHour = calendar.get( Calendar.HOUR_OF_DAY ); - int curMin = calendar.get( Calendar.MINUTE ); - if ( curHour + hours + ( curMin + min ) / 60 > 24 ) { - return "一天后"; - } else { - calendar.add( Calendar.HOUR_OF_DAY, hours ); - calendar.add( Calendar.MINUTE, min ); - SimpleDateFormat dateFormat = new SimpleDateFormat( "HH:mm" ); - return dateFormat.format( calendar.getTime() ); - } - } - } - - protected void fillArriveTime( int seconds, StringBuilder builder ) { - - int days = seconds / ( 24 * 60 * 60 ); - if ( days > 0 ) { - builder.append( days ).append( "天后" ); - } else { - seconds -= days * 24 * 60 * 60; - int hours = seconds / ( 60 * 60 ); - seconds -= hours * 60 * 60; - int min = seconds / 60; - Calendar calendar = Calendar.getInstance(); - int curHour = calendar.get( Calendar.HOUR_OF_DAY ); - int curMin = calendar.get( Calendar.MINUTE ); - if ( curHour + hours + ( curMin + min ) / 60 > 24 ) { - builder.append( "一天后" ); - } else { - calendar.add( Calendar.HOUR_OF_DAY, hours ); - calendar.add( Calendar.MINUTE, min ); - SimpleDateFormat dateFormat = new SimpleDateFormat( "HH:mm" ); - builder.append( dateFormat.format( calendar.getTime() ) ); - } - } - builder.append( "到达" ); - } -} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView2.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView2.java deleted file mode 100644 index 8c6784453f..0000000000 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView2.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.mogo.module.extensions.navi; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.constraintlayout.widget.Group; - -import com.mogo.module.extensions.R; - -/** - * 改变实现方式，使用MotionLayout来实现，方便增加动画 - * - * @author tongchenfei - */ -public class NaviInfoView2 extends BaseNaviInfoView2 { - private ImageView ivTurnIcon; - private View vBg; - private TextView tvNextDistance; - private TextView tvNextDistanceUnit; - private TextView tvNextTurnInfo; - private TextView tvNextRoad; - private Group remainDistanceGroup,remainTimeGroup, arriveTimeGroup; - - public NaviInfoView2(Context context) { - this(context,null); - } - - public NaviInfoView2(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public NaviInfoView2(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - ivTurnIcon = findViewById(R.id.module_map_id_navi_next_info_road_turn_icon); - vBg = findViewById(R.id.module_map_id_navi_bg); - tvNextDistance = findViewById(R.id.module_map_id_navi_next_info_distance); - tvNextRoad = findViewById(R.id.module_map_id_navi_next_info_road); - remainDistanceGroup = findViewById(R.id.remainDistanceGroup); - remainTimeGroup = findViewById(R.id.remainTimeGroup); - arriveTimeGroup = findViewById(R.id.arriveTimeGroup); - } - - /** - * 布局约束转成小的 - */ - public void setToSmall(){ - ivTurnIcon.getLayoutParams().width = - (int) getResources().getDimension(R.dimen.module_ext_navi_info_panel_turn_icon_small_width); - ivTurnIcon.getLayoutParams().height = - (int) getResources().getDimension(R.dimen.module_ext_navi_info_panel_turn_icon_small_width); - vBg.getLayoutParams().height = - (int) getResources().getDimension(R.dimen.module_ext_navi_info_panel_small_height); - - } - - public void setToBig(){ - ivTurnIcon.getLayoutParams().width = - (int) getResources().getDimension(R.dimen.module_ext_navi_info_panel_turn_icon_width); - ivTurnIcon.getLayoutParams().height = - (int) getResources().getDimension(R.dimen.module_ext_navi_info_panel_turn_icon_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 7b398b6a9d..d6f81c307b 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 @@ -5,14 +5,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - -