From b10d11d3588f45043ed07e0b70b2435944afc366 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Jul 2020 13:19:58 +0800 Subject: [PATCH] fix UI bug --- .../launcher/MogoMainAuthorize.kt | 8 +++--- .../authorize/layout/AuthorizeDialog.kt | 27 ++++++++++++++++--- .../com/mogo/module/main/MainActivity.java | 2 +- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt index 13c2da0e65..a82249ad1a 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt @@ -21,7 +21,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog } } - private var mContext:Context? = null + private var mContext: Context? = null private var authorizeDialog: AuthorizeDialog? = null @@ -41,7 +41,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog fun invokeAuthorizeForShow(context: Context) { mContext = context -// pushLayoutToMainWindow(AUTHORIZE_TYPE_LAUNCHER_MAIN) + pushLayoutToMainWindow(AUTHORIZE_TYPE_LAUNCHER_MAIN) } fun showAuthorizeView(tag: String, forbiddenVoice: (() -> Unit), onError: ((String) -> Unit)) { @@ -64,7 +64,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog Logger.d(TAG, "ready to forbidden voice") forbiddenVoice.invoke() Logger.d(TAG, "ready to push fragment") -// pushLayoutToMainWindow(tag) + pushLayoutToMainWindow(tag) } fun hideAuthorizeView() { @@ -73,7 +73,7 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog private fun pushLayoutToMainWindow(tag: String) { if (authorizeDialog == null) { - authorizeDialog = AuthorizeDialog(tag,mContext!!) + authorizeDialog = AuthorizeDialog(tag, mContext!!) } if (authorizeDialog!!.isShowing) { Logger.d(TAG, "User is operation authorization, do not repeat invoke") 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 4dc7287746..a19b3a2e0a 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 @@ -7,6 +7,7 @@ import android.widget.Button import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.module.authorize.R import com.mogo.module.authorize.util.AnalyticsUtil import com.mogo.module.authorize.voice.IVoiceAuthorizeIntentListener @@ -21,6 +22,10 @@ import kotlinx.coroutines.withContext class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandListener, IVoiceAuthorizeIntentListener { + companion object { + const val TAG = "AuthorizeDialog" + } + private var mContext: Context? = null private var invokeTag: String? = null @@ -49,14 +54,28 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList private fun initView() { setContentView(R.layout.module_authorize_fragment) + setWrapContent() initViews() } + private fun setWrapContent() { + if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){ + return + } + val mWindow = window + if (mWindow != null) { + val lp = mWindow.attributes + lp.width = 1920 + lp.height = 1000 + mWindow.attributes = lp + } + } + fun initViews() { - Logger.d(AuthorizeLayout.TAG, "initView ") + Logger.d(TAG, "initView ") AnalyticsUtil.track(AnalyticsUtil.INVOKE_TRACK_AUTHORIZE_SHOW) init() - Logger.d(AuthorizeLayout.TAG, "invokeTag :$invokeTag") + Logger.d(TAG, "invokeTag :$invokeTag") authorizeController = AuthorizeController(invokeTag!!) invokeAuthorizationContent() VoiceUtil.registerAll(this, this) @@ -118,7 +137,7 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList private fun voiceAuthorizeError() { VoiceUtil.speak(AbsMogoApplication.getApp().applicationContext.getString(R.string.module_authorize_failed), AbsMogoApplication.getApp().applicationContext, this) - Logger.d(AuthorizeLayout.TAG, "onDestroy") + Logger.d(TAG, "onDestroy") VoiceUtil.unregisterAll(AbsMogoApplication.getApp().applicationContext, this) } @@ -136,7 +155,7 @@ class AuthorizeDialog : BaseFloatDialog, View.OnClickListener, IVoiceCommandList invokeAuthorizationContent() } R.id.clAuthorizeTopParent -> { - Logger.i(AuthorizeLayout.TAG, "dismiss authorizeView") + Logger.i(TAG, "dismiss authorizeView") authorizeController?.onDestroy() } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 56f3d8aa44..5384a5c664 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -115,7 +115,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation(); } mServiceApis.getShareManager().resetContext(this); - // mServiceApis.getAuthManagerApi().resetContext(this); + mServiceApis.getAuthManagerApi().resetContext(this); mMogoStatusManager = mServiceApis.getStatusManagerApi(); mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); AutopilotServiceManage.getInstance().init( getContext() );