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

2020-11-02 10:35:56 +08:00
parent a1f118990f 597adb83d4
commit ddbfd28b46
287 changed files with 1 additions and 5419 deletions
--- a/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_history_empty.xml
@@ -35,7 +35,7 @@
        android:layout_width="@dimen/v2x_share_btn_width"
        android:layout_height="@dimen/v2x_share_btn_height"
        android:layout_marginTop="@dimen/dp_60"
-        android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
+        android:background="@drawable/bg_v2x_go_to_share"
        android:gravity="center"
        android:text="去分享"
        android:textColor="#FFFFFF"