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

Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8

Browse Source
This commit is contained in:
wangcongtao
2020-12-01 10:04:27 +08:00
parent 2b84ca6b36 5abf15ccb0
commit 4ca8e4e053
9 changed files with 67 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
######## 外部依赖引用
# 车聊聊
CARCHATTING_VERSION=1.9.0
CARCHATTING_VERSION=1.9.3
# 车聊聊接口
CARCHATTINGPROVIDER_VERSION=1.1.7
# loglib

26
modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java
View File

@@ -7,7 +7,9 @@ import android.view.WindowManager;
import androidx.annotation.NonNull;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.R;
import com.mogo.utils.logger.Logger;
/**
* 浮在各种wm上面的dialog基类，调用了window.setType
@@ -15,13 +17,16 @@ import com.mogo.module.common.R;
* @author tongchenfei
*/
public class BaseFloatDialog extends Dialog {
private static final String TAG = "BaseFloatDialog";
public BaseFloatDialog(@NonNull Context context) {
this(context, R.style.BaseFloatDialogStyle);
}
public BaseFloatDialog(@NonNull Context context, int themeResId) {
super(context, themeResId);
if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
addFlag();
}
}
@@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog {
| WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
| WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE);
}
@Override
public void show() {
Logger.d(TAG, "onShow====");
if (DebugConfig.isNeedHideAdasWhenShare()) {
MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS();
}
super.show();
}
@Override
public void dismiss() {
Logger.d(TAG, "onDismiss====");
if (DebugConfig.isNeedHideAdasWhenShare()
&& MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) {
MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS();
}
super.dismiss();
}
}

12
modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt
View File

@@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) {
}
override fun show() {
Logger.d(TAG, "onShow====")
if (DebugConfig.isNeedHideAdasWhenShare()) {
mApis.adasControllerApi.closeADAS()
}
gridBtnManager.showShareButton()
super.show()
}
override fun dismiss() {
Logger.d(TAG, "onDismiss=====")
if (DebugConfig.isNeedHideAdasWhenShare() && mApis.statusManagerApi.isMainPageOnResume) {
mApis.adasControllerApi.showADAS()
}
super.dismiss()
}
companion object {
private const val TAG = "GridFixableShareDialog"
}

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

@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
/**
@@ -167,6 +168,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
v2XMessageEntity.setContent(v2XRoadEventEntity);
v2XMessageEntity.setShowState(true);
V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
//如果poiType是道路拥堵，则调用接口查询拥堵状态
String poiType = v2XRoadEventEntity.getPoiType();
if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
}
}
}

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

@@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout
// 道路事件行驶到了50米附近，弹出事件纠错框给用户
//Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
//如果poiType是道路拥堵，则调用接口查询拥堵状态
String poiType = v2XRoadEventEntity.getPoiType();
if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
}
// 进行类型分发
switch (v2XRoadEventEntity.getPoiType()) {
case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查

53
modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
View File

@@ -9,51 +9,50 @@
android:layout_marginBottom="@dimen/dp_14"
android:background="@drawable/bg_v2x_event_list_item">
<TextView
android:id="@+id/road_case_useless_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_38"
android:paddingRight="@dimen/dp_28"
android:text="100"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/share_item_text_size" />
<ImageView
android:id="@+id/road_case_useless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_toLeftOf="@id/road_case_useless_num"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/useless_padding_right"
android:clickable="false"
android:gravity="center"
android:paddingRight="5px"
android:src="@drawable/v2x_share_item_unlike" />
<TextView
android:id="@+id/road_case_useless_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_alignLeft="@+id/road_case_useless"
android:paddingLeft="@dimen/num_padding_left"
android:text="10000"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/share_item_text_size" />
<ImageView
android:id="@+id/road_case_useful"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_toLeftOf="@id/road_case_useless"
android:clickable="false"
android:paddingRight="@dimen/useful_image_padding_right"
android:src="@drawable/v2x_share_item_like" />
<TextView
android:id="@+id/road_case_useful_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_toLeftOf="@id/road_case_useless"
android:layout_alignLeft="@+id/road_case_useful"
android:gravity="left"
android:paddingRight="@dimen/dp_28"
android:text="100"
android:paddingLeft="@dimen/num_padding_left"
android:text="10009"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/share_item_text_size" />
<ImageView
android:id="@+id/road_case_uselful"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/road_case_style"
android:layout_toLeftOf="@id/road_case_useful_num"
android:clickable="false"
android:paddingRight="5px"
android:src="@drawable/v2x_share_item_like" />
<TextView
android:id="@+id/road_case_address"
android:layout_width="wrap_content"

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

@@ -72,6 +72,10 @@
<dimen name="share_item_text_size">26px</dimen>
<dimen name="share_item_padding">25px</dimen>
<dimen name="module_v2x_widow_top_gaps">2px</dimen>
<dimen name="useless_padding_right">82px</dimen>
<dimen name="num_padding_left">55px</dimen>
<dimen name="useful_image_padding_right">95px</dimen>
<!--适配 V2X 弹窗 UI-->
<dimen name="module_v2x_event_type_title_text_size">24px</dimen>

3
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -66,6 +66,9 @@
<dimen name="share_btn_middle_padding">29px</dimen>
<dimen name="v2x_panel_btn_translationY">-8px</dimen>
<dimen name="module_v2x_panel_tab_height">84px</dimen>
<dimen name="useless_padding_right">67px</dimen>
<dimen name="num_padding_left">45px</dimen>
<dimen name="useful_image_padding_right">52px</dimen>
<!--适配 V2X 弹窗 UI-->
<dimen name="module_v2x_event_type_title_text_size">13px</dimen>

2
skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_list_item_light.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#DDDDDD"/>
<solid android:color="#E5E5E5"/>
<corners android:radius="@dimen/dp_30"/>
</shape>