Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java

@@ -15,6 +15,8 @@ import android.view.View;
 
 import androidx.annotation.Nullable;
 
+import com.mogo.module.extensions.R;
+
 /**
  * created by wujifei on 2021/3/24 16:20
  * describe:
@@ -28,7 +30,7 @@ public class ArcView extends View {
     //圆弧颜色
     private int mArcColor;
     //圆弧的画笔的宽度
-    private float mStrokeWith = dp2px(10);
+    private float mStrokeWith = getResources().getDimension(R.dimen.module_ext_arcView_stroke_with);
     //文字描述的paint
     private Paint mTextPaint;
 
@@ -73,11 +75,11 @@ public class ArcView extends View {
         mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
         //绘制中心的数值
         mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect);
-        canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2-10, mTextPaint);
+        canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2 - 10, mTextPaint);
 
         mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
         //绘制中心文字描述
-        mTextPaint.setTextSize(dp2px(28));
+        mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_des_text_size));
         mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect);
         canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint);
     }
@@ -116,7 +118,7 @@ public class ArcView extends View {
         //设置文本的对齐方式
         mTextPaint.setTextAlign(Paint.Align.CENTER);
         //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12));
-        mTextPaint.setTextSize(dp2px(80));
+        mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_center_text_size));
 
     }
 

modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -5,4 +5,7 @@
     <dimen name="module_ext_speed_height">460px</dimen>
     <dimen name="module_ext_arcView_width">320px</dimen>
     <dimen name="module_ext_arcView_height">320px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">15px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">110px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">40px</dimen>
 </resources>

modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml

@@ -187,5 +187,8 @@
 
     <dimen name="module_ext_arcView_width">200px</dimen>
     <dimen name="module_ext_arcView_height">200px</dimen>
+    <dimen name="module_ext_arcView_stroke_with">10px</dimen>
+    <dimen name="module_ext_arcView_center_text_size">80px</dimen>
+    <dimen name="module_ext_arcView_des_text_size">28px</dimen>
 
 </resources>

modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml

@@ -28,7 +28,7 @@
         android:layout_marginRight="@dimen/dp_20"
         android:text="为您推荐最优路线"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/module_v2x_event_warning_type_text_size"
         app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/warning_type_image"

modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml

@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -101,8 +101,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->
 

modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -37,4 +37,9 @@
     <dimen name="module_v2x_car_for_help_event_maxwidth">480px</dimen>
     <dimen name="module_v2x_car_for_help_event_text_size">42px</dimen>
     <dimen name="module_v2x_car_for_help_cancel_text_size">40px</dimen>
+
+    <!--最优路线-->
+    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+
 </resources>

modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml

@@ -117,8 +117,8 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
 
     <!--最优路线-->
-    <dimen name="module_v2x_event_warning_type_image_size">133px</dimen>
-    <dimen name="module_v2x_event_warning_type_text_size">42px</dimen>
+    <dimen name="module_v2x_event_warning_type_image_size">100px</dimen>
+    <dimen name="module_v2x_event_warning_type_text_size">32px</dimen>
 
     <!--适配 V2X 弹窗 UI-->