yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangcongtao
2020-09-07 10:58:53 +08:00
parent 2d8ff4d8e9 e05796550c
commit 11cca1c0e2
23 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt
View File

@@ -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)

10
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/util/DeviceUtil.kt Normal file
View File

@@ -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
}
}

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XEventPanelHistoryCountView.java
View File

@@ -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;

0
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_panel_list_background.9.png → modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_event_panel_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 643 B

0
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_list_background.9.png → modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

2
modules/mogo-module-v2x/src/main/res/drawable/v2x_drawable_event_more_bkg.xml
View File

@@ -1,7 +1,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="@dimen/module_v2x_panel_cor" />
<corners android:radius="@dimen/module_v2x_panel_icon_cor" />
<gradient android:startColor="#FF2E3141" android:endColor="#FF3F435F" android:angle="0" />
</shape>
</item>

2
modules/mogo-module-v2x/src/main/res/layout/dialog_v2x_seek_help.xml
View File

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="#88000000">
<ImageView
<TextView
android:id="@+id/ivDialogBg"
android:layout_width="@dimen/dp_790"
android:layout_height="@dimen/dp_366"

2
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/clPanelContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/v2x_panel_list_background"
android:background="@drawable/v2x_shadow_bg"
android:clickable="true"
android:visibility="gone"
tools:visibility="visible">

20
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml
View File

@@ -7,8 +7,8 @@
<ImageView
android:id="@+id/no_share_image"
android:layout_width="117px"
android:layout_height="117px"
android:layout_width="@dimen/share_empty_icon_width"
android:layout_height="@dimen/share_empty_icon_width"
android:layout_marginTop="30px"
android:src="@drawable/icon_share_empty" />
@@ -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" />
<RelativeLayout
android:layout_width="match_parent"
@@ -32,16 +32,16 @@
<Button
android:id="@+id/share_event_button"
android:layout_width="150px"
android:layout_height="48px"
android:layout_width="@dimen/v2x_share_btn_width"
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_centerHorizontal="true"
android:layout_toLeftOf="@id/center"
android:background="#3F4057"
android:background="@drawable/v2xt_dw_common_corner_bkg_dark"
android:clickable="true"
android:onClick="shareEventAction"
android:text="去分享"
android:textColor="#FFFFFF"
android:textSize="18px" />
android:textSize="@dimen/v2x_share_btn_size" />
<View
android:id="@+id/center"
@@ -51,13 +51,13 @@
<Button
android:id="@+id/refresh_button"
android:layout_width="150px"
android:layout_height="48px"
android:layout_width="@dimen/v2x_share_btn_width"
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_toRightOf="@id/center"
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="18px" />
android:textSize="@dimen/v2x_share_btn_size" />
</RelativeLayout>

12
modules/mogo-module-v2x/src/main/res/layout/v2x_network_loading_item.xml
View File

@@ -9,8 +9,8 @@
<ImageView
android:id="@+id/loading_imageview"
android:layout_width="200px"
android:layout_height="200px"
android:layout_width="@dimen/v2x_loading_ani_width"
android:layout_height="@dimen/v2x_loading_ani_width"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="60px"
@@ -32,15 +32,15 @@
android:paddingTop="14px"
android:text="正在获取信息…"
android:textColor="#FFFFFF"
android:textSize="18px"
android:textSize="@dimen/v2x_share_btn_size"
app:layout_constraintBottom_toBottomOf="@+id/loading_imageview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/refresh_button"
android:layout_width="150px"
android:layout_height="48px"
android:layout_width="@dimen/v2x_share_btn_width"
android:layout_height="@dimen/v2x_share_btn_height"
android:layout_below="@id/loading_text"
android:layout_centerHorizontal="true"
android:layout_gravity="top|center"
@@ -48,7 +48,7 @@
android:background="@drawable/v2xt_dw_common_corner_bkg_light"
android:text="刷新"
android:textColor="#FFFFFF"
android:textSize="18px"
android:textSize="@dimen/v2x_share_btn_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loading_imageview" />

4
modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
View File

@@ -12,8 +12,8 @@
<ImageView
android:id="@+id/btnShowOrHidePanels"
android:layout_width="@dimen/dp_52"
android:layout_height="@dimen/dp_52"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_event_panel_more" />

2
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -49,5 +49,5 @@
<dimen name="module_v2x_surrounding_top_textsize">18px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_left_textsize">20px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_panel_cor">30px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
</resources>

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

@@ -52,7 +52,12 @@
<dimen name="module_v2x_surrounding_item_bottom_right_textsize">16px</dimen>
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">4px</dimen>
<dimen name="module_v2x_panel_cor">16px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
<dimen name="module_v2x_panel_width">120px</dimen>
<dimen name="share_empty_icon_width">360px</dimen>
<dimen name="v2x_loading_ani_width">400px</dimen>
<dimen name="v2x_share_btn_width">281px</dimen>
<dimen name="v2x_share_btn_height">90px</dimen>
<dimen name="v2x_share_btn_size">33.75px</dimen>
</resources>

7
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -55,7 +55,12 @@
<dimen name="module_v2x_des_index_width">16px</dimen>
<dimen name="module_v2x_des_index_height">20px</dimen>
<dimen name="module_v2x_panel_width">66px</dimen>
<dimen name="module_v2x_panel_cor">16px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
<dimen name="share_empty_icon_width">117px</dimen>
<dimen name="v2x_loading_ani_width">200px</dimen>
<dimen name="v2x_share_btn_width">150px</dimen>
<dimen name="v2x_share_btn_height">48px</dimen>
<dimen name="v2x_share_btn_size">18px</dimen>
</resources>

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_p_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

0
skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_panel_list_background_light.9.png → skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_shadow_bg_light.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_event_panel_more_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 677 B

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_parking_p_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

0
skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_panel_list_background_light.9.png → skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_shadow_bg_light.9.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

2
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_drawable_event_more_bkg_light.xml
View File

@@ -1,7 +1,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<corners android:radius="@dimen/dp_40" />
<corners android:radius="@dimen/module_v2x_panel_icon_cor" />
<gradient android:startColor="#FFFFFFFF" android:endColor="#E5F5F5F5" android:angle="0" />
</shape>
</item>

2
skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
<dimen name="module_v2x_panel_icon_cor">30px</dimen>
</resources>

1
skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_v2x_surrounding_refresh_bt_radius">24px</dimen>
<dimen name="module_v2x_panel_icon_cor">16px</dimen>
</resources>