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

Merge branch 'dev' into dev_custom_map

Browse Source
This commit is contained in:
wangcongtao
2020-07-29 11:22:23 +08:00
parent 7a8d9a8084 13685ba00a
commit cb7855272c
57 changed files with 385 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -4,7 +4,7 @@
<asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="SuppressionsComponent">

8
app/build.gradle
View File

@@ -115,6 +115,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 {
@@ -124,6 +125,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
}
// 同上
em4 {
@@ -133,6 +135,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 {
@@ -142,6 +145,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 {
@@ -151,6 +155,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// d系列
d8xx {
@@ -160,6 +165,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{
@@ -169,6 +175,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// 比亚迪
bydauto{
@@ -178,6 +185,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"

24
app/functions/eventpanel.gradle
View File

@@ -2,24 +2,24 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
d8xxImplementation rootProject.ext.dependencies.moduleventpanel
d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop
em1Implementation rootProject.ext.dependencies.moduleventpanelnoop
bydautoImplementation rootProject.ext.dependencies.moduleventpanelnoop
d8xxImplementation rootProject.ext.dependencies.moduleventpanel
em4Implementation rootProject.ext.dependencies.moduleventpanel
e8xxImplementation rootProject.ext.dependencies.moduleventpanel
f8xxImplementation rootProject.ext.dependencies.moduleventpanel
em3Implementation rootProject.ext.dependencies.moduleventpanel
em4Implementation rootProject.ext.dependencies.moduleventpanelnoop
e8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
f8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
em3Implementation rootProject.ext.dependencies.moduleventpanelnoop
} else {
d8xxImplementation project(':modules:mogo-module-event-panel')
d82xImplementation project(':modules:mogo-module-event-panel-noop')
em1Implementation project(':modules:mogo-module-event-panel-noop')
bydautoImplementation project(':modules:mogo-module-event-panel-noop')
d8xxImplementation project(':modules:mogo-module-event-panel')
em4Implementation project(':modules:mogo-module-event-panel')
e8xxImplementation project(':modules:mogo-module-event-panel')
f8xxImplementation project(':modules:mogo-module-event-panel')
em3Implementation project(':modules:mogo-module-event-panel')
em4Implementation project(':modules:mogo-module-event-panel-noop')
e8xxImplementation project(':modules:mogo-module-event-panel-noop')
f8xxImplementation project(':modules:mogo-module-event-panel-noop')
em3Implementation project(':modules:mogo-module-event-panel-noop')
}
}

1
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

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

2
foudations/mogo-base-services-sdk/build.gradle
View File

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

13
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -246,4 +246,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;
}
}

4
gradle.properties
View File

@@ -64,7 +64,7 @@ MAP_CUSTOM_VERSION=1.2.1.9
## 工程外部模块
# 探路
MOGO_MODULE_TANLU_VERSION=1.3.1.10
MOGO_MODULE_TANLU_VERSION=1.3.1.16
# 车聊聊
CARCHATTING_VERSION=1.4.8
# 车聊聊接口
@@ -82,7 +82,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.16
MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
#左侧面板模块

2
main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
View File

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

8
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/biz/MogoAuthorizeProvider.kt
View File

@@ -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? {

4
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
View File

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

8
modules/mogo-module-authorize/src/main/res/layout-xhdpi-1920x1000/module_authorize_fragment.xml
View File

@@ -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"
@@ -149,7 +149,7 @@
<ScrollView
android:layout_width="0px"
android:layout_height="0px"
android:layout_marginBottom="@dimen/dp_139"
android:layout_marginBottom="@dimen/dp_123"
android:scrollbarSize="@dimen/dp_442"
android:layout_marginTop="@dimen/dp_35"
android:scrollbarTrackHorizontal="@drawable/module_authorize_scrollbar"
@@ -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"

12
modules/mogo-module-event-panel/src/main/res/layout/module_event_panel_fragment_event_panel.xml
View File

@@ -9,17 +9,17 @@
android:id="@+id/vpEventPanel"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
android:visibility="gone" />
<Button
android:id="@+id/btnShowOrHidePanels"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnShowOrHidePanels"
android:layout_marginTop="200dp"
android:layout_marginEnd="10dp"
android:text="显示面板"
android:textSize="20sp"
android:textColor="#000"
android:textSize="20sp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"/>
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

104
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -379,10 +379,13 @@ public class TopViewAnimHelper {
// 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
// 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
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);
ivTurnIcon.getId(), ConstraintSet.BOTTOM,(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
// 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));
@@ -397,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);
@@ -437,64 +442,21 @@ 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);
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);
@@ -509,7 +471,7 @@ public class TopViewAnimHelper {
// 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
// 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
// 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));
@@ -556,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.BASELINE);
// 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);
@@ -588,28 +553,25 @@ 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.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE,
tvNextDistance.getId(), ConstraintSet.BASELINE);
ivTurnIcon.getId(), ConstraintSet.BOTTOM,
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_2));
// 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,

3
modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml
View File

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

4
modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_left_panel_simple_speed_text_size">122px</dimen>
<dimen name="module_left_panel_simple_speed_text_margin_top">110px</dimen>
<dimen name="module_left_panel_simple_speed_text_margin_top">130px</dimen>
<dimen name="module_left_panel_simple_speed_title_size">30px</dimen>
<dimen name="module_left_panel_simple_speed_title_margin">47px</dimen>
<dimen name="module_left_panel_simple_speed_title_margin">53px</dimen>
</resources>

