diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt index 33361ceba2..c6061c6e64 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt @@ -6,6 +6,7 @@ import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeManagerImpl import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.util.SharedPreferenceUtil +import com.mogo.module.authorize.util.isDeviceOfD import com.mogo.service.module.IMogoModuleProvider class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMogoAuthorizeModuleProvider { @@ -21,7 +22,7 @@ class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IM } override fun invokeAuthorization(tag: String) { - if(!SharedPreferenceUtil.hasGuide()){ + if(isDeviceOfD() && !SharedPreferenceUtil.hasGuide()){ val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() if(guideService is IMogoModuleProvider){ guideService.init(AbsMogoApplication.getApp().applicationContext) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt new file mode 100644 index 0000000000..8884512894 --- /dev/null +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt @@ -0,0 +1,10 @@ +package com.mogo.module.authorize.util + +import com.mogo.module.common.utils.CarSeries.* + +fun isDeviceOfD(): Boolean { + return when (getSeries()) { + CAR_SERIES_D80X, CAR_SERIES_D81X, CAR_SERIES_D82X, CAR_SERIES_D84X -> true + else -> false + } +} \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java index b372bc373d..0eefde7372 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; 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_shadow_bg.9.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png index 2cf79cfff6..b66f2a928b 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.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_shadow_bg.9.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml index bf2f16368a..e4ec12dbe4 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml @@ -1,7 +1,7 @@ - + diff --git a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml index 624445d9d6..3857af1f89 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="#88000000"> - 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 2ab0139341..bfe0b1657d 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 @@ -7,8 +7,8 @@ @@ -23,7 +23,7 @@ android:gravity="bottom" android:text="你还没有分享过道路事件,快去试试吧" android:textColor="@color/v2x_FFF_333" - android:textSize="18px" /> + android:textSize="@dimen/v2x_share_btn_size" /> + android:textSize="@dimen/v2x_share_btn_size" /> + android:textSize="@dimen/v2x_share_btn_size" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml index 5cc9085387..5a931c9632 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml @@ -9,8 +9,8 @@