From 998c49d4740d17f54a4c4bfcd6e72be097e859bf Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 30 Apr 2020 11:20:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BD=93?= =?UTF-8?q?=E6=9C=BA=E5=88=86=E4=BA=AB=E6=A1=86=E8=83=8C=E6=99=AF=E5=8D=A0?= =?UTF-8?q?=E4=B8=8D=E6=BB=A1=E5=85=A8=E5=B1=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/share/dialog/LaucherShareDialog.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index a2fbf3cc96..f5cae41f03 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -13,6 +13,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; +import com.mogo.module.common.utils.CarSeries; import com.mogo.module.share.R; import com.mogo.module.share.ShareControl; import com.mogo.module.share.constant.ShareConstants; @@ -189,8 +190,14 @@ public class LaucherShareDialog implements View.OnClickListener { // mWindowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; // FLAG_LAYOUT_IN_SCREEN:将window放置在整个屏幕之内,无视其他的装饰(比如状态栏); FLAG_NOT_TOUCH_MODAL:不阻塞事件传递到后面的窗口 layoutParams.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; - layoutParams.width = WindowUtils.getScreenWidth(mContext); - layoutParams.height = WindowUtils.getScreenHeight(mContext); + if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + layoutParams.width = 1920; + layoutParams.height = 1080; + }else { + layoutParams.width = WindowUtils.getScreenWidth(mContext); + layoutParams.height = WindowUtils.getScreenHeight(mContext); + } + Logger.d("ShareDialog", "width: " + layoutParams.width + " height: " + layoutParams.height); //后面变暗区域透明... layoutParams.dimAmount = 0; layoutParams.x = 0; From 4dfa013456c798d04c28fdd82ecd1e6e09e2cd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 30 Apr 2020 14:24:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index dae990f8dc..d83ce2affd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.6.10 +MOGO_MODULE_V2X_VERSION=1.0.6.11 # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送