3
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -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();
}

16
modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
View File

@@ -5,9 +5,7 @@
android:layout_height="match_parent"
android:background="#2D2E3D"
android:clickable="true"
android:orientation="vertical"
>
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_navi_setting_title"
@@ -35,7 +33,7 @@
android:layout_toRightOf="@id/iv_back"
android:text="@string/navi_setting"
android:textColor="@color/white"
android:textSize="@dimen/txt_title" />
android:textSize="@dimen/module_search_title_textSize" />
</RelativeLayout>
@@ -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 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/module_search_dp_150">
android:paddingBottom="@dimen/module_search_setting_container_paddingBottom">
<LinearLayout
android:id="@+id/ll_navi_sound"
android:layout_width="@dimen/module_search_180dp"
android:layout_height="@dimen/module_search_dp_120"
android:layout_width="@dimen/module_search_setting_item_width"
android:layout_height="@dimen/module_search_setting_item_height"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"

20
modules/mogo-module-search/src/main/res/layout/fragment_search.xml
View File

@@ -55,7 +55,7 @@
<View
android:layout_width="1dp"
android:layout_height="@dimen/module_search_dp_72"
android:layout_height="@dimen/module_search_address_divider_height"
android:background="#17D8D8D8" />
<TextView
@@ -74,11 +74,11 @@
<RelativeLayout
android:id="@+id/rl_navi_history"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="@dimen/module_search_dp_778"
android:layout_marginTop="@dimen/module_search_dp_32"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="@dimen/module_search_histories_list_height"
android:layout_marginTop="@dimen/module_search_histories_list_marginTop"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_40"
android:padding="@dimen/module_search_histories_list_marginPadding"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_navi_search">
@@ -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" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_navi_search"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_32"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_37"
android:padding="@dimen/module_search_list_padding"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
app:layout_constraintLeft_toLeftOf="parent"
@@ -125,13 +125,13 @@
<TextView
android:id="@+id/tv_navi_list_empty"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_32"
android:background="@drawable/shape_round_gray"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/txt_large"
android:textSize="@dimen/module_search_empty_tip_textSize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
app:layout_constraintLeft_toLeftOf="parent"

13
modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/module_search_search_padding"
@@ -11,7 +12,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/cv_search_result"
android:layout_width="@dimen/module_search_dp_838"
android:layout_width="@dimen/module_search_category_panel_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/module_search_search_result_marginTop"
app:cardBackgroundColor="#3F4057"
@@ -37,7 +38,7 @@
android:id="@+id/tv_navi_navi"
style="@style/txt_btn"
android:layout_width="match_parent"
android:layout_height="@dimen/module_search_dp_104"
android:layout_height="@dimen/module_search_start_navi_button_height"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/module_search_start_button"
android:layout_marginRight="@dimen/module_search_start_button"
@@ -48,8 +49,8 @@
<ImageView
android:id="@+id/iv_path_fail"
android:layout_width="@dimen/module_search_dp_120"
android:layout_height="@dimen/module_search_dp_120"
android:layout_width="@dimen/module_search_setting_item_height"
android:layout_height="@dimen/module_search_setting_item_height"
android:layout_marginTop="@dimen/dp_224"
android:src="@mipmap/icon_path_fail"
app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
@@ -75,9 +76,9 @@
android:visibility="gone"
app:constraint_referenced_ids="iv_path_fail,tv_path_notice" />
<LinearLayout xmlns:tools="http://schemas.android.com/tools"
<LinearLayout
android:id="@+id/ll_navi_search"
android:layout_width="@dimen/module_search_dp_838"
android:layout_width="@dimen/module_search_category_panel_width"
android:layout_height="@dimen/module_search_et_hight"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"

12
modules/mogo-module-search/src/main/res/layout/item_search_poi.xml
View File

@@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/module_search_dp_180"
android:layout_height="@dimen/module_search_poi_item_height"
>
<ImageView
android:id="@+id/iv_position"
android:layout_width="@dimen/module_search_dp_80"
android:layout_height="@dimen/module_search_dp_80"
android:layout_width="@dimen/module_search_poi_item_icon_size"
android:layout_height="@dimen/module_search_poi_item_icon_size"
android:src="@mipmap/icon_navi_position"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -19,12 +19,12 @@
<TextView
android:id="@+id/tv_position"
android:layout_width="0dp"
android:layout_height="@dimen/module_search_dp_70"
android:layout_height="@dimen/module_search_poi_item_position_height"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="@dimen/module_search_25sp"
android:textSize="@dimen/module_search_poi_item_position_textSize"
app:layout_constraintLeft_toRightOf="@id/iv_position"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -34,7 +34,7 @@
<TextView
android:id="@+id/tv_position_des"
android:layout_width="0dp"
android:layout_height="@dimen/module_search_dp_42"
android:layout_height="@dimen/module_search_poi_item_desc_height"
android:layout_marginTop="@dimen/dp_8"
android:ellipsize="marquee"
android:singleLine="true"

48
modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml
View File

