From 8ec55f0b48d0114980904dbd68ecd504f8b3ff42 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Jul 2020 14:55:52 +0800 Subject: [PATCH 01/26] fix bug of dialog dismiss --- .../authorize/authprovider/biz/MogoAuthorizeProvider.kt | 8 +++++--- .../authorize/authprovider/launcher/MogoMainAuthorize.kt | 4 +++- .../src/main/java/com/mogo/module/main/MainActivity.java | 3 ++- .../java/com/mogo/service/auth/IMogoAuthManager.java | 9 +++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt index 76b7977927..beac0c0246 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt @@ -15,7 +15,6 @@ import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Compani import com.mogo.service.MogoServicePaths import com.mogo.service.auth.IMogoAuthManager import com.mogo.service.module.IMogoModuleLifecycle -import com.mogo.service.module.ModuleType import com.mogo.utils.logger.Logger @Route(path = MogoServicePaths.PATH_AGREEMENT) @@ -63,7 +62,7 @@ class MogoAuthorizeProvider : IMogoAuthManager { return null } - override fun resetContext(context: Context?) { + override fun showAuth(context: Context?) { mContext = context if (mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { mogoAuthShow.invokeAuthorizeForShow(mContext!!) @@ -74,11 +73,14 @@ class MogoAuthorizeProvider : IMogoAuthManager { } } + override fun dismiss() { + mogoAuthShow.hideAuthorizeView() + } + override fun init(context: Context) { //todo 引导判断暂时去掉 后续引导流程更改完再放开 // todo if (isDeviceOfD() && hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { // todo F系列暂时没有授权功能 1.1需求中添加 全量上 - } override fun getAppPackage(): String? { 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 cec3e22d62..964594e655 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 @@ -68,7 +68,9 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog } fun hideAuthorizeView() { - authorizeDialog?.dismiss() + if (authorizeDialog != null && authorizeDialog!!.isShowing) { + authorizeDialog?.dismiss() + } } private fun pushLayoutToMainWindow(tag: String) { 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 92a2814aeb..ca02b01d8a 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().showAuth(this); mMogoStatusManager = mServiceApis.getStatusManagerApi(); mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); AutopilotServiceManage.getInstance().init( getContext() ); @@ -245,6 +245,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); + mServiceApis.getAuthManagerApi().dismiss(); if ( shouldCloseADASPanel() ) { mServiceApis.getAdasControllerApi().closeADAS(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java index a8d2bac05d..0c22c0bd45 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java @@ -7,7 +7,12 @@ import com.mogo.service.module.IMogoModuleProvider; public interface IMogoAuthManager extends IMogoModuleProvider { /** - * 重置授权页面弹起时展示View Context + * 弹起授权页面 展示View Context */ - void resetContext(Context context); + void showAuth(Context context); + + /** + * 关闭授权页面 + */ + void dismiss(); } From ac3c6273481893fc365b5faf68dc8e95b4b1bbf7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Jul 2020 14:57:56 +0800 Subject: [PATCH 02/26] fix bug of dialog dimiss --- .../authorize/authprovider/biz/MogoAuthorizeProvider.kt | 8 +++++--- .../authorize/authprovider/launcher/MogoMainAuthorize.kt | 4 +++- .../src/main/java/com/mogo/module/main/MainActivity.java | 3 ++- .../java/com/mogo/service/auth/IMogoAuthManager.java | 9 +++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt index 76b7977927..beac0c0246 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt @@ -15,7 +15,6 @@ import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Compani import com.mogo.service.MogoServicePaths import com.mogo.service.auth.IMogoAuthManager import com.mogo.service.module.IMogoModuleLifecycle -import com.mogo.service.module.ModuleType import com.mogo.utils.logger.Logger @Route(path = MogoServicePaths.PATH_AGREEMENT) @@ -63,7 +62,7 @@ class MogoAuthorizeProvider : IMogoAuthManager { return null } - override fun resetContext(context: Context?) { + override fun showAuth(context: Context?) { mContext = context if (mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { mogoAuthShow.invokeAuthorizeForShow(mContext!!) @@ -74,11 +73,14 @@ class MogoAuthorizeProvider : IMogoAuthManager { } } + override fun dismiss() { + mogoAuthShow.hideAuthorizeView() + } + override fun init(context: Context) { //todo 引导判断暂时去掉 后续引导流程更改完再放开 // todo if (isDeviceOfD() && hasGuide() && mogoAuthShow.needAuthorize(AUTHORIZE_TYPE_LAUNCHER_MAIN)) { // todo F系列暂时没有授权功能 1.1需求中添加 全量上 - } override fun getAppPackage(): String? { 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 cec3e22d62..964594e655 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 @@ -68,7 +68,9 @@ class MogoMainAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMog } fun hideAuthorizeView() { - authorizeDialog?.dismiss() + if (authorizeDialog != null && authorizeDialog!!.isShowing) { + authorizeDialog?.dismiss() + } } private fun pushLayoutToMainWindow(tag: String) { 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 92a2814aeb..ca02b01d8a 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().showAuth(this); mMogoStatusManager = mServiceApis.getStatusManagerApi(); mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); AutopilotServiceManage.getInstance().init( getContext() ); @@ -245,6 +245,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); + mServiceApis.getAuthManagerApi().dismiss(); if ( shouldCloseADASPanel() ) { mServiceApis.getAdasControllerApi().closeADAS(); } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java index a8d2bac05d..0c22c0bd45 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java @@ -7,7 +7,12 @@ import com.mogo.service.module.IMogoModuleProvider; public interface IMogoAuthManager extends IMogoModuleProvider { /** - * 重置授权页面弹起时展示View Context + * 弹起授权页面 展示View Context */ - void resetContext(Context context); + void showAuth(Context context); + + /** + * 关闭授权页面 + */ + void dismiss(); } From b5977778d599fb5cc28a9348ec57e2ee730ad3ab Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 27 Jul 2020 15:19:24 +0800 Subject: [PATCH 03/26] upgrade tanlu version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 482db1913b..3039a433fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.10 +MOGO_MODULE_TANLU_VERSION=1.3.1.11 # 车聊聊 CARCHATTING_VERSION=1.4.8 # 车聊聊接口 @@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.10 +TANLULIB_VERSION=1.3.1.11 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 From b53a5150e01335db1f72f08dddac63c4df488082 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 27 Jul 2020 17:02:54 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8A=E6=8A=A5=E6=9C=8D=E5=8A=A1=20SDK=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/mogo-base-services-sdk/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foudations/mogo-base-services-sdk/build.gradle b/foudations/mogo-base-services-sdk/build.gradle index f2bd559880..7237542631 100644 --- a/foudations/mogo-base-services-sdk/build.gradle +++ b/foudations/mogo-base-services-sdk/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation rootProject.ext.dependencies.arouter // 上报位置 - implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.2' + implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.3' // 长链 implementation 'com.zhidao.socket:built-in-socket:1.0.15' // passport From fe80c294a1a82202e341e9f272628ae917715dce Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 27 Jul 2020 17:27:18 +0800 Subject: [PATCH 05/26] ui fix --- .../mogo/module/main/independent/MainIndependentActivity.java | 2 +- .../src/main/res/values-xhdpi-1920x1000/dimens.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index c93940b10a..f085d39fdb 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -31,7 +31,7 @@ public class MainIndependentActivity extends MainActivity { FrameLayout.LayoutParams entranceParams = ( ( FrameLayout.LayoutParams ) mEntrance.getLayoutParams() ); entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft ); mEntrance.setLayoutParams( entranceParams ); - + mLeftShadowFrame.setVisibility(View.VISIBLE); mApps.setVisibility( View.GONE ); } diff --git a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml index 301d92c1e7..2b7a52a38a 100644 --- a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -1,8 +1,8 @@ 122px - 110px + 120px 30px - 47px + 51.4px \ No newline at end of file From b01bd168c857024b9ae0f46ee0a1a0756d98cc5b Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 27 Jul 2020 19:00:39 +0800 Subject: [PATCH 06/26] ui fix --- .../extensions/utils/TopViewAnimHelper.java | 62 +++---------------- 1 file changed, 9 insertions(+), 53 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index 5c67f3141e..f6daadef2a 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -380,9 +380,11 @@ public class TopViewAnimHelper { // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知 constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM); - constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE, - tvNextDistance.getId(), ConstraintSet.BASELINE); + constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP, + ivTurnIcon.getId(), ConstraintSet.TOP); +// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM); +// constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE, +// tvNextDistance.getId(), ConstraintSet.BASELINE); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); @@ -437,58 +439,13 @@ public class TopViewAnimHelper { if (topMotionLayout == null) { return; } - Logger.d("TopViewAnimHelper", "startTopOutAnim====="); if (!isTopViewOut && viewCaches.contains(view)) { -// if (topContainer.getChildCount() > 1) { -// // 顶部view包含多个view，只推出当前view，不进行整体上移 -// Logger.d(TAG, -// "小view退出: " + view.getTranslationY() + " height: " + view.getHeight()); -// if (statusListenerMap.get(view) != null) { -// statusListenerMap.get(view).beforeViewRemoveAnim(view); -// } -// view.animate().translationY(-(view.getHeight())).setDuration(500).setListener -// (new Animator.AnimatorListener() { -// @Override -// public void onAnimationStart(Animator animation) { -// -// } -// -// @Override -// public void onAnimationEnd(Animator animation) { -// Logger.d(TAG, "onAnimationEnd: " + view); -// viewCaches.remove(view); -// topContainer.removeView(view); -// IMogoTopViewStatusListener listener = statusListenerMap.remove(view); -// if (listener != null) { -// listener.onViewRemoved(view); -// } else { -// Logger.d(TAG, "listener is null"); -// } -// } -// -// @Override -// public void onAnimationCancel(Animator animation) { -// viewCaches.remove(view); -// topContainer.removeView(view); -// } -// -// @Override -// public void onAnimationRepeat(Animator animation) { -// -// } -// }).start(); -// } else { // 顶部view仅剩一个view，需要整体上移 -// currentAnimatingView = view; if (statusListenerMap.get(view) != null) { statusListenerMap.get(view).beforeViewRemoveAnim(view); } isTopViewOut = true; -// if (naviBg.getVisibility() == View.VISIBLE) { -// tvNextRoad.setTextSize(getDimen(R.dimen -// .module_ext_navi_info_panel_next_info_road_textSize)); -// } if (naviBg.getVisibility() == View.VISIBLE) { remainDistanceGroup.setVisibility(View.VISIBLE); remainTimeGroup.setVisibility(View.VISIBLE); @@ -509,7 +466,7 @@ public class TopViewAnimHelper { // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo() // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知 constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE); + constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom)); @@ -562,7 +519,7 @@ public class TopViewAnimHelper { // 调整约束 constraintSet.clone(topMotionLayout); constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE); + constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, @@ -594,9 +551,8 @@ public class TopViewAnimHelper { constraintSet.clone(topMotionLayout); constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM); - constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE, - tvNextDistance.getId(), ConstraintSet.BASELINE); + constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP, + ivTurnIcon.getId(), ConstraintSet.TOP); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); From 53a49ec0032cc2e01e718d769648f846e071b11d Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 27 Jul 2020 19:03:24 +0800 Subject: [PATCH 07/26] ui fix --- .../res/layout-xhdpi-1920x1000/include_navi_info_panle.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml index 9993214dcd..a751411906 100644 --- a/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml +++ b/modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml @@ -128,6 +128,7 @@ android:layout_height="wrap_content" android:text="剩余" android:textColor="#7FFFFFFF" + android:layout_marginBottom="10px" android:textSize="@dimen/module_ext_remaining_distance_unit_textSize" app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg" app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance_icon" @@ -180,6 +181,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="时间" + android:layout_marginBottom="10px" android:textColor="#7FFFFFFF" android:textSize="@dimen/module_ext_remaining_distance_unit_textSize" app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg" @@ -227,6 +229,7 @@ android:text="到达" android:textColor="#7FFFFFFF" android:textSize="@dimen/module_ext_remaining_distance_unit_textSize" + android:layout_marginBottom="10px" app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg" app:layout_constraintLeft_toRightOf="@id/module_map_id_arrive_time_icon" app:layout_constraintRight_toRightOf="@id/module_map_id_arrive_time" From a689060eb7880ffa8bcd4aac60cc4aebf8d86ccb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Jul 2020 09:43:18 +0800 Subject: [PATCH 08/26] fix bug of UI --- .../res/layout-xhdpi-1920x1000/module_authorize_fragment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3365c3c4d6..74308d148f 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 @@ -149,7 +149,7 @@ Date: Tue, 28 Jul 2020 09:50:09 +0800 Subject: [PATCH 09/26] fix bug of UI --- .../layout-xhdpi-1920x1000/module_authorize_fragment.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 74308d148f..f3d940ee26 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 @@ -109,9 +109,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginLeft="@dimen/dp_301" - android:layout_marginTop="@dimen/dp_110" + android:layout_marginTop="@dimen/dp_100" android:layout_marginRight="@dimen/dp_301" - android:layout_marginBottom="@dimen/dp_110" + android:layout_marginBottom="@dimen/dp_100" android:background="@drawable/module_authorize_selector_dark_corner" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" @@ -200,7 +200,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_62" android:textColor="@android:color/white" - android:textSize="@dimen/dp_55" + android:textSize="@dimen/dp_42" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From 6f80ae883b17bfcd5cea1d1ff5b417ee53e7df20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Jul 2020 10:24:05 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E8=87=AA=E7=A0=94?= =?UTF-8?q?=E8=BD=A6=E6=9C=BA=E6=89=8D=E6=9C=89=E7=96=B2=E5=8A=B3=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/holder/V2XRoadEventDetailVH.java | 1 + .../v2x/listener/V2XLocationListener.java | 37 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java index 165f912f32..a144024721 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java @@ -318,6 +318,7 @@ public class V2XRoadEventDetailVH extends V2XBaseViewHolder { // 重新设置用户信息 mNoveltyInfo.setUserInfo(mUserInfo); + // 只有自研车机才会 有车聊聊通话 if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { // 判断是否可以打电话 ChartingUtil.isCanCall(b -> { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java index bf22201dba..0bbc8473b1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java @@ -2,6 +2,7 @@ package com.mogo.module.v2x.listener; import android.content.Context; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.MogoLatLng; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; @@ -11,14 +12,14 @@ import com.mogo.map.search.geo.MogoGeocodeResult; import com.mogo.map.search.geo.MogoRegeocodeResult; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerResponse; -import com.mogo.module.service.Utils; -import com.mogo.module.v2x.V2XConst; -import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.alarm.V2XAlarmServer; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XPoiTypeEnum; import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.service.Utils; +import com.mogo.module.v2x.V2XConst; +import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.module.v2x.alarm.V2XAlarmServer; import com.mogo.module.v2x.network.V2XRefreshCallback; import com.mogo.module.v2x.scenario.impl.V2XScenarioManager; import com.mogo.module.v2x.utils.ADASUtils; @@ -126,21 +127,23 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList } } - // 疲劳驾驶检测 - V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> { - Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity)); + // 只有自研车机才有疲劳驾驶检测 + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { + V2XAlarmServer.getFatigueDrivingShow(location, drivingShowEntity -> { + Logger.i(V2XConst.MODULE_NAME, "疲劳驾驶POI查询结果为: " + GsonUtil.jsonFromObject(drivingShowEntity)); - String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2"; - trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style); + String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2"; + trackWithType(V2XPoiTypeEnum.ALERT_FATIGUE_DRIVING, drivingShowEntity.getLon(), drivingShowEntity.getLat(), style); - V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); - v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING); - v2XMessageEntity.setContent(drivingShowEntity); - v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow()); - // 广播给ADAS Launcher - ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity); - V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); - }); + V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); + v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING); + v2XMessageEntity.setContent(drivingShowEntity); + v2XMessageEntity.setShowState(drivingShowEntity.isShowWindow()); + // 广播给ADAS Launcher + ADASUtils.broadcastToADAS(V2XServiceManager.getContext(), drivingShowEntity); + V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); + }); + } // 巡航处理 V2XRoadEventEntity v2XRoadEventEntity = From 77fff248a4d31c51e6c6a2c9f7a6863b6cd3d1b5 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 28 Jul 2020 11:49:58 +0800 Subject: [PATCH 11/26] ui fix --- .../extensions/utils/TopViewAnimHelper.java | 53 ++++++++++--------- .../res/values-xhdpi-1920x1000/dimens.xml | 4 +- .../main/res/layout/fragment_byd_splash.xml | 3 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java index f6daadef2a..47494f15ba 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java @@ -380,11 +380,12 @@ public class TopViewAnimHelper { // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知 constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM); - constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP, - ivTurnIcon.getId(), ConstraintSet.TOP); +// constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP, +// ivTurnIcon.getId(), ConstraintSet.TOP); // constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM); -// constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE, -// tvNextDistance.getId(), ConstraintSet.BASELINE); + constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, + tvNextDistance.getId(), ConstraintSet.BOTTOM, + (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6)); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); @@ -399,8 +400,10 @@ public class TopViewAnimHelper { computeNaviMarginTop(params.height)); // 动态改变相关字体大小 - tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small)); - tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small)); + tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small)); + tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small)); } constraintSet.applyTo(topMotionLayout); @@ -450,8 +453,10 @@ public class TopViewAnimHelper { remainDistanceGroup.setVisibility(View.VISIBLE); remainTimeGroup.setVisibility(View.VISIBLE); arriveTimeGroup.setVisibility(View.VISIBLE); - tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize)); - tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize)); + tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize)); + tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize)); } constraintSet.clone(topMotionLayout); @@ -466,7 +471,7 @@ public class TopViewAnimHelper { // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo() // 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知 constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP); +// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM, (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom)); @@ -513,15 +518,18 @@ public class TopViewAnimHelper { remainDistanceGroup.setVisibility(View.VISIBLE); remainTimeGroup.setVisibility(View.VISIBLE); arriveTimeGroup.setVisibility(View.VISIBLE); - tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize)); - tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize)); + tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize)); + tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize)); // 调整约束 constraintSet.clone(topMotionLayout); constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM); - constraintSet.clear(tvNextRoad.getId(), ConstraintSet.TOP); +// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), - ConstraintSet.BOTTOM); + ConstraintSet.BOTTOM, + (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom)); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, tvNextDistance.getId(), ConstraintSet.LEFT, 0); @@ -545,27 +553,24 @@ public class TopViewAnimHelper { remainDistanceGroup.setVisibility(View.GONE); remainTimeGroup.setVisibility(View.GONE); arriveTimeGroup.setVisibility(View.GONE); - tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small)); - tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small)); + tvNextDistance.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_textSize_small)); + tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small)); // 调整约束 constraintSet.clone(topMotionLayout); constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(), ConstraintSet.BOTTOM); - constraintSet.connect(tvNextRoad.getId(), ConstraintSet.TOP, - ivTurnIcon.getId(), ConstraintSet.TOP); +// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM); + constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, + tvNextDistance.getId(), ConstraintSet.BOTTOM, + (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_6)); constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT, R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT, (int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46)); constraintSet.connect(naviBg.getId(), ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, computeNaviMarginTop(topContainer.getHeight())); -// ivTurnIcon.getLayoutParams().height = -// (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_height); -// ivTurnIcon.getLayoutParams().width = -// (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_width); -// naviBg.getLayoutParams().height = -// (int) topMotionLayout.getContext().getResources().getDimension(R.dimen -// .module_ext_navi_info_panel_small_height); constraintSet.clear(ivTurnIcon.getId(), ConstraintSet.TOP); constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM, diff --git a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml index 2b7a52a38a..91bd49b433 100644 --- a/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -1,8 +1,8 @@ 122px - 120px + 130px 30px - 51.4px + 53px \ No newline at end of file diff --git a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml index f7bb689995..bb79601719 100644 --- a/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml +++ b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml @@ -16,7 +16,8 @@ android:background="@drawable/byd_enter_btn_bg" android:textColor="#0D172C" android:text="开启行程" - android:textSize="@dimen/dp_48" + android:textSize="@dimen/dp_46" + android:textStyle="bold" android:layout_marginStart="@dimen/dp_182" android:layout_marginBottom="@dimen/dp_251" app:layout_constraintBottom_toBottomOf="parent" From 4afaeb740733e5b59aa433e2c2496250f93e83cb Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 28 Jul 2020 12:29:19 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E7=96=B2=E5=8A=B3=E9=A9=BE=E9=A9=B6?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9B=91=E5=90=AC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java | 3 +++ .../src/main/res/raw/scenario_fatigue_driving_data.json | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java index 9ce5a57e2b..d1901c1fd4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java @@ -69,6 +69,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout mTvAddress = findViewById(R.id.tvAddress); mTvAddressDistance = findViewById(R.id.tvAddressDistance); mIvToNav = findViewById(R.id.ivToNav); + V2XServiceManager.getMogoRegisterCenter().registerMogoNaviListener( "test", this ); mIvToNav.setOnClickListener(v -> startNavi()); } @@ -118,6 +119,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout handlerV2XEvent.removeCallbacks(runnableV2XEvent); runnableV2XEvent = null; } + //移除窗体 V2XServiceManager .getMogoTopViewManager() @@ -155,6 +157,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout @Override public void onCalculateSuccess() { + V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener( "test"); V2XServiceManager.getNavi().startNavi(true); } diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json index afd2eec4c8..e547da75f3 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json @@ -14,9 +14,11 @@ "zoom": true, "zoomScale": 15, "location": { - "lat": 39.9554100000, - "lon": 116.4178276100 + "lat": 39.951326, + "lon": 116.343487 }, + "lat": 39.951326, + "lon": 116.343487, "userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png", "msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg" } \ No newline at end of file From 47cd0c54357bab1b015c3b07ccf7c901a8a31573 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 28 Jul 2020 11:58:42 +0800 Subject: [PATCH 13/26] upgrade tanlu version --- .idea/misc.xml | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3039a433fb..689c1c2501 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.11 +MOGO_MODULE_TANLU_VERSION=1.3.1.12 # 车聊聊 CARCHATTING_VERSION=1.4.8 # 车聊聊接口 @@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.11 +TANLULIB_VERSION=1.3.1.12 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 From 4ed80fe3febc25946830eb635d0993cc03c0f441 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 28 Jul 2020 14:35:22 +0800 Subject: [PATCH 14/26] opt ui --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 689c1c2501..ae69738a72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.12 +MOGO_MODULE_TANLU_VERSION=1.3.1.13 # 车聊聊 CARCHATTING_VERSION=1.4.8 # 车聊聊接口 @@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.12 +TANLULIB_VERSION=1.3.1.13 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 From 76e79095b23139f9fd707e793b39e92080a8197d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Jul 2020 15:08:48 +0800 Subject: [PATCH 15/26] replace png --- .../module_service_ic_rc_illegal_park_light.png | Bin 0 -> 3223 bytes .../icon_illegal_parking.png | Bin 0 -> 4522 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png new file mode 100644 index 0000000000000000000000000000000000000000..dbc420e8e6eef9046a94897417910c19b55e30ae GIT binary patch literal 3223 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 JPDHLkV1jX_J1qbJ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png new file mode 100644 index 0000000000000000000000000000000000000000..5923d114f65ba62a7521affd2a13082817f573df GIT binary patch literal 4522 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 Date: Tue, 28 Jul 2020 15:28:46 +0800 Subject: [PATCH 16/26] replace the illegal parking png --- .../module_service_ic_rc_illegal_park.png | Bin 0 -> 4522 bytes .../icon_illegal_parking.png | Bin 4522 -> 20282 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png new file mode 100644 index 0000000000000000000000000000000000000000..5923d114f65ba62a7521affd2a13082817f573df GIT binary patch literal 4522 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 Date: Tue, 28 Jul 2020 15:33:30 +0800 Subject: [PATCH 17/26] opt --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ae69738a72..ae9f6c6d8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,7 +63,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.3.1.13 +MOGO_MODULE_TANLU_VERSION=1.3.1.15 # 车聊聊 CARCHATTING_VERSION=1.4.8 # 车聊聊接口 @@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.3.1.13 +TANLULIB_VERSION=1.3.1.15 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT #左侧面板模块 From f4ebdc8308e806f531363b9773d0491f663d0e23 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 28 Jul 2020 15:36:53 +0800 Subject: [PATCH 18/26] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A8=A1=E5=9D=97=E9=83=A8=E5=88=86=E6=9C=AA?= =?UTF-8?q?=E5=91=BD=E5=90=8Ddimens=E8=B5=84=E6=BA=90=202.=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BAmarker=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 +++ .../com/mogo/launcher/MogoApplication.java | 1 + .../com/mogo/commons/debug/DebugConfig.java | 13 ++++ .../main/res/layout/fragment_navi_setting.xml | 16 +++-- .../src/main/res/layout/fragment_search.xml | 20 +++--- .../res/layout/fragment_search_category.xml | 13 ++-- .../src/main/res/layout/item_search_poi.xml | 12 ++-- .../src/main/res/values-ldpi/dimens.xml | 48 +++++++------- .../src/main/res/values-mdpi/dimens.xml | 48 +++++++------- .../src/main/res/values-xhdpi/dimens.xml | 59 +++++++++-------- .../src/main/res/values/dimens.xml | 63 +++++++++---------- .../src/main/res/values/styles.xml | 10 +-- .../service/marker/MapMarkerManager.java | 6 +- 13 files changed, 170 insertions(+), 147 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0ef830f124..aab226de34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,6 +109,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // e系列，采用Launcher方案 e8xx { @@ -118,6 +119,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // 同上 em4 { @@ -127,6 +129,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -136,6 +139,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -145,6 +149,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // d系列 d8xx { @@ -154,6 +159,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // d系列 1+16 版本 d82x{ @@ -163,6 +169,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // 比亚迪 bydauto{ @@ -172,6 +179,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1 buildConfigField 'int', 'CAR_MACHINE_TYPE', '1' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 449ebf20d4..2fd042befb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -95,6 +95,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE ); DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product ); DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID ); + DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index fff915fbb3..ebf76b2850 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -237,4 +237,17 @@ public class DebugConfig { public static String getSocketAppId() { return sSocketAppId; } + + /** + * 道路事件动画 + */ + private static boolean sRoadEventAnimated = false; + + public static boolean isRoadEventAnimated() { + return sRoadEventAnimated; + } + + public static void setRoadEventAnimated( boolean sRoadEventAnimated ) { + DebugConfig.sRoadEventAnimated = sRoadEventAnimated; + } } diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml index b06ddec62c..9390eafe8c 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml @@ -5,9 +5,7 @@ android:layout_height="match_parent" android:background="#2D2E3D" android:clickable="true" - android:orientation="vertical" - - > + android:orientation="vertical"> + android:textSize="@dimen/module_search_title_textSize" /> @@ -44,8 +42,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:overScrollMode="never" - android:paddingLeft="@dimen/module_search_dp_160" - android:paddingRight="@dimen/module_search_dp_160" + android:paddingLeft="@dimen/module_search_setting_container_padding" + android:paddingRight="@dimen/module_search_setting_container_padding" android:scrollbars="none" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"> @@ -53,12 +51,12 @@ + android:paddingBottom="@dimen/module_search_setting_container_paddingBottom"> @@ -105,18 +105,18 @@ android:id="@+id/rv_navi_history" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/module_search_dp_60" /> + android:layout_marginTop="@dimen/module_search_histories_inner_list_marginTop" /> - - 32px + 20px + 32px 32px 640px 64px @@ -19,32 +20,31 @@ 64px 16px 18px - 38px - 75px + 38px 40px - 410px - 640px - 16px - 20px - 30px - 20px - 28px - 144px - 126px - 96px - 42px - 38px - 28px - 23px - 96px - 69px - 192px - 64px + 410px + 640px + 16px + 20px + 30px + 20px + 28px + 144px + 126px + 96px + 42px + 38px + 28px + 23px + 96px + 69px + 192px + 64px 24px - 446px + 446px 83px - 56px - 100px + 56px + 100px 18px 111px 16px diff --git a/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml index 1d9cb352ae..a1fda384ff 100644 --- a/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml @@ -2,7 +2,8 @@ - 32px + 20px + 32px 32px 640px 64px @@ -19,32 +20,31 @@ 64px 16px 18px - 38px - 75px + 38px 40px - 410px - 640px - 16px - 20px - 30px - 20px - 28px - 144px - 126px - 96px - 42px - 38px - 28px - 23px - 96px - 69px - 192px - 64px + 410px + 640px + 16px + 20px + 30px + 20px + 28px + 144px + 126px + 96px + 42px + 38px + 28px + 23px + 96px + 69px + 192px + 64px 24px - 446px + 446px 83px - 56px - 100px + 56px + 100px 18px 111px 16px diff --git a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml index 7405ab41e0..deb82754dc 100644 --- a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml @@ -2,16 +2,16 @@ @dimen/sp_32 - @dimen/sp_40 - 25sp - @dimen/dp_60 - @dimen/dp_40 + 40px + 50px + 60px + 40px 600dp - @dimen/dp_120 - @dimen/dp_80 - @dimen/dp_24 - @dimen/dp_20 - @dimen/dp_50 + 120px + 80px + 24px + 20px + 50px 40px 266px 8px @@ -21,29 +21,28 @@ 120px 32px 75px - 72px - 75px - 778px - 1200px - 32px - 40px - 60px - 37px - 268px - 236px - 180px - 80px - 70px - 25sp - 42px - 160px - 150px - 180dp - 120px + 72px + 778px + 1200px + 32px + 40px + 60px + 37px + 268px + 236px + 180px + 80px + 70px + 25px + 42px + 160px + 150px + 180dp + 120px 45px - 838px + 838px 184px - 104px + 104px 154px 32px 212px diff --git a/modules/mogo-module-search/src/main/res/values/dimens.xml b/modules/mogo-module-search/src/main/res/values/dimens.xml index a06368577c..deb82754dc 100644 --- a/modules/mogo-module-search/src/main/res/values/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values/dimens.xml @@ -1,17 +1,17 @@ + @dimen/sp_32 - @dimen/dp_60 - @dimen/sp_40 - 25sp - @dimen/dp_60 - @dimen/dp_40 + 40px + 50px + 60px + 40px 600dp - @dimen/dp_120 - @dimen/dp_80 - @dimen/dp_24 - @dimen/dp_20 - @dimen/dp_50 + 120px + 80px + 24px + 20px + 50px 40px 266px 8px @@ -21,29 +21,28 @@ 120px 32px 75px - 72px - 75px - 778px - 1200px - 32px - 40px - 60px - 37px - 268px - 236px - 180px - 80px - 70px - 25sp - 42px - 160px - 150px - 180dp - 120px + 72px + 778px + 1200px + 32px + 40px + 60px + 37px + 268px + 236px + 180px + 80px + 70px + 25px + 42px + 160px + 150px + 180dp + 120px 45px - 838px - 142px - 104px + 838px + 184px + 104px 154px 32px 212px diff --git a/modules/mogo-module-search/src/main/res/values/styles.xml b/modules/mogo-module-search/src/main/res/values/styles.xml index a3f67638ff..c7a295ef43 100644 --- a/modules/mogo-module-search/src/main/res/values/styles.xml +++ b/modules/mogo-module-search/src/main/res/values/styles.xml @@ -17,29 +17,29 @@ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index f641febd03..771e3c1850 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -373,7 +373,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( mogoMarker == null || mogoMarker.isDestroyed() ) { Logger.d( TAG, "draw road condition, sn = %s", sn ); try { - post2AddAndStartAnimation( markerShowEntity, i * 100L ); + if ( DebugConfig.isRoadEventAnimated() ) { + post2AddAndStartAnimation( markerShowEntity, i * 100L ); + } else { + mogoMarker = drawMapMarker( markerShowEntity, ServiceConst.MARKER_Z_INDEX_HIGH ); + } } catch ( Exception e ) { e.printStackTrace(); } From fa7a01e1d7af99cc739c055deed5ddc83f25d569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Jul 2020 15:51:51 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86UI?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../v2x/adapter/V2XSeekHelpAdapter.java | 9 +- .../v2x/adapter/holder/V2XBaseViewHolder.java | 20 ++--- .../adapter/holder/V2XRoadEventDetailVH.java | 1 + .../listener/V2XMessageListener_401003.java | 16 +--- .../manager/impl/MoGoV2XPolylineManager.java | 1 + .../module/v2x/marker/V2XMarkerAdapter.java | 4 +- .../fatigue/V2XFatigueDrivingWindow.java | 2 +- .../module/v2x/utils/RoadConditionUtils.java | 13 +-- .../res/anim/v2x_unlike_heart_animation.xml | 8 +- .../main/res/drawable/v2x_fault_help_bg.xml | 5 +- .../main/res/layout/item_v2x_fault_help.xml | 88 ++++++++----------- .../res/layout/window_fatigue_driving.xml | 6 +- .../res/layout/window_illegal_parking.xml | 8 +- .../res/values-xhdpi-1920x1000/dimens.xml | 6 +- .../src/main/res/values/color.xml | 2 +- 16 files changed, 77 insertions(+), 114 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java index 09f0e3441b..0a901e78ad 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java @@ -18,6 +18,7 @@ import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity; import com.mogo.module.v2x.utils.ChartingUtil; +import com.mogo.module.v2x.utils.SpanUtils; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.imageloader.MogoImageView; import com.mogo.utils.logger.Logger; @@ -103,7 +104,7 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter @@ -18,13 +18,13 @@ android:duration="100" android:propertyName="translationX" android:valueFrom="0" - android:valueTo="2" + android:valueTo="5" android:valueType="floatType" /> diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml index 3a224c6654..ee2a754125 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml @@ -1,11 +1,10 @@ - diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index 417047d526..a87e825882 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -5,74 +5,42 @@ android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" android:background="@drawable/v2x_fault_help_bg" - android:paddingStart="@dimen/dp_40" - android:paddingEnd="@dimen/dp_40"> - - - - - - - - - + android:paddingEnd="@dimen/dp_40" + app:roundLayoutRadius="@dimen/dp_30"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" /> + + + app:layout_constraintTop_toTopOf="@+id/ivIconP" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 721fba8c3c..936ab7c995 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -8,11 +8,11 @@ 450px 390px - 210px + 200px - 160px + 180px - 90px + 110px 100px 270px diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/color.xml index 0faa50d319..f8a3476000 100644 --- a/modules/mogo-module-v2x/src/main/res/values/color.xml +++ b/modules/mogo-module-v2x/src/main/res/values/color.xml @@ -1,5 +1,5 @@ #256BFF - #FF3F4057 + #3F4057 \ No newline at end of file From 96bc3ba8a4bd9de3ba66927cbd3bfe26f54ae1a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 28 Jul 2020 16:38:59 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86UI?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_event_panel_fragment_event_panel.xml | 12 ++++++------ .../src/main/res/layout/item_v2x_event_detail.xml | 4 ++-- .../res/layout/item_v2x_event_detail_stub_live.xml | 2 +- .../src/main/res/layout/item_v2x_fault_help.xml | 4 ++-- .../src/main/res/layout/item_v2x_live_video.xml | 2 +- .../main/res/layout/item_v2x_push_event_detail.xml | 2 +- .../src/main/res/layout/view_heart_like.xml | 1 - .../src/main/res/layout/view_heart_unlike.xml | 1 - .../src/main/res/layout/view_video_layout_normal.xml | 2 +- .../src/main/res/layout/window_animation.xml | 2 +- .../src/main/res/layout/window_fatigue_driving.xml | 4 +++- .../src/main/res/layout/window_illegal_parking.xml | 2 +- .../src/main/res/values-xhdpi-1920x1000/dimens.xml | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml index 67437cda97..3536c79096 100644 --- a/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml @@ -9,17 +9,17 @@ android:id="@+id/vpEventPanel" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone"/> + android:visibility="gone" />