Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00000.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00001.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00002.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00003.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00004.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00005.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00006.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00007.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00008.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00009.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00010.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00011.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00012.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00013.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00015.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00017.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00018.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00019.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00020.png
#	modules/mogo-module-v2x/src/main/res/drawable-ldpi/v_to_x_warning_circle_orange_00023.png

modules/mogo-module-authorize/src/main/res/values/colors.xml

@@ -3,5 +3,5 @@
     <color name="module_authorize_loading_text">#99FFFFFF</color>
     <color name="module_authorize_text">#FFFFFF</color>
     <color name="module_authorize_affirm_text">#FFFFFF</color>
-    <color name="module_authorize_color">#7F000000</color>
+    <color name="module_authorize_color">#99000000</color>
 </resources>

modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java

@@ -41,6 +41,11 @@ public class MogoModulePaths {
      */
     public static final String PATH_MEDIA = "/media/ui";
 
+    /**
+     * 引导页面
+     */
+    public static final String PATH_GUIDE = "/guide/showFragment";
+
     /**
      * 添加卡片模块
      *

modules/mogo-module-common/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="module_commons_dlg_bkg">#7f000000</color>
+    <color name="module_commons_dlg_bkg">#99000000</color>
     <color name="module_commons_wm_dialog_text_textColor">#FFFFFF</color>
     <color name="v2x_FFF_666">#FFFFFF</color>
     <color name="module_commons_FFF_333">#FFFFFF</color>

modules/mogo-module-common/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimAmount">0.4</item>
+        <item name="android:backgroundDimAmount">0.6</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:fullBright">@android:color/transparent</item>

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/StrokeTextView.java

@@ -0,0 +1,101 @@
+package com.mogo.module.extensions.weather;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.text.Layout;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.mogo.skin.support.IMogoSkinCompatSupportable;
+import com.mogo.skin.support.helper.MogoSkinCompatTextHelperDelegate;
+
+import java.lang.reflect.Field;
+
+/**
+ * 带边框的textView
+ *
+ * @author tongchenfei
+ */
+public class StrokeTextView extends AppCompatTextView implements IMogoSkinCompatSupportable {
+
+    private MogoSkinCompatTextHelperDelegate textHelperDelegate;
+
+    public StrokeTextView(Context context) {
+        this(context,null);
+    }
+
+    public StrokeTextView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public StrokeTextView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        textHelperDelegate = new MogoSkinCompatTextHelperDelegate(this);
+    }
+
+    @Override
+    public void setTextAppearance(Context context, int resId) {
+        super.setTextAppearance(context, resId);
+        textHelperDelegate.onSetTextAppearance(context, resId);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSize = getMeasuredWidth();
+        if (widthMode == MeasureSpec.AT_MOST) {
+            widthSize += 20;
+            Layout mLayout = getLayout();
+            if (mLayout != null) {
+                mLayout.increaseWidthTo(widthSize);
+            }
+            setMeasuredDimension(widthSize, getMeasuredHeight());
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int oriColor = getCurrentTextColor();
+        // 先画边框
+        TextPaint paint = getPaint();
+        setCurTextColor(Color.YELLOW);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setShadowLayer(10F, 0F, 0F, Color.YELLOW);
+        float b = getTextSize() / 20;
+        float shadowWidth = Math.max(b, 2f);
+        paint.setStrokeWidth(shadowWidth);
+        super.onDraw(canvas);
+        // 再画文字
+        setCurTextColor(oriColor);
+        paint.setStyle(Paint.Style.FILL);
+        super.onDraw(canvas);
+    }
+
+    /**
+     * 通过反射直接设置mCurTextColor这个变量，直接调用{@link #setTextColor(int)}会出现重复递归的问题
+     *
+     * @param color 要设置的颜色值
+     */
+    private void setCurTextColor(int color) {
+        try {
+            Field mCurTextColor = TextView.class.getDeclaredField("mCurTextColor");
+            mCurTextColor.setAccessible(true);
+            mCurTextColor.set(this,color);
+            mCurTextColor.setAccessible(false);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void applySkin() {
+        textHelperDelegate.applySkin();
+    }
+}

modules/mogo-module-extensions/src/main/res/drawable/module_ext_drawable_shadow_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/module_ext_shadow_bkg" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_ext_shadow_bkg_pressed" android:state_pressed="true" />
     <item android:drawable="@drawable/module_ext_shadow_bkg" android:state_pressed="false" />
     <item android:drawable="@drawable/module_ext_shadow_bkg" />
 </selector>

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -290,5 +290,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:constraint_referenced_ids="btnShowDrawableTipNoSize,btnShowDrawableTip,btnShowTextTip,btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView,btnDebugAddBottomLayerView" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance_no_map.xml

@@ -57,7 +57,7 @@
             android:layout_height="@dimen/module_ext_operation_panel_width"
             android:layout_marginLeft="@dimen/module_entrance_id_button_marginLeft"
             android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
-            android:background="@drawable/module_ext_shadow_bkg"
+            android:background="@drawable/module_ext_drawable_shadow_bg"
             android:gravity="center"
             android:padding="0dp"
             android:text="取消\n求助"

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

@@ -52,7 +52,7 @@
     <dimen name="module_ext_button_container_marginLeft">32px</dimen>
     <dimen name="module_ext_button_container_marginBottom">60px</dimen>
     <dimen name="module_ext_navi_exit_textSize">32px</dimen>
-    <dimen name="v2x_cancel_help_text_size">30px</dimen>
+    <dimen name="v2x_cancel_help_text_size">28px</dimen>
     <dimen name="module_entrance_id_button_marginTop">20px</dimen>
 
     <!--    module_ext_layout_extensions.xml-->

modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java

@@ -6,7 +6,6 @@ import android.os.Handler;
 import android.os.Message;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.uicontroller.CarCursorOption;
@@ -16,7 +15,6 @@ import com.mogo.module.service.R;
 import com.mogo.utils.WorkThreadHandler;
 
 import java.util.ArrayList;
-import java.util.List;
 
 
 /**
@@ -34,71 +32,53 @@ public class CarIconDisplayStrategy {
 
     // F 系列才有这个帧动画
     public static final int[] sFrame = {
-            R.drawable.module_service_ic_seek_helping_00000,
-            R.drawable.module_service_ic_seek_helping_00001,
-            R.drawable.module_service_ic_seek_helping_00002,
-            R.drawable.module_service_ic_seek_helping_00003,
-            R.drawable.module_service_ic_seek_helping_00004,
-            R.drawable.module_service_ic_seek_helping_00005,
-            R.drawable.module_service_ic_seek_helping_00006,
-            R.drawable.module_service_ic_seek_helping_00007,
-            R.drawable.module_service_ic_seek_helping_00008,
-            R.drawable.module_service_ic_seek_helping_00009,
-            R.drawable.module_service_ic_seek_helping_00010,
-            R.drawable.module_service_ic_seek_helping_00011,
-            R.drawable.module_service_ic_seek_helping_00012,
-            R.drawable.module_service_ic_seek_helping_00013,
-            R.drawable.module_service_ic_seek_helping_00014,
-            R.drawable.module_service_ic_seek_helping_00015,
-            R.drawable.module_service_ic_seek_helping_00016,
-            R.drawable.module_service_ic_seek_helping_00017,
-            R.drawable.module_service_ic_seek_helping_00018,
-            R.drawable.module_service_ic_seek_helping_00019,
-            R.drawable.module_service_ic_seek_helping_00020,
-            R.drawable.module_service_ic_seek_helping_00021,
-            R.drawable.module_service_ic_seek_helping_00022,
-            R.drawable.module_service_ic_seek_helping_00023,
-            R.drawable.module_service_ic_seek_helping_00024,
-            R.drawable.module_service_ic_seek_helping_00025,
-            R.drawable.module_service_ic_seek_helping_00026,
-            R.drawable.module_service_ic_seek_helping_00027,
-            R.drawable.module_service_ic_seek_helping_00028,
-            R.drawable.module_service_ic_seek_helping_00029,
-            R.drawable.module_service_ic_seek_helping_00030,
-            R.drawable.module_service_ic_seek_helping_00031,
-            R.drawable.module_service_ic_seek_helping_00032,
-            R.drawable.module_service_ic_seek_helping_00033,
-            R.drawable.module_service_ic_seek_helping_00034,
-            R.drawable.module_service_ic_seek_helping_00035,
-            R.drawable.module_service_ic_seek_helping_00036,
-            R.drawable.module_service_ic_seek_helping_00037,
-            R.drawable.module_service_ic_seek_helping_00038,
-            R.drawable.module_service_ic_seek_helping_00039,
-            R.drawable.module_service_ic_seek_helping_00040,
-            R.drawable.module_service_ic_seek_helping_00041,
-            R.drawable.module_service_ic_seek_helping_00042,
-            R.drawable.module_service_ic_seek_helping_00043,
-            R.drawable.module_service_ic_seek_helping_00044,
-            R.drawable.module_service_ic_seek_helping_00045,
-            R.drawable.module_service_ic_seek_helping_00046,
-            R.drawable.module_service_ic_seek_helping_00047,
-            R.drawable.module_service_ic_seek_helping_00048,
-            R.drawable.module_service_ic_seek_helping_00049,
-            R.drawable.module_service_ic_seek_helping_00050,
-            R.drawable.module_service_ic_seek_helping_00051,
-            R.drawable.module_service_ic_seek_helping_00052,
-            R.drawable.module_service_ic_seek_helping_00053,
-            R.drawable.module_service_ic_seek_helping_00054,
-            R.drawable.module_service_ic_seek_helping_00055,
-            R.drawable.module_service_ic_seek_helping_00056,
-            R.drawable.module_service_ic_seek_helping_00057,
-            R.drawable.module_service_ic_seek_helping_00058,
-            R.drawable.module_service_ic_seek_helping_00059,
-            R.drawable.module_service_ic_seek_helping_00060,
-            R.drawable.module_service_ic_seek_helping_00061,
-            R.drawable.module_service_ic_seek_helping_00062,
-            R.drawable.module_service_ic_seek_helping_00063,
-            R.drawable.module_service_ic_seek_helping_00064
+            R.drawable.v_to_x_warning_circle_orange_00000,
+            R.drawable.v_to_x_warning_circle_orange_00001,
+            R.drawable.v_to_x_warning_circle_orange_00002,
+            R.drawable.v_to_x_warning_circle_orange_00003,
+            R.drawable.v_to_x_warning_circle_orange_00004,
+            R.drawable.v_to_x_warning_circle_orange_00005,
+            R.drawable.v_to_x_warning_circle_orange_00006,
+            R.drawable.v_to_x_warning_circle_orange_00007,
+            R.drawable.v_to_x_warning_circle_orange_00008,
+            R.drawable.v_to_x_warning_circle_orange_00009,
+            R.drawable.v_to_x_warning_circle_orange_00010,
+            R.drawable.v_to_x_warning_circle_orange_00011,
+            R.drawable.v_to_x_warning_circle_orange_00012,
+            R.drawable.v_to_x_warning_circle_orange_00013,
+            R.drawable.v_to_x_warning_circle_orange_00014,
+            R.drawable.v_to_x_warning_circle_orange_00015,
+            R.drawable.v_to_x_warning_circle_orange_00016,
+            R.drawable.v_to_x_warning_circle_orange_00017,
+            R.drawable.v_to_x_warning_circle_orange_00018,
+            R.drawable.v_to_x_warning_circle_orange_00019,
+            R.drawable.v_to_x_warning_circle_orange_00020,
+            R.drawable.v_to_x_warning_circle_orange_00023,
+            R.drawable.v_to_x_warning_circle_orange_00024,
+            R.drawable.v_to_x_warning_circle_orange_00025,
+            R.drawable.v_to_x_warning_circle_orange_00026,
+            R.drawable.v_to_x_warning_circle_orange_00027,
+            R.drawable.v_to_x_warning_circle_orange_00028,
+            R.drawable.v_to_x_warning_circle_orange_00029,
+            R.drawable.v_to_x_warning_circle_orange_00030,
+            R.drawable.v_to_x_warning_circle_orange_00031,
+            R.drawable.v_to_x_warning_circle_orange_00032,
+            R.drawable.v_to_x_warning_circle_orange_00033,
+            R.drawable.v_to_x_warning_circle_orange_00034,
+            R.drawable.v_to_x_warning_circle_orange_00035,
+            R.drawable.v_to_x_warning_circle_orange_00036,
+            R.drawable.v_to_x_warning_circle_orange_00037,
+            R.drawable.v_to_x_warning_circle_orange_00038,
+            R.drawable.v_to_x_warning_circle_orange_00039,
+            R.drawable.v_to_x_warning_circle_orange_00040,
+            R.drawable.v_to_x_warning_circle_orange_00041,
+            R.drawable.v_to_x_warning_circle_orange_00042,
+            R.drawable.v_to_x_warning_circle_orange_00043,
+            R.drawable.v_to_x_warning_circle_orange_00044,
+            R.drawable.v_to_x_warning_circle_orange_00045,
+            R.drawable.v_to_x_warning_circle_orange_00046,
+            R.drawable.v_to_x_warning_circle_orange_00047,
+            R.drawable.v_to_x_warning_circle_orange_00048
     };
 
     private static volatile CarIconDisplayStrategy sInstance;
@@ -216,12 +196,12 @@ public class CarIconDisplayStrategy {
             }
             mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(TAG,
                     new MogoMarkerOptions()
-                    .icons(mBitmapFrames)
-                    .period(1)
-                    .zIndex(1000)
-                    .autoManager(false)
-                    .anchor(0.5f, 0.5f)
-                    .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2()));
+                            .icons(mBitmapFrames)
+                            .period(1)
+                            .zIndex(1000)
+                            .autoManager(false)
+                            .anchor(0.5f, 0.5f)
+                            .position(MarkerServiceHandler.getMapService().getNavi(AbsMogoApplication.getApp()).getCarLocation2()));
         } catch (Exception e) {
             e.printStackTrace();
             mSeekHelpingMarker = MarkerServiceHandler.getMarkerManager().addMarker(

modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml

@@ -80,7 +80,7 @@
         android:textStyle="bold"
         android:textColor="@color/module_services_panel_item_detail_textColor"
         android:textSize="@dimen/module_services_panel_item_detail_textSize"
-        android:layout_marginEnd="@dimen/dp_46"
+        android:layout_marginEnd="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />