diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java index 34a3bfe4be..e691431c75 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerNaviToDestinationModel.java @@ -49,7 +49,7 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener { protected final List eList = new ArrayList(); protected List mWayPointList = new ArrayList(); private IOCHTaxiPassengerNaviChangedCallback mNaviChangedCallback; - private AtomicInteger errorCount = new AtomicInteger(0); +// private AtomicInteger errorCount = new AtomicInteger(0); //只要订单在 如果算错就重新算，不再有次数限制 private boolean isPlay; private volatile int mFirstcalculateDriveRoute = 0; @@ -147,19 +147,19 @@ public class TaxiPassengerNaviToDestinationModel implements AMapNaviListener { @Override public void onCalculateRouteSuccess(AMapCalcRouteResult aMapCalcRouteResult) { - errorCount.set(0); +// errorCount.set(0); } @Override public void onCalculateRouteFailure(AMapCalcRouteResult result) { //路线计算失败 //多路径算路成功回调 - if (errorCount.get() < 20){ - errorCount.getAndIncrement(); +// if (errorCount.get() < 20){ +// errorCount.getAndIncrement(); if (mNaviChangedCallback != null){ mNaviChangedCallback.reInitNaviAmap(isPlay,true); } - } +// } if (!NetworkUtils.isConnected(mContext) || result.getErrorCode() == 2){ if (mNaviChangedCallback != null){ mNaviChangedCallback.reInitNaviAmap(isPlay,false); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/GradientTextView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/GradientTextView.java index a936f9f411..163d8a9d88 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/GradientTextView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/GradientTextView.java @@ -17,7 +17,6 @@ public class GradientTextView extends AppCompatTextView { private LinearGradient mLinearGradient; private Paint mPaint; -// private Paint strokPaint; private int mViewWidth = 0;//文字的宽度 private int mViewHeight = 0;//文字的高度 private Rect mTextBound = new Rect(); @@ -49,26 +48,15 @@ public class GradientTextView extends AppCompatTextView { } else { mViewWidth = getMeasuredWidth(); } -// strokPaint = getPaint(); mPaint = getPaint(); String mTipText = getText().toString(); - mPaint.getTextBounds(mTipText, 0, mTipText.length(), mTextBound); - //前面4个参数分别表示渐变的开始x轴,开始y轴,结束的x轴,结束的y轴,mcolorList表示渐变的颜色数组 - mLinearGradient = new LinearGradient(0, 0, mViewWidth, mViewHeight, mColorList, null, Shader.TileMode.CLAMP); - mPaint.setShader(mLinearGradient); -// if (mViewWidth == 0) { -// measure(0, 0); -// mViewWidth = (int) (getMeasuredWidth() + strokPaint.getStrokeWidth() * 2); -// setWidth(mViewWidth); -// } -// float y = getBaseline(); -// float x = (mViewWidth - strokPaint.measureText(mTipText)) / 2; -// + setStyle(); + + mPaint.getTextBounds(mTipText, 0, mTipText.length(), mTextBound); + mPaint.setShadowLayer(mRadius, mdx, mdy, mColor); -// //画出投影 -// canvas.drawText(mTipText, x, y, strokPaint); //画出文字 canvas.drawText(mTipText, getMeasuredWidth() / 2 - mTextBound.width() / 2, getMeasuredHeight() / 2 + mTextBound.height() / 2, mPaint); } @@ -89,38 +77,24 @@ public class GradientTextView extends AppCompatTextView { */ public void setmColorList(int[] mColorList) { if (mColorList != null && mColorList.length < 2) { - throw new RuntimeException("mClorList's length must be > 2"); + throw new RuntimeException("ClorList's length must be > 2"); } else { this.mColorList = mColorList; } } - /** - * @param strokeColor - * @param strokewidth - * @param shader - */ -// public void setStyle(int strokeColor, float strokewidth, Shader shader) { -// strokPaint.setAntiAlias(true); -// // 设定是否使用图像抖动处理，会使绘制出来的图片颜色更加平滑和饱满，图像更加清晰 -// strokPaint.setDither(true); -// // 如果该项设置为true，则图像在动画进行中会滤掉对Bitmap图像的优化操作，加快显示 -// // 速度，本设置项依赖于dither和xfermode的设置 -// strokPaint.setFilterBitmap(true); -// -// strokPaint.setStrokeWidth(strokewidth); -// strokPaint.setColor(strokeColor); -// // 设置绘制时各图形的结合方式，如平滑效果等 -// strokPaint.setStrokeJoin(Paint.Join.ROUND); -// // 当画笔样式为STROKE或FILL_OR_STROKE时，设置笔刷的图形样式，如圆形样式 -// // Cap.ROUND,或方形样式Cap.SQUARE -// strokPaint.setStrokeCap(Paint.Cap.ROUND); -// strokPaint.setStyle(Paint.Style.STROKE); -// -// float textsize = getTextSize(); -// strokPaint.setTextSize(textsize); -// } + public void setStyle() { + mPaint.setAntiAlias(true); + mPaint.setDither(true); + mPaint.setFilterBitmap(true); + //前面4个参数分别表示渐变的开始x轴,开始y轴,结束的x轴,结束的y轴,mcolorList表示渐变的颜色数组 + mLinearGradient = new LinearGradient(0, 0, mViewWidth, mViewHeight, mColorList, null, Shader.TileMode.CLAMP); + mPaint.setShader(mLinearGradient); + mPaint.setStrokeJoin(Paint.Join.ROUND); + mPaint.setStrokeCap(Paint.Cap.ROUND); + mPaint.setStyle(Paint.Style.FILL_AND_STROKE); + } /** * 设置投影层 diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java index c6ef67d648..199381d4a9 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java @@ -197,11 +197,10 @@ public class TaxiPassengerMapDirectionView //第二个参数为四周留空宽度 mAMap.animateCamera(CameraUpdateFactory.newLatLngBounds(boundsBuilder.build(), 100)); -// cameraPosition = new CameraPosition.Builder().bearing(location.getBearing()).build(); -// mAMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition)); } else { //设置希望展示的地图缩放级别 - CameraPosition cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); + CameraPosition cameraPosition = new CameraPosition.Builder() + .target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build(); mAMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition)); } } @@ -229,7 +228,7 @@ public class TaxiPassengerMapDirectionView polylineOptions.addAll(mCoordinatesLatLng); polylineOptions.colorValues(colorList); // 1FC3FF -> 57ABFF polylineOptions.useGradient(true); - polylineOptions.width(9); + polylineOptions.width(5); // 绘制线 mPolyline = mAMap.addPolyline(polylineOptions); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java index a63882b9d5..3c7886ac16 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java @@ -8,7 +8,6 @@ import android.location.Location; import android.os.Build; import android.os.Bundle; import android.os.Looper; -import android.text.SpannableStringBuilder; import android.view.View; import android.view.animation.Animation; import android.view.animation.RotateAnimation; @@ -56,6 +55,7 @@ public class TaxiPassengerServingOrderFragment extends private final String TAG = TaxiPassengerServingOrderFragment.class.getSimpleName(); private GradientTextView mTPSpeedTv; + private TextView mTPSpeedTvShadowBg; private TextView mTPOrderStatus; private TextView mTPOrderStartStation; @@ -99,7 +99,11 @@ public class TaxiPassengerServingOrderFragment extends protected void initViews() { mTPSpeedTv = findViewById(R.id.taxi_p_speed_tv); + mTPSpeedTvShadowBg = findViewById(R.id.taxi_p_speed_tv_bg); mTPSpeedTv.setVertrial(true); + mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_normal_color1),getResources().getColor(R.color.taxi_p_speed_normal_color2)}); + mTPSpeedTv.setText(String.valueOf(0)); + mTPSpeedTvShadowBg.setText(String.valueOf(0)); mTPOrderStatus = findViewById(R.id.taxi_p_order_status_tv); mTPOrderStartStation = findViewById(R.id.taxi_p_order_status_start_station_tv); @@ -317,7 +321,7 @@ public class TaxiPassengerServingOrderFragment extends @Override protected void initViews(Bundle savedInstanceState) { super.initViews(savedInstanceState); - mMapDirectionView = findViewById(R.id.taxi_p_order_map_view); + mMapDirectionView = mRootView.findViewById(R.id.taxi_p_order_map_view); mMapDirectionView.onCreateView(savedInstanceState); mMapDirectionView.setTaxiPassengerMapViewCallback(this); } @@ -475,14 +479,16 @@ public class TaxiPassengerServingOrderFragment extends int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值 CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"mLimitingVelocity = "+mLimitingVelocity); if (mLimitingVelocity > 0 && speed >= mLimitingVelocity) { - mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_speed_warn_color1),getResources().getColor(R.color.taxi_speed_warn_color2)}); -// mTPSpeedTv.setShadowLayerCustom(4,1,1,getResources().getColor(R.color.taxi_p_speed_shadow_color)); + mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_warn_color1),getResources().getColor(R.color.taxi_p_speed_warn_color2)}); mTPSpeedTv.setText(String.valueOf(speed)); + mTPSpeedTvShadowBg.setText(String.valueOf(speed)); + mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_red_bg); } else { - mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_speed_normal_color1),getResources().getColor(R.color.taxi_speed_normal_color2)}); -// mTPSpeedTv.setShadowLayerCustom(4,1,1,getResources().getColor(R.color.taxi_p_speed_shadow_color)); + mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_normal_color1),getResources().getColor(R.color.taxi_p_speed_normal_color2)}); mTPSpeedTv.setText(String.valueOf(speed)); + mTPSpeedTvShadowBg.setText(String.valueOf(speed)); + mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_green_bg); } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png index 9f4ab3739b..a81336d4c2 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_end.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png index 98b1435404..3cee184981 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_view_dir_start.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png index 3560f659ef..ab00b6fde3 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_seekbar_point_icon.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png index 9f4ab3739b..a81336d4c2 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_end.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png index 98b1435404..3cee184981 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_view_dir_start.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml index bc23765570..6a8924c351 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_activity_serving_order_view.xml @@ -257,9 +257,9 @@ android:id="@+id/taxi_p_order_map_view" android:layout_width="match_parent" android:layout_height="@dimen/taxi_p_order_map_height" + android:background="@color/taxi_p_map_bg" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - android:background="@android:color/transparent"/> + app:layout_constraintLeft_toLeftOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + android:gravity="bottom"> - + android:layout_height="wrap_content"> + + + @@ -349,6 +364,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="@dimen/dp_40" + android:layout_marginBottom="@dimen/dp_15" android:gravity="right" android:text="@string/taxi_p_arrive_to_start" android:textColor="@android:color/white" diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml index dfd776809b..cfaea47660 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_map_view.xml @@ -4,12 +4,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:taxi_right_bottom_radius="@dimen/dp_40" - app:taxi_left_bottom_radius="@dimen/dp_40"> + app:taxi_left_bottom_radius="@dimen/dp_40" + android:background="@color/taxi_p_map_bg"> \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index d4f7f170f3..d9af8fd6e7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -24,15 +24,17 @@ #FFFFE198 #FFFF9B00 - #80000000 + #1A000000 #F8B70A #C6D9FA - #D1193D66 - #FE2505 - #FF6F62 - #CEEEFF - #A1DAFF + #08000000 + #FE2505 + #FF6F62 + #CEEEFF + #A1DAFF + + #00000000 \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index 5d606924e8..71532e41b4 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml @@ -25,7 +25,7 @@ android:paddingTop="6px" android:textColor="#FFFFFF" android:id="@+id/module_mogo_och_speed_tv" - android:text="65" + android:text="0" android:textSize="74px" />