[6.5.0]融合红绿灯

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt

@@ -3,8 +3,14 @@ package com.mogo.eagle.core.function.hmi.ui.widget
 import android.content.Context
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.enums.TrafficLightEnum
+import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 
 /**
  * 融合红绿灯View
@@ -14,20 +20,61 @@ class FusionTrafficLightView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr){
+) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoTrafficLightListener {
 
     companion object {
         private const val TAG = "FusionTrafficLightView"
     }
 
+    private var mCurrentLightId = TrafficLightEnum.BLACK
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         LayoutInflater.from(context).inflate(R.layout.hmi_view_fusion_traffic_light, this, true)
+        CallerTrafficLightListenerManager.addListener(TAG, this)
     }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
+        CallerTrafficLightListenerManager.removeListener(TAG)
     }
 
+    /**
+     * 关闭红绿灯预警展示，并重制灯态
+     */
+    override fun disableTrafficLight() {
+        super.disableTrafficLight()
+        UiThreadHandler.post{
+            mCurrentLightId = TrafficLightEnum.BLACK
+            this@FusionTrafficLightView.visibility = GONE
+        }
+    }
+
+    /**
+     * 展示融合带有下一下二灯态的红绿灯
+     * @param currentState 当前灯态
+     * @param currentDuration 当前灯态倒计时
+     * @param nextState 下一灯态
+     * @param nextDuration 下一灯态倒计时
+     * @param nextTwoState 下二灯态
+     * @param nextTwoDuration 下二灯态倒计时
+     * @param lightSource 数据来源
+     */
+    override fun showFusionTrafficLight(
+        currentState: TrafficLightEnum, currentDuration: Int,
+        nextState: TrafficLightEnum, nextDuration: Int,
+        nextTwoState: TrafficLightEnum, nextTwoDuration: Int,
+        lightSource: DataSourceType
+    ) {
+        super.showFusionTrafficLight(currentState, currentDuration, nextState,
+            nextDuration, nextTwoState, nextTwoDuration, lightSource)
+        //如果当前红绿灯视图为隐藏状态则设置为显示状态
+        if(this@FusionTrafficLightView.visibility == View.GONE){
+            this@FusionTrafficLightView.visibility = View.VISIBLE
+            //首次展示，需要将当前、下一、下二灯态的时间占比绘制出来，只绘制一次
+
+        }
+
+    }
 
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ProportionChartView.java

@@ -0,0 +1,113 @@
+package com.mogo.eagle.core.function.hmi.ui.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.mogo.eagle.core.function.hmi.R;
+import me.jessyan.autosize.utils.AutoSizeUtils;
+
+/**
+ * 融合红绿灯红、黄、绿时间占比示意View
+ * 鹰眼6.5.0需求
+ */
+public class ProportionChartView extends View {
+
+    private static int DEFAULT_RING_WIDTH = 5;
+    private float mRingWidth = 0;
+    private Paint mRingPaint;
+    private float mRadius;
+//    private List<Float>
+
+    public ProportionChartView(Context context) {
+        super(context);
+        initSize(context);
+        init();
+    }
+
+    public ProportionChartView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initAttr(context, attrs);
+        initSize(context);
+        init();
+    }
+
+    public ProportionChartView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initAttr(context, attrs);
+        initSize(context);
+        init();
+    }
+
+    private void initAttr(Context context, AttributeSet attrs){
+        if (attrs == null) {
+            return;
+        }
+        TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.ProportionChartView);
+        int n = array.getIndexCount();
+        for (int i = 0; i < n; i++) {
+            int attr = array.getIndex(i);
+            if (attr == R.styleable.ProportionChartView_ringWidth) {
+                mRingWidth = array.getDimension(attr, AutoSizeUtils.dp2px(context, DEFAULT_RING_WIDTH));
+            }
+        }
+        array.recycle();
+    }
+
+    /**
+     * 初始化Size
+     * @param context 上下文
+     */
+    private void initSize(Context context){
+        if (mRingWidth == 0) {
+            mRingWidth = AutoSizeUtils.dp2px(context, AutoSizeUtils.dp2px(context, DEFAULT_RING_WIDTH));
+        }
+    }
+
+    /**
+     * 初始化画笔
+     */
+    private void init(){
+        mRingPaint = new Paint();
+        //抗锯齿
+        mRingPaint.setAntiAlias(true);
+        //防抖动
+        mRingPaint.setDither(true);
+        //仅描边(圆环)
+        mRingPaint.setStyle(Paint.Style.STROKE);
+        //圆环宽度
+        mRingPaint.setStrokeWidth(mRingWidth);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int size = Math.max(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.getSize(widthMeasureSpec));
+        setMeasuredDimension(size, size);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        //宽和高分别去掉padding值，取min的一半即圆的半径(这里demo没有用到，可自行做一些其他计算使用)
+        mRadius = Math.min(w - getPaddingLeft() - getPaddingRight(), h - getPaddingTop() - getPaddingBottom()) / 2f;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        drawRingView(canvas);
+    }
+
+    /**
+     * 画Ring
+     */
+    private void drawRingView(Canvas canvas){
+        float sweepAngle = 0f;
+        float startAngle = 0f;
+
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightProportionView.kt

@@ -1,50 +0,0 @@
-package com.mogo.eagle.core.function.hmi.ui.widget
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.RectF
-import android.util.AttributeSet
-import android.view.View
-import com.mogo.eagle.core.function.hmi.R
-
-/**
- * 融合红绿灯红、黄、绿时间占比示意View
- * 鹰眼6.5.0需求
- */
-class TrafficLightProportionView constructor(
-    context: Context,
-    attrs: AttributeSet
-) : View(context, attrs){
-
-    private var mCanvas: Canvas? = null
-    private var mRingPaint: Paint? = null
-    private var mRectF: RectF? = null
-    private var proportionList =ArrayList<Int>()
-
-    init {
-
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        val size = MeasureSpec.getSize(widthMeasureSpec)
-                .coerceAtLeast(MeasureSpec.getSize(widthMeasureSpec))
-        setMeasuredDimension(size, size)
-    }
-
-    override fun onDraw(canvas: Canvas?) {
-        super.onDraw(canvas)
-
-    }
-
-    private fun initAttr(context: Context,attrs: AttributeSet?){
-        if(null == attrs){
-            return
-        }
-        val array = context.obtainStyledAttributes(attrs, R.styleable.TrafficLightProportionView)
-        //TODO
-        array.recycle()
-    }
-
-}

core/function-impl/mogo-core-function-hmi/src/main/res/values/attr.xml

@@ -118,7 +118,7 @@
         <attr name="roma_change_dis_color" format="boolean"/>
     </declare-styleable>
 
-    <declare-styleable name="TrafficLightProportionView">
+    <declare-styleable name="ProportionChartView">
         <attr name="ringWidth" format="reference|dimension"/>
     </declare-styleable>