@@ -2,7 +2,8 @@
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="module_search_fragment_padding" >32px</dimen>
<dimen name="module_search_title_textSize">20px</dimen>
<dimen name="module_search_fragment_padding">32px</dimen>
<dimen name="module_search_fragment_padding_top">32px</dimen>
<dimen name="module_search_et_width">640px</dimen>
<dimen name="module_search_et_hight">64px</dimen>
@@ -19,32 +20,31 @@
<dimen name="module_search_navi_home_height">64px</dimen>
<dimen name="module_search_navi_home_margin_left">16px</dimen>
<dimen name="txt_normal">18px</dimen>
<dimen name="module_search_dp_72">38px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_address_divider_height">38px</dimen>
<dimen name="module_search_navi_home_padding_left">40px</dimen>
<dimen name="module_search_dp_778">410px</dimen>
<dimen name="module_search_dp_1200">640px</dimen>
<dimen name="module_search_dp_32">16px</dimen>
<dimen name="module_search_dp_40">20px</dimen>
<dimen name="module_search_dp_60">30px</dimen>
<dimen name="module_search_dp_37">20px</dimen>
<dimen name="txt_large">28px</dimen>
<dimen name="module_search_dp_268">144px</dimen>
<dimen name="module_search_dp_236">126px</dimen>
<dimen name="module_search_dp_180">96px</dimen>
<dimen name="module_search_dp_80">42px</dimen>
<dimen name="module_search_dp_70">38px</dimen>
<dimen name="module_search_25sp">28px</dimen>
<dimen name="module_search_dp_42">23px</dimen>
<dimen name="module_search_dp_160">96px</dimen>
<dimen name="module_search_dp_150">69px</dimen>
<dimen name="module_search_180dp">192px</dimen>
<dimen name="module_search_dp_120">64px</dimen>
<dimen name="module_search_histories_list_height">410px</dimen>
<dimen name="module_search_histories_list_width">640px</dimen>
<dimen name="module_search_histories_list_marginTop">16px</dimen>
<dimen name="module_search_histories_list_marginPadding">20px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">30px</dimen>
<dimen name="module_search_list_padding">20px</dimen>
<dimen name="module_search_empty_tip_textSize">28px</dimen>
<dimen name="module_search_category_width">144px</dimen>
<dimen name="module_search_category_height">126px</dimen>
<dimen name="module_search_poi_item_height">96px</dimen>
<dimen name="module_search_poi_item_icon_size">42px</dimen>
<dimen name="module_search_poi_item_position_height">38px</dimen>
<dimen name="module_search_poi_item_position_textSize">28px</dimen>
<dimen name="module_search_poi_item_desc_height">23px</dimen>
<dimen name="module_search_setting_container_padding">96px</dimen>
<dimen name="module_search_setting_container_paddingBottom">69px</dimen>
<dimen name="module_search_setting_item_width">192px</dimen>
<dimen name="module_search_setting_item_height">64px</dimen>
<dimen name="module_search_txt_setting_width">24px</dimen>
<dimen name="module_search_dp_838">446px</dimen>
<dimen name="module_search_category_panel_width">446px</dimen>
<dimen name="module_search_category_margin_bottom">83px</dimen>
<dimen name="module_search_dp_104">56px</dimen>
<dimen name="module_search_strategy_name_width" >100px</dimen>
<dimen name="module_search_start_navi_button_height">56px</dimen>
<dimen name="module_search_strategy_name_width">100px</dimen>
<dimen name="module_search_marker_number_textSize">18px</dimen>
<dimen name="module_search_choose_path_item_height">111px</dimen>
<dimen name="module_search_calculate_item_strategy_name_textSize">16px</dimen>

48
modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml
View File

@@ -2,7 +2,8 @@
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="module_search_fragment_padding" >32px</dimen>
<dimen name="module_search_title_textSize">20px</dimen>
<dimen name="module_search_fragment_padding">32px</dimen>
<dimen name="module_search_fragment_padding_top">32px</dimen>
<dimen name="module_search_et_width">640px</dimen>
<dimen name="module_search_et_hight">64px</dimen>
@@ -19,32 +20,31 @@
<dimen name="module_search_navi_home_height">64px</dimen>
<dimen name="module_search_navi_home_margin_left">16px</dimen>
<dimen name="txt_normal">18px</dimen>
<dimen name="module_search_dp_72">38px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_address_divider_height">38px</dimen>
<dimen name="module_search_navi_home_padding_left">40px</dimen>
<dimen name="module_search_dp_778">410px</dimen>
<dimen name="module_search_dp_1200">640px</dimen>
<dimen name="module_search_dp_32">16px</dimen>
<dimen name="module_search_dp_40">20px</dimen>
<dimen name="module_search_dp_60">30px</dimen>
<dimen name="module_search_dp_37">20px</dimen>
<dimen name="txt_large">28px</dimen>
<dimen name="module_search_dp_268">144px</dimen>
<dimen name="module_search_dp_236">126px</dimen>
<dimen name="module_search_dp_180">96px</dimen>
<dimen name="module_search_dp_80">42px</dimen>
<dimen name="module_search_dp_70">38px</dimen>
<dimen name="module_search_25sp">28px</dimen>
<dimen name="module_search_dp_42">23px</dimen>
<dimen name="module_search_dp_160">96px</dimen>
<dimen name="module_search_dp_150">69px</dimen>
<dimen name="module_search_180dp">192px</dimen>
<dimen name="module_search_dp_120">64px</dimen>
<dimen name="module_search_histories_list_height">410px</dimen>
<dimen name="module_search_histories_list_width">640px</dimen>
<dimen name="module_search_histories_list_marginTop">16px</dimen>
<dimen name="module_search_histories_list_marginPadding">20px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">30px</dimen>
<dimen name="module_search_list_padding">20px</dimen>
<dimen name="module_search_empty_tip_textSize">28px</dimen>
<dimen name="module_search_category_width">144px</dimen>
<dimen name="module_search_category_height">126px</dimen>
<dimen name="module_search_poi_item_height">96px</dimen>
<dimen name="module_search_poi_item_icon_size">42px</dimen>
<dimen name="module_search_poi_item_position_height">38px</dimen>
<dimen name="module_search_poi_item_position_textSize">28px</dimen>
<dimen name="module_search_poi_item_desc_height">23px</dimen>
<dimen name="module_search_setting_container_padding">96px</dimen>
<dimen name="module_search_setting_container_paddingBottom">69px</dimen>
<dimen name="module_search_setting_item_width">192px</dimen>
<dimen name="module_search_setting_item_height">64px</dimen>
<dimen name="module_search_txt_setting_width">24px</dimen>
<dimen name="module_search_dp_838">446px</dimen>
<dimen name="module_search_category_panel_width">446px</dimen>
<dimen name="module_search_category_margin_bottom">83px</dimen>
<dimen name="module_search_dp_104">56px</dimen>
<dimen name="module_search_strategy_name_width" >100px</dimen>
<dimen name="module_search_start_navi_button_height">56px</dimen>
<dimen name="module_search_strategy_name_width">100px</dimen>
<dimen name="module_search_marker_number_textSize">18px</dimen>
<dimen name="module_search_choose_path_item_height">111px</dimen>
<dimen name="module_search_calculate_item_strategy_name_textSize">16px</dimen>

59
modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml
View File

@@ -2,16 +2,16 @@
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="txt_normal">@dimen/sp_32</dimen>
<dimen name="txt_title">@dimen/sp_40</dimen>
<dimen name="txt_large">25sp</dimen>
<dimen name="module_search_fragment_padding">@dimen/dp_60</dimen>
<dimen name="module_search_fragment_padding_top">@dimen/dp_40</dimen>
<dimen name="module_search_title_textSize">40px</dimen>
<dimen name="module_search_empty_tip_textSize">50px</dimen>
<dimen name="module_search_fragment_padding">60px</dimen>
<dimen name="module_search_fragment_padding_top">40px</dimen>
<dimen name="module_search_et_width">600dp</dimen>
<dimen name="module_search_et_hight">@dimen/dp_120</dimen>
<dimen name="module_search_iv_back_hight">@dimen/dp_80</dimen>
<dimen name="module_search_iv_back_margin_left">@dimen/dp_24</dimen>
<dimen name="module_search_iv_back_margin_right">@dimen/dp_20</dimen>
<dimen name="module_search_et_margin_right">@dimen/dp_50</dimen>
<dimen name="module_search_et_hight">120px</dimen>
<dimen name="module_search_iv_back_hight">80px</dimen>
<dimen name="module_search_iv_back_margin_left">24px</dimen>
<dimen name="module_search_iv_back_margin_right">20px</dimen>
<dimen name="module_search_et_margin_right">50px</dimen>
<dimen name="module_search_et_text_size">40px</dimen>
<dimen name="module_search_btn_width">266px</dimen>
<dimen name="module_search_btn_right_margin">8px</dimen>
@@ -21,29 +21,28 @@
<dimen name="module_search_navi_home_height">120px</dimen>
<dimen name="module_search_navi_home_margin_left">32px</dimen>
<dimen name="module_search_navi_home_padding_left">75px</dimen>
<dimen name="module_search_dp_72">72px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_dp_778">778px</dimen>
<dimen name="module_search_dp_1200">1200px</dimen>
<dimen name="module_search_dp_32">32px</dimen>
<dimen name="module_search_dp_40">40px</dimen>
<dimen name="module_search_dp_60">60px</dimen>
<dimen name="module_search_dp_37">37px</dimen>
<dimen name="module_search_dp_268">268px</dimen>
<dimen name="module_search_dp_236">236px</dimen>
<dimen name="module_search_dp_180">180px</dimen>
<dimen name="module_search_dp_80">80px</dimen>
<dimen name="module_search_dp_70">70px</dimen>
<dimen name="module_search_25sp">25sp</dimen>
<dimen name="module_search_dp_42">42px</dimen>
<dimen name="module_search_dp_160">160px</dimen>
<dimen name="module_search_dp_150">150px</dimen>
<dimen name="module_search_180dp">180dp</dimen>
<dimen name="module_search_dp_120">120px</dimen>
<dimen name="module_search_address_divider_height">72px</dimen>
<dimen name="module_search_histories_list_height">778px</dimen>
<dimen name="module_search_histories_list_width">1200px</dimen>
<dimen name="module_search_histories_list_marginTop">32px</dimen>
<dimen name="module_search_histories_list_marginPadding">40px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">60px</dimen>
<dimen name="module_search_list_padding">37px</dimen>
<dimen name="module_search_category_width">268px</dimen>
<dimen name="module_search_category_height">236px</dimen>
<dimen name="module_search_poi_item_height">180px</dimen>
<dimen name="module_search_poi_item_icon_size">80px</dimen>
<dimen name="module_search_poi_item_position_height">70px</dimen>
<dimen name="module_search_poi_item_position_textSize">25px</dimen>
<dimen name="module_search_poi_item_desc_height">42px</dimen>
<dimen name="module_search_setting_container_padding">160px</dimen>
<dimen name="module_search_setting_container_paddingBottom">150px</dimen>
<dimen name="module_search_setting_item_width">180dp</dimen>
<dimen name="module_search_setting_item_height">120px</dimen>
<dimen name="module_search_txt_setting_width">45px</dimen>
<dimen name="module_search_dp_838">838px</dimen>
<dimen name="module_search_category_panel_width">838px</dimen>
<dimen name="module_search_category_margin_bottom">184px</dimen>
<dimen name="module_search_dp_104">104px</dimen>
<dimen name="module_search_start_navi_button_height">104px</dimen>
<dimen name="module_search_strategy_name_width" >154px</dimen>
<dimen name="module_search_marker_number_textSize">32px</dimen>
<dimen name="module_search_choose_path_item_height">212px</dimen>

63
modules/mogo-module-search/src/main/res/values/dimens.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="txt_normal">@dimen/sp_32</dimen>
<dimen name="fragment_left_margin">@dimen/dp_60</dimen>
<dimen name="txt_title">@dimen/sp_40</dimen>
<dimen name="txt_large">25sp</dimen>
<dimen name="module_search_fragment_padding">@dimen/dp_60</dimen>
<dimen name="module_search_fragment_padding_top">@dimen/dp_40</dimen>
<dimen name="module_search_title_textSize">40px</dimen>
<dimen name="module_search_empty_tip_textSize">50px</dimen>
<dimen name="module_search_fragment_padding">60px</dimen>
<dimen name="module_search_fragment_padding_top">40px</dimen>
<dimen name="module_search_et_width">600dp</dimen>
<dimen name="module_search_et_hight">@dimen/dp_120</dimen>
<dimen name="module_search_iv_back_hight">@dimen/dp_80</dimen>
<dimen name="module_search_iv_back_margin_left">@dimen/dp_24</dimen>
<dimen name="module_search_iv_back_margin_right">@dimen/dp_20</dimen>
<dimen name="module_search_et_margin_right">@dimen/dp_50</dimen>
<dimen name="module_search_et_hight">120px</dimen>
<dimen name="module_search_iv_back_hight">80px</dimen>
<dimen name="module_search_iv_back_margin_left">24px</dimen>
<dimen name="module_search_iv_back_margin_right">20px</dimen>
<dimen name="module_search_et_margin_right">50px</dimen>
<dimen name="module_search_et_text_size">40px</dimen>
<dimen name="module_search_btn_width">266px</dimen>
<dimen name="module_search_btn_right_margin">8px</dimen>
@@ -21,29 +21,28 @@
<dimen name="module_search_navi_home_height">120px</dimen>
<dimen name="module_search_navi_home_margin_left">32px</dimen>
<dimen name="module_search_navi_home_padding_left">75px</dimen>
<dimen name="module_search_dp_72">72px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_dp_778">778px</dimen>
<dimen name="module_search_dp_1200">1200px</dimen>
<dimen name="module_search_dp_32">32px</dimen>
<dimen name="module_search_dp_40">40px</dimen>
<dimen name="module_search_dp_60">60px</dimen>
<dimen name="module_search_dp_37">37px</dimen>
<dimen name="module_search_dp_268">268px</dimen>
<dimen name="module_search_dp_236">236px</dimen>
<dimen name="module_search_dp_180">180px</dimen>
<dimen name="module_search_dp_80">80px</dimen>
<dimen name="module_search_dp_70">70px</dimen>
<dimen name="module_search_25sp">25sp</dimen>
<dimen name="module_search_dp_42">42px</dimen>
<dimen name="module_search_dp_160">160px</dimen>
<dimen name="module_search_dp_150">150px</dimen>
<dimen name="module_search_180dp">180dp</dimen>
<dimen name="module_search_dp_120">120px</dimen>
<dimen name="module_search_address_divider_height">72px</dimen>
<dimen name="module_search_histories_list_height">778px</dimen>
<dimen name="module_search_histories_list_width">1200px</dimen>
<dimen name="module_search_histories_list_marginTop">32px</dimen>
<dimen name="module_search_histories_list_marginPadding">40px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">60px</dimen>
<dimen name="module_search_list_padding">37px</dimen>
<dimen name="module_search_category_width">268px</dimen>
<dimen name="module_search_category_height">236px</dimen>
<dimen name="module_search_poi_item_height">180px</dimen>
<dimen name="module_search_poi_item_icon_size">80px</dimen>
<dimen name="module_search_poi_item_position_height">70px</dimen>
<dimen name="module_search_poi_item_position_textSize">25px</dimen>
<dimen name="module_search_poi_item_desc_height">42px</dimen>
<dimen name="module_search_setting_container_padding">160px</dimen>
<dimen name="module_search_setting_container_paddingBottom">150px</dimen>
<dimen name="module_search_setting_item_width">180dp</dimen>
<dimen name="module_search_setting_item_height">120px</dimen>
<dimen name="module_search_txt_setting_width">45px</dimen>
<dimen name="module_search_dp_838">838px</dimen>
<dimen name="module_search_category_margin_bottom">142px</dimen>
<dimen name="module_search_dp_104">104px</dimen>
<dimen name="module_search_category_panel_width">838px</dimen>
<dimen name="module_search_category_margin_bottom">184px</dimen>
<dimen name="module_search_start_navi_button_height">104px</dimen>
<dimen name="module_search_strategy_name_width" >154px</dimen>
<dimen name="module_search_marker_number_textSize">32px</dimen>
<dimen name="module_search_choose_path_item_height">212px</dimen>

10
modules/mogo-module-search/src/main/res/values/styles.xml
View File

@@ -17,29 +17,29 @@
</style>
<style name="txt_navi_style">
<item name="android:layout_width">@dimen/module_search_dp_268</item>
<item name="android:layout_width">@dimen/module_search_category_width</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:textSize">@dimen/txt_normal</item>
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/shape_round_gray</item>
<item name="android:layout_height">@dimen/module_search_dp_236</item>
<item name="android:layout_height">@dimen/module_search_category_height</item>
<item name="android:paddingTop">@dimen/dp_44</item>
</style>
<style name="rb_setting">
<item name="android:layout_width">@dimen/module_search_180dp</item>
<item name="android:layout_width">@dimen/module_search_setting_item_width</item>
<item name="android:button">@color/translate</item>
<item name="android:gravity">center</item>
<item name="android:textSize">@dimen/sp_40</item>
<item name="android:textColor">@color/selector_white_gray</item>
<item name="android:layout_height">@dimen/module_search_dp_120</item>
<item name="android:layout_height">@dimen/module_search_setting_item_height</item>
<item name="android:background">@drawable/selector_setting_bg</item>
</style>
<style name="txt_btn">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/txt_title</item>
<item name="android:textSize">@dimen/module_search_title_textSize</item>
<item name="android:gravity">center</item>
<item name="android:background">@drawable/shape_round_blue_grident</item>
</style>

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -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();
}

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

3
modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
View File

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

9
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java
View File

@@ -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<V2XSeekHelpAdapter.
if (infoBean != null) {
long time = entity.getCreateTime();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA);
String eventDistance = String.format("距离%d m", entity.getDistance());
String eventDistance = String.format("%d", entity.getDistance());
String eventTime = String.format("%s发布求助信息", sdf.format(new Date(time)));
holder.initView(infoBean.getHeadImgUrl(), infoBean.getDisplayName(), eventDistance, eventTime);
}
@@ -191,6 +192,12 @@ public class V2XSeekHelpAdapter extends RecyclerView.Adapter<V2XSeekHelpAdapter.
}
tvName.setText(name);
tvDistance.setText(distance);
SpanUtils.with(tvDistance)
.append("" + distance)
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30))
.create();
tvEventTime.setText(eventTime);
}
}

20
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XBaseViewHolder.java
View File

@@ -1,9 +1,6 @@
package com.mogo.module.v2x.adapter.holder;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
@@ -15,14 +12,13 @@ import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XConst;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.RoadConditionUtils;
import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.utils.TrackUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.utils.TipToast;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -84,7 +80,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_CHAT);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("用户信息异常");
TipToast.tip("用户信息异常");
}
delayedCloseWindow();
}
@@ -105,7 +101,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_REPORT_ERROR);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -126,7 +122,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_REPORT_RIGHT);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -150,7 +146,7 @@ public abstract class V2XBaseViewHolder
V2XConst.V2X_ROAD_NAVI);
} catch (Exception e) {
e.printStackTrace();
ToastUtils.showShort("路况信息异常");
TipToast.tip("路况信息异常");
}
delayedCloseWindow();
}
@@ -161,11 +157,7 @@ public abstract class V2XBaseViewHolder
* @param msg
*/
public void showTip(String msg) {
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText(msg);
ToastUtils.showCustomShort(toastView);
TipToast.tip(msg);
}
@Override

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventDetailVH.java
View File

@@ -25,6 +25,7 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventWindow;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.SpanUtils;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -318,6 +319,7 @@ public class V2XRoadEventDetailVH extends V2XBaseViewHolder {
// 重新设置用户信息
mNoveltyInfo.setUserInfo(mUserInfo);
// 只有自研车机才会 有车聊聊通话
if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
// 判断是否可以打电话
ChartingUtil.isCanCall(b -> {

37
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java
View File

@@ -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<V2XPushMessageEntity> 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<V2XPushMessageEntity> 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 =

16
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401003.java
View File

@@ -1,20 +1,14 @@
package com.mogo.module.v2x.listener;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.common.entity.V2XMessageEntity;
import com.mogo.module.common.entity.V2XPushMessageEntity;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.scenario.impl.V2XScenarioManager;
import com.mogo.module.v2x.utils.ADASUtils;
import com.mogo.module.v2x.utils.MarkerUtils;
import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
@@ -113,11 +107,7 @@ public class V2XMessageListener_401003 implements IMogoOnMessageListener<V2XPush
}
private void showTip(String msg) {
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText(msg);
ToastUtils.showCustomShort(toastView);
TipToast.tip(msg);
}
}

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XPolylineManager.java
View File

@@ -46,6 +46,7 @@ public class MoGoV2XPolylineManager implements IMoGoV2XPolylineManager {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
colors.add(0xFFFA8C34);
colors.add(0xFFBD6D36);
colors.add(0xFFFA8C34);

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java
View File

@@ -4,9 +4,9 @@ import android.content.Context;
import android.graphics.Bitmap;
import com.mogo.module.common.entity.MarkerShowEntity;
import com.mogo.module.v2x.R;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.module.common.entity.V2XRoadEventEntity;
import com.mogo.module.v2x.R;
import java.util.ArrayList;
@@ -42,6 +42,7 @@ public class V2XMarkerAdapter {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
bitmap = getV2XRoadEventMarkerView(
context,
alarmInfo,
@@ -66,6 +67,7 @@ public class V2XMarkerAdapter {
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST:
case V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_WARNING:
case V2XPoiTypeEnum.FOURS_BLOCK_UP:
case V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING + "":
bitmapArrayList = getV2XRoadEventOrangeMarkerView(context, alarmInfo);
break;
default:

7
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java
View File

@@ -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());
}
@@ -97,9 +98,9 @@ public class V2XFatigueDrivingWindow extends RelativeLayout
}
SpanUtils.with(mTvAddressDistance)
.append("" + (int) entity.getDistance())
.setFontSize(82)
.setFontSize((int) getResources().getDimension(R.dimen.dp_80))
.append("M")
.setFontSize(30)
.setFontSize((int) getResources().getDimension(R.dimen.dp_30))
.create();
countDownV2XEvent(entity);
}
@@ -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);
}

28
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java
View File

@@ -94,6 +94,20 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
if (V2XServiceManager.getMoGoStatusManager().isMainPageLaunched()) {
showWindow();
}
// 地图主动推送/触发消息 埋点
String poiType = mV2XMessageEntity.getContent().getPoiType();
String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
Map<String, Object> properties = new HashMap<>();
properties.put("dbid", infoId);
properties.put("type", poiType);
properties.put("lng", lon);
properties.put("lat", lat);
properties.put("style", style);
V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
}
}
@@ -128,19 +142,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario<V2XRoadEventEntity> imp
V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, true);
}
// 地图主动推送/触发消息 埋点
String poiType = mV2XMessageEntity.getContent().getPoiType();
String lat = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLat());
String lon = String.valueOf(mV2XMessageEntity.getContent().getLocation().getLon());
String infoId = mV2XMessageEntity.getContent().getNoveltyInfo().getInfoId();
String style = V2XServiceManager.getMoGoStatusManager().isMainPageOnResume() ? "1" : "2";
Map<String, Object> properties = new HashMap<>();
properties.put("dbid", infoId);
properties.put("type", poiType);
properties.put("lng", lon);
properties.put("lat", lat);
properties.put("style", style);
V2XServiceManager.getMogoAnalytics().track(V2XConst.V2X_ROAD_SHOW, properties);
}
@Override

13
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/RoadConditionUtils.java
View File

@@ -1,15 +1,10 @@
package com.mogo.module.v2x.utils;
import android.content.Intent;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.mogo.commons.voice.AIAssist;
import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.common.entity.V2XPoiTypeEnum;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -92,10 +87,6 @@ public class RoadConditionUtils {
*/
private static void showTip() {
AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("已反馈", null);
ToastUtils.setGravity(Gravity.CENTER, 0, 0);
View toastView = LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view, null);
TextView msgView = toastView.findViewById(R.id.tvFeedbackContent);
msgView.setText("已反馈");
ToastUtils.showCustomShort(toastView);
TipToast.tip("已反馈");
}
}

8
modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_animation.xml
View File

@@ -4,13 +4,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
android:valueTo="-2"
android:valueTo="-5"
android:valueType="floatType" />
<objectAnimator
android:duration="100"
android:propertyName="translationX"
android:valueFrom="-2"
android:valueFrom="-5"
android:valueTo="0"
android:valueType="floatType" />
@@ -18,13 +18,13 @@
android:duration="100"
android:propertyName="translationX"
android:valueFrom="0"
android:valueTo="2"
android:valueTo="5"
android:valueType="floatType" />
<objectAnimator
android:duration="100"
android:propertyName="translationX"
android:valueFrom="2"
android:valueFrom="5"
android:valueTo="0"
android:valueType="floatType" />

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_illegal_parking.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

5
modules/mogo-module-v2x/src/main/res/drawable/v2x_fault_help_bg.xml
View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="135"
android:startColor="#ff3a435e"
android:endColor="#ff525b7b"
android:startColor="#3F4057"
android:endColor="#3F4057"
android:type="linear"
android:useLevel="true" />
</shape>

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

@@ -8,7 +8,7 @@
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.module.v2x.view.RoundLayout
android:id="@+id/rlRoadEventImg"
@@ -18,7 +18,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivEventImg"

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

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="#3D4053"
android:gravity="center"
app:roundLayoutRadius="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_40"
tools:layout_height="@dimen/dp_382">
<ImageView

88
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
View File

@@ -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">
<LinearLayout
android:id="@+id/llFaultHelpTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/v2x_gas_station_title_bg"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"
app:layout_constraintVertical_chainStyle="packed">
<ImageView
android:id="@+id/ivImgTextIcon"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/v2x_icon_fault_help_warn" />
<TextView
android:id="@+id/tvImgTextContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_7"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_26"
android:layout_marginBottom="@dimen/dp_6"
android:text="求助信息"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24" />
</LinearLayout>
<ImageView
android:id="@+id/ivNavIcon"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_29"
android:src="@drawable/v2x_icon_help_navi"
app:layout_constraintStart_toStartOf="@id/llFaultHelpTitle"
app:layout_constraintTop_toBottomOf="@id/llFaultHelpTitle" />
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_40">
<TextView
android:id="@+id/tvFaultHelpDistance"
android:id="@+id/tvImgTextContent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_46"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_7"
android:layout_marginBottom="@dimen/dp_6"
android:background="@drawable/bg_v2x_event_type_orange"
android:gravity="center_vertical"
android:paddingStart="@dimen/dp_13"
android:paddingTop="@dimen/dp_5"
android:paddingEnd="@dimen/dp_13"
android:paddingBottom="@dimen/dp_5"
android:text="求助信息"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_24"
app:layout_constraintBottom_toBottomOf="@+id/ivNavIcon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivNavIcon"
tools:text="距离 300m" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivFaultHelpHead"
android:layout_width="@dimen/dp_128"
android:layout_height="@dimen/dp_128"
android:layout_width="@dimen/dp_108"
android:layout_height="@dimen/dp_108"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_31"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
app:layout_constraintStart_toEndOf="@+id/llFaultHelpTitle"
app:layout_constraintStart_toEndOf="@+id/tvImgTextContent"
app:layout_constraintTop_toTopOf="parent"
app:miv_borderColor="#4cffffff"
app:miv_failureHolder="@drawable/icon_default_user_head"
@@ -109,11 +77,25 @@
app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName"
tools:text="15:30发布求助信息" />
<TextView
android:id="@+id/tvFaultHelpDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="#FFF"
android:textSize="@dimen/dp_80"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
tools:text="300M" />
<ImageView
android:id="@+id/ivFaultHelpEventCall"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_40"
android:src="@drawable/selector_talk_btn"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -13,7 +13,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30" />
app:roundLayoutRadius="@dimen/dp_40" />
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivReportHead"

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

@@ -12,7 +12,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.service.imageloader.MogoImageView
android:id="@+id/ivImg"

1
modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml
View File

@@ -10,6 +10,5 @@
android:id="@+id/ivIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_heart_like" />
</LinearLayout>

1
modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike.xml
View File

@@ -10,7 +10,6 @@
android:id="@+id/ivIllegalParkingUnLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/icon_heart_unlike" />
</LinearLayout>

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

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_event_window_height"
android:background="@color/live_video_background_color"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.tencent.rtmp.ui.TXCloudVideoView
android:id="@+id/txcVideoView"

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

@@ -11,7 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/dp_30"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<com.mogo.module.v2x.view.TextureVideoView
android:id="@+id/vvCarAnimation"

10
modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
View File

@@ -7,12 +7,13 @@
android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"
android:background="@color/live_video_background_color"
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<ImageView
android:id="@+id/ivIconP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/icon_parking_p"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -22,6 +23,8 @@
android:id="@+id/ivIconPIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:src="@drawable/icon_parting_icon"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
@@ -32,6 +35,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_20"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34"
android:textStyle="bold"
@@ -45,10 +49,10 @@
android:id="@+id/tvAddressDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="#FFF"
android:textSize="@dimen/dp_86"
android:textSize="@dimen/dp_80"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/ivToNav"
app:layout_constraintEnd_toStartOf="@+id/ivToNav"

10
modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
View File

@@ -8,7 +8,7 @@
android:background="@color/live_video_background_color"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_40"
app:roundLayoutRadius="@dimen/dp_30">
app:roundLayoutRadius="@dimen/dp_40">
<ImageView
android:id="@+id/ivIconP"
@@ -23,7 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_23"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
android:paddingLeft="@dimen/dp_10"
@@ -35,7 +34,7 @@
android:textSize="@dimen/dp_24"
app:layout_constraintBottom_toTopOf="@+id/tvAddress"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="@+id/ivIconP" />
<TextView
android:id="@+id/tvAddress"
@@ -44,7 +43,7 @@
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_34"
app:layout_constraintBottom_toTopOf="@+id/tvAddressDistance"
@@ -63,7 +62,6 @@
android:gravity="center_vertical"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_30"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/tvAddress"
app:layout_constraintStart_toStartOf="@+id/ivIconPIcon"
app:layout_constraintTop_toBottomOf="@+id/tvAddress"
@@ -73,7 +71,7 @@
android:id="@+id/llIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
app:layout_constraintTop_toTopOf="parent" />

6
modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
View File

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

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

@@ -8,11 +8,11 @@
<dimen name="module_v2x_event_window_height_ground">450px</dimen>
<dimen name="module_v2x_push_img_height">390px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">210px</dimen>
<dimen name="module_v2x_fatigue_driving_window_height_ground">200px</dimen>
<dimen name="module_v2x_event_icon_size">160px</dimen>
<dimen name="module_v2x_event_button_size">90px</dimen>
<dimen name="module_v2x_event_button_size">110px</dimen>
<dimen name="module_v2x_event_button_size_detail">100px</dimen>
<dimen name="module_v2x_event_image_height">270px</dimen>

2
modules/mogo-module-v2x/src/main/res/values/color.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="live_video_progress_bar_loading_color">#256BFF</color>
<color name="live_video_background_color">#FF3F4057</color>
<color name="live_video_background_color">#3F4057</color>
</resources>

9
services/mogo-service-api/src/main/java/com/mogo/service/auth/IMogoAuthManager.java
View File

@@ -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();
}