diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
index 5d74894005..abe1cd043a 100644
--- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
+++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt
@@ -1,6 +1,7 @@
package com.mogo.module.authorize.layout
import android.content.Context
+import android.graphics.drawable.ColorDrawable
import android.text.Html
import android.view.View
import android.widget.Button
@@ -14,6 +15,7 @@ import com.mogo.module.authorize.voice.IVoiceAuthorizeIntentListener
import com.mogo.module.authorize.voice.IVoiceCommandListener
import com.mogo.module.authorize.voice.VoiceUtil
import com.mogo.module.common.dialog.BaseFloatDialog
+import com.mogo.module.common.utils.CarSeries
import com.mogo.utils.TipToast
import com.mogo.utils.logger.Logger
import kotlinx.coroutines.Dispatchers
@@ -62,7 +64,12 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList
private fun setWrapContent() {
val mWindow = window
if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
- if (mWindow != null) {
+ if (mWindow != null && CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) {
+ val lp = mWindow.attributes
+ lp.width = 1920
+ lp.height = 1080
+ mWindow.attributes = lp
+ }else{
val lp = mWindow.attributes
lp.width = 1024
lp.height = 600
@@ -78,7 +85,7 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList
}
}
- fun initViews() {
+ private fun initViews() {
Logger.d(TAG, "initView ")
AnalyticsUtil.track(AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_SHOW)
init()
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml
index c2d1fec152..93b269154a 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_corner.xml
@@ -3,13 +3,13 @@
-
-
+
-
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml
index 8c950afee3..9d0ac5061d 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_blue_left_corner.xml
@@ -3,13 +3,13 @@
-
-
+
-
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml
index 86e673bca6..e9cb674da9 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_selector_dark_corner.xml
@@ -2,6 +2,7 @@
+ android:startColor="#2A2B38 " />
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml
deleted file mode 100644
index 38ff34eb71..0000000000
--- a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1000/module_authorize_shape_drak_top_corner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml
new file mode 100644
index 0000000000..63144dcf3c
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_corner.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml
new file mode 100644
index 0000000000..9d0ac5061d
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_blue_left_corner.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml
new file mode 100644
index 0000000000..e9cb674da9
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_corner.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml
new file mode 100644
index 0000000000..086f0e93fa
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_selector_dark_right_corner.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml
new file mode 100644
index 0000000000..47a3428433
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable-xhdpi-1920x1080/module_authorize_shape_top_corner.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml
index c2d1fec152..63144dcf3c 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_corner.xml
@@ -2,14 +2,14 @@
-
-
-
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml
index 6399ca294a..536fc2c742 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_blue_left_corner.xml
@@ -3,13 +3,13 @@
-
-
+
-
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml
index 1b8bbd3159..c366e79eea 100644
--- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml
+++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_selector_dark_corner.xml
@@ -2,6 +2,7 @@
+ android:startColor="#2A2B38" />
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml
deleted file mode 100644
index 0f2dab89cb..0000000000
--- a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_drak_top_corner.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml
new file mode 100644
index 0000000000..47e186f1e7
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/drawable/module_authorize_shape_top_corner.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
index f3d940ee26..e3a16367f6 100644
--- a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
+++ b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
@@ -207,4 +207,4 @@
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
diff --git a/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml
new file mode 100644
index 0000000000..1642421fb0
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1080/module_authorize_fragment.xml
@@ -0,0 +1,236 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
index c8b7f7aa56..1642421fb0 100644
--- a/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
+++ b/modules/mogo-module-authorize/src/main/res/layout/module_authorize_fragment.xml
@@ -4,16 +4,16 @@
android:id="@+id/clAuthorizeTopParent"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#CC000000">
+ android:background="@color/module_authorize_color">
@@ -57,10 +57,10 @@
android:id="@+id/clLoadingErrorContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/dp_330"
- android:layout_marginTop="@dimen/dp_90"
- android:layout_marginRight="@dimen/dp_330"
- android:layout_marginBottom="@dimen/dp_90"
+ android:layout_marginLeft="@dimen/dp_275"
+ android:layout_marginTop="@dimen/dp_125"
+ android:layout_marginRight="@dimen/dp_275"
+ android:layout_marginBottom="@dimen/dp_125"
android:background="@drawable/module_authorize_selector_dark_corner"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
@@ -69,22 +69,22 @@
@@ -108,10 +108,10 @@
android:id="@+id/clAuthorizeContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@dimen/dp_330"
- android:layout_marginTop="@dimen/dp_90"
- android:layout_marginRight="@dimen/dp_330"
- android:layout_marginBottom="@dimen/dp_90"
+ android:layout_marginLeft="@dimen/dp_275"
+ android:layout_marginTop="@dimen/dp_125"
+ android:layout_marginRight="@dimen/dp_275"
+ android:layout_marginBottom="@dimen/dp_125"
android:background="@drawable/module_authorize_selector_dark_corner"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
@@ -125,7 +125,7 @@
android:background="@drawable/module_authorize_selector_blue_left_corner"
android:gravity="center"
android:text="@string/module_authorize_agreement_agree"
- android:textColor="@android:color/white"
+ android:textColor="@color/module_authorize_affirm_text"
android:textSize="@dimen/dp_55"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
@@ -139,7 +139,7 @@
android:background="@drawable/module_authorize_selector_dark_right_corner"
android:gravity="center"
android:text="@string/module_authorize_agreement_disagree"
- android:textColor="@android:color/white"
+ android:textColor="@color/module_authorize_text"
android:textSize="@dimen/dp_55"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
@@ -149,19 +149,18 @@
+ app:layout_constraintTop_toBottomOf="@+id/clAuthorizeTitle">
@@ -171,7 +170,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:lineSpacingExtra="@dimen/dp_15"
- android:textColor="@android:color/white"
+ android:textColor="@color/module_authorize_text"
android:textSize="@dimen/dp_44" />
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_left_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_left_symbol.png
new file mode 100644
index 0000000000..f2db41b61e
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_left_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_right_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_right_symbol.png
new file mode 100644
index 0000000000..cfea3c214b
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1000/module_authorize_title_right_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_loading_error.png b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_loading_error.png
new file mode 100644
index 0000000000..ea0bf284ed
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_loading_error.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_left_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_left_symbol.png
new file mode 100644
index 0000000000..f2db41b61e
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_left_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_right_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_right_symbol.png
new file mode 100644
index 0000000000..cfea3c214b
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap-xhdpi-1920x1080/module_authorize_title_right_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_loading_error.png b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_loading_error.png
index 99343b84d3..c38cb07edd 100644
Binary files a/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_loading_error.png and b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_loading_error.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_left_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_left_symbol.png
new file mode 100644
index 0000000000..93005a1e4c
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_left_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_right_symbol.png b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_right_symbol.png
new file mode 100644
index 0000000000..7411ef84c6
Binary files /dev/null and b/modules/mogo-module-authorize/src/main/res/mipmap/module_authorize_title_right_symbol.png differ
diff --git a/modules/mogo-module-authorize/src/main/res/values/colors.xml b/modules/mogo-module-authorize/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..5886e84810
--- /dev/null
+++ b/modules/mogo-module-authorize/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+
+
+ #99FFFFFF
+ #FFFFFF
+ #FFFFFF
+ #7F000000
+
\ No newline at end of file
diff --git a/modules/mogo-module-common/src/main/res/values/styles.xml b/modules/mogo-module-common/src/main/res/values/styles.xml
index 5810a99910..10ca997feb 100644
--- a/modules/mogo-module-common/src/main/res/values/styles.xml
+++ b/modules/mogo-module-common/src/main/res/values/styles.xml
@@ -5,7 +5,7 @@
- @null
- true
- @android:color/transparent
- - 0.85
+ - 0.4
- true
- @null
- @android:color/transparent
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
index 9211a4f569..a6153eb25d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java
@@ -3,6 +3,7 @@ package com.mogo.module.v2x.fragment;
import android.content.Context;
import android.util.Log;
import android.view.View;
+import android.widget.LinearLayout;
import androidx.annotation.NonNull;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -37,7 +38,7 @@ public class V2XScenarioHistoryFragment
private String TAG = "ScenarioHistoryFragment";
private V2XListEmptyView mEmptyView;
- private CoordinatorLayout mClHistoryList;
+ private LinearLayout mClHistoryList;
private RecyclerView mRecyclerView;
private V2XScenarioHistoryAdapter mV2XScenarioHistoryAdapter;
private ArrayList mV2XHistoryScenarioData = new ArrayList<>();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
index 40e05358a0..607d8a3a04 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundConstraintLayout.java
@@ -18,6 +18,9 @@ import com.mogo.skin.support.IMogoSkinCompatSupportable;
import com.mogo.skin.support.IMogoSkinSupportInstaller;
import com.mogo.skin.support.MogoSkinManager;
import com.mogo.skin.support.SkinMode;
+import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate;
+import com.mogo.skin.support.helper.MogoSkinCompatHelperDelegate;
+import com.mogo.skin.support.helper.MogoSkinCompatTextHelperDelegate;
/**
* author : donghongyu
@@ -31,19 +34,14 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin
private float roundLayoutRadius = 14f;
private Path roundPath;
private RectF rectF;
-
+ private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper;
public RoundConstraintLayout(Context context) {
this(context, null);
}
- public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) {
- this(context, attrs);
- }
-
public RoundConstraintLayout(Context context, AttributeSet attrs) {
- super(context, attrs);
-
+ this(context, attrs, 0);
TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout);
roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius);
typedArray.recycle();
@@ -51,6 +49,13 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin
init();
}
+ public RoundConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this);
+ mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr);
+ }
+
+
private void init() {
setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的;
roundPath = new Path();
@@ -84,9 +89,11 @@ public class RoundConstraintLayout extends ConstraintLayout implements IMogoSkin
super.draw(canvas);
}
-
@Override
public void applySkin() {
-
+ if (mBackgroundTintHelper != null) {
+ mBackgroundTintHelper.applySkin();
+ }
}
+
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png
new file mode 100644
index 0000000000..245c2e855c
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png
new file mode 100644
index 0000000000..e69d3fbacb
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
index f59c92e5d9..41be2d9bb6 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index 8823070525..3270297d56 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -5,105 +5,95 @@
android:id="@+id/clPanelContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/v2x_panel_list_background"
android:clickable="true"
android:visibility="gone"
tools:visibility="visible">
-
+ android:layout_height="@dimen/dp_154"
+ android:gravity="center_vertical"
+ android:orientation="horizontal">
-
+
-
+
-
+
-
+
-
+
+
-
+
-
-
+
-
+
-
-
-
-
-
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
index 4f91e0dbcb..ade8f9ebe6 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_scenario_history.xml
@@ -12,30 +12,23 @@
android:visibility="gone"
tools:visibility="visible" />
-
-
-
-
-
-
+ android:paddingStart="@dimen/dp_60"
+ android:paddingBottom="@dimen/dp_27"
+ android:text="今日出行遇到的交通事件"
+ android:textColor="@color/v2x_FFF_333"
+ android:textSize="@dimen/dp_36"
+ android:textStyle="bold"
+ app:layout_scrollFlags="scroll|enterAlways" />
-
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
index 79771659da..2ab0139341 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
@@ -36,7 +36,7 @@
android:layout_height="48px"
android:layout_centerHorizontal="true"
android:layout_toLeftOf="@id/center"
- android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
+ android:background="#3F4057"
android:clickable="true"
android:onClick="shareEventAction"
android:text="去分享"
diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml
index 1285a749e4..2c5b584b68 100644
--- a/modules/mogo-module-v2x/src/main/res/values/colors.xml
+++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml
@@ -18,5 +18,6 @@
#ff616381
#FFFFFF
#555A75
+ #000000
\ No newline at end of file
diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle
index 27b4dd2f14..cfcc4a9d2f 100644
--- a/skin/mogo-skin-light/build.gradle
+++ b/skin/mogo-skin-light/build.gradle
@@ -31,6 +31,8 @@ android {
res.srcDirs = [
'src/main/res',
'src/main/module-apps-res',
+ 'src/main/module-authorize-res',
+ 'src/main/module-callchat-res',
'src/main/module-extensions-res',
'src/main/module-v2x-res',
'src/main/module-back-res',
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_blue_left_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_blue_left_corner_light.xml
new file mode 100644
index 0000000000..41b52c4f0a
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_blue_left_corner_light.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_corner_light.xml
new file mode 100644
index 0000000000..9a3b7b645b
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_corner_light.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_right_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_right_corner_light.xml
new file mode 100644
index 0000000000..d186b27b37
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_selector_dark_right_corner_light.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_shape_top_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_shape_top_corner_light.xml
new file mode 100644
index 0000000000..500c5db9e6
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable-xhdpi/module_authorize_shape_top_corner_light.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_blue_left_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_blue_left_corner_light.xml
new file mode 100644
index 0000000000..91e3bc390e
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_blue_left_corner_light.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_corner_light.xml
new file mode 100644
index 0000000000..cd75324c9f
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_corner_light.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_right_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_right_corner_light.xml
new file mode 100644
index 0000000000..517fa45f8e
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_selector_dark_right_corner_light.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_shape_top_corner_light.xml b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_shape_top_corner_light.xml
new file mode 100644
index 0000000000..62727b4486
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/drawable/module_authorize_shape_top_corner_light.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_left_symbol_light.png b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_left_symbol_light.png
new file mode 100644
index 0000000000..2634a010e6
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_left_symbol_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_right_symbol_light.png b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_right_symbol_light.png
new file mode 100644
index 0000000000..fcb7cb78d6
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap-xhdpi/module_authorize_title_right_symbol_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_left_symbol_light.png b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_left_symbol_light.png
new file mode 100644
index 0000000000..ea3b8d0d96
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_left_symbol_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_right_symbol_light.png b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_right_symbol_light.png
new file mode 100644
index 0000000000..6a17d7d7cb
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-authorize-res/mipmap/module_authorize_title_right_symbol_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-authorize-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-authorize-res/values/colors.xml
new file mode 100644
index 0000000000..ce944b8ae0
--- /dev/null
+++ b/skin/mogo-skin-light/src/main/module-authorize-res/values/colors.xml
@@ -0,0 +1,7 @@
+
+
+ #333333
+ #333333
+ #2896FF
+ #4c000000
+
\ No newline at end of file
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_default_head_img_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_default_head_img_light.png
new file mode 100644
index 0000000000..39b87062a6
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-ldpi/module_carchatting_default_head_img_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_default_head_img_light.png b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_default_head_img_light.png
new file mode 100644
index 0000000000..8d2ac30636
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-callchat-res/mipmap-xhdpi/module_carchatting_default_head_img_light.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png
new file mode 100644
index 0000000000..245c2e855c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png
new file mode 100644
index 0000000000..e69d3fbacb
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png differ
diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
index 0d1e99e607..dc220b6993 100644
--- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
@@ -14,5 +14,5 @@
#333333
#666666
#F5F5F5
-
+ #FFFFFF