From 69ac045f297b3b310437af842551f471fe765fff Mon Sep 17 00:00:00 2001 From: wujifei Date: Thu, 25 Mar 2021 14:19:53 +0800 Subject: [PATCH] =?UTF-8?q?new#Vr=E6=A8=A1=E5=BC=8F=E8=BD=A6=E9=80=9F?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/entrance/EntranceFragment.java | 30 ++- .../extensions/utils/TopViewAnimHelper.java | 2 +- .../mogo/module/extensions/view/ArcView.java | 182 ++++++++++++++++++ .../res/drawable-xhdpi/yi_biao_pan_bg_nor.png | Bin 0 -> 29459 bytes .../res/layout/module_ext_layout_entrance.xml | 59 ++++-- .../src/main/res/values/colors.xml | 2 + 6 files changed, 245 insertions(+), 30 deletions(-) create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png 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 19015182c1..b7864794cf 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 @@ -15,6 +15,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.RadioButton; @@ -65,6 +66,7 @@ import com.mogo.module.extensions.utils.EntranceViewHolder; import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; +import com.mogo.module.extensions.view.ArcView; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.service.IMogoServiceApis; import com.mogo.service.analytics.IMogoAnalytics; @@ -194,6 +196,11 @@ public class EntranceFragment extends MvpFragment 40 ? R.color.arc_speeding : R.color.arc_speed); + mouduleArc.setValues(speed); } @Override - public void onCarLocationChanged( MogoLatLng latLng ) { + public void onCarLocationChanged(MogoLatLng latLng) { } } 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 9082dab01f..9fc3aeb8a8 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 @@ -507,7 +507,7 @@ public class TopViewAnimHelper { public void enterVrMode() { removeAllView(); topContainer.getLayoutParams().width = (int) getDimen(R.dimen.module_ext_top_view_width_in_vr_mode); - vrModeNavInfoView.setVisibility(View.VISIBLE); + // vrModeNavInfoView.setVisibility(View.VISIBLE); // topContainer.requestLayout(); // topMotionLayout.requestLayout(); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java new file mode 100644 index 0000000000..7c22a7c303 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java @@ -0,0 +1,182 @@ +package com.mogo.module.extensions.view; + +import android.animation.ValueAnimator; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.RectF; +import android.util.AttributeSet; +import android.util.DisplayMetrics; +import android.view.View; + +import androidx.annotation.Nullable; + +/** + * created by wujifei on 2021/3/24 16:20 + * describe: + */ +public class ArcView extends View { + + //中心的文字描述 + private String mDes = "km/h"; + //根据数据显示的圆弧Paint + private Paint mArcPaint; + //圆弧颜色 + private int mArcColor; + //圆弧的画笔的宽度 + private float mStrokeWith = 10; + //文字描述的paint + private Paint mTextPaint; + + //当前进度夹角大小 + private float mIncludedAngle = 0; + //当前数据 + private int currentValue; + //最大数据 + private int maxValue = 240; + //圆弧背景的开始和结束间的夹角大小 + private float mAngle = 270; + //上次绘制圆弧夹角 + private float lastAngle = 0; + + public ArcView(Context context) { + this(context, null); + } + + public ArcView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public ArcView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + //初始化paint + initPaint(); + //绘制弧度 + drawArc(canvas); + //绘制文本 + drawText(canvas); + } + + private void drawText(Canvas canvas) { + Rect mRect = new Rect(); + String mValue = String.valueOf(currentValue); + //绘制中心的数值 + mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect); + canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2, mTextPaint); + + //绘制中心文字描述 + mTextPaint.setTextSize(28); + mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect); + canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint); + } + + private void drawArc(Canvas canvas) { + //绘制圆弧背景 + RectF mRectF = new RectF(mStrokeWith, mStrokeWith, getWidth() - mStrokeWith, getHeight() - mStrokeWith); + canvas.drawArc(mRectF, 135, mAngle, false, mArcPaint); + + //绘制当前数值对应的圆弧 + mArcPaint.setColor(mArcColor); + //根据当前数据绘制对应的圆弧 + canvas.drawArc(mRectF, 135, mIncludedAngle, false, mArcPaint); + } + + private void initPaint() { + //圆弧的paint + mArcPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + //抗锯齿 + mArcPaint.setAntiAlias(true); + mArcPaint.setColor(Color.parseColor("#222A66")); + //设置透明度（数值为0-255） + mArcPaint.setAlpha(100); + //设置画笔的画出的形状 + mArcPaint.setStrokeJoin(Paint.Join.ROUND); + mArcPaint.setStrokeCap(Paint.Cap.ROUND); + //设置画笔类型 + mArcPaint.setStyle(Paint.Style.STROKE); + //画笔宽度 + mArcPaint.setStrokeWidth(mStrokeWith); + + //中心文字的paint + mTextPaint = new Paint(); + mTextPaint.setAntiAlias(true); + mTextPaint.setColor(Color.parseColor("#FFFFFF")); + //设置文本的对齐方式 + mTextPaint.setTextAlign(Paint.Align.CENTER); + //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12)); + mTextPaint.setTextSize(80); + + } + + + /** + * 为绘制弧度及数据设置动画 + * + * @param startAngle 开始的弧度 + * @param currentAngle 需要绘制的弧度 + * @param time 动画执行的时长 + */ + private void setAnimation(float startAngle, float currentAngle, int time) { + //绘制当前数据对应的圆弧的动画效果 + ValueAnimator progressAnimator = ValueAnimator.ofFloat(startAngle, currentAngle); + progressAnimator.setDuration(time); + progressAnimator.setTarget(mIncludedAngle); + progressAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + mIncludedAngle = (float) animation.getAnimatedValue(); + //重新绘制，不然不会出现效果 + postInvalidate(); + } + }); + //开始执行动画 + progressAnimator.start(); + } + + + /** + * 设置弧形颜色 + * + * @param value 颜色值 + */ + public void setArcColor(int value) { + mArcColor = value; + } + + /** + * 设置数据 + * + * @param value 当前绘制的值 + */ + public void setValues(int value) { + //完全覆盖 + if (value > maxValue) { + value = maxValue; + } + currentValue = value; + //计算弧度比重 + float scale = (float) currentValue / maxValue; + //计算弧度 + float currentAngle = scale * mAngle; + //开始执行动画 + setAnimation(lastAngle, currentAngle, 1000); + lastAngle = currentAngle; + //重新绘制 + postInvalidate(); + } + + + private float dp2px(float dp) { + DisplayMetrics metrics = Resources.getSystem().getDisplayMetrics(); + return dp * metrics.density; + } +} diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png new file mode 100644 index 0000000000000000000000000000000000000000..f6233c8849632d8afc3a715ad199adda91e646a1 GIT binary patch literal 29459 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 literal 0 HcmV?d00001 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 e7c4bc0569..91e39cd779 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 @@ -17,12 +17,29 @@ android:layout_height="wrap_content" /> + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + tools:visibility="visible" /> @@ -237,8 +254,8 @@ android:textSize="@dimen/module_ext_exit_vr_mode_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" />