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