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

Merge branch 'qa_1.1.8' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.8

Browse Source
This commit is contained in:
unknown
2020-12-01 11:10:08 +08:00
parent bb85b86bdd a4ee99ffef
commit 13497c819f
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
View File

@@ -400,7 +400,7 @@ public class MogoServices implements IMogoMapListener,
*/
private void closeAllPanel() {
if ( mCallProviderResponse != null ) {
if ( mCallProviderResponse == null ) {
mCallProviderResponse = new ICallChatResponse() {
@Override
public void hideUserWindowError(@NotNull String errorMsg) {
@@ -411,9 +411,11 @@ public class MogoServices implements IMogoMapListener,
MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel();
carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
if ( carsChattingProvider == null ) {
carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
}
if ( carsChattingProvider != null ) {
carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse);
carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse);
}
}

5
modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java
View File

@@ -65,6 +65,11 @@ class AccStatusIntentHandler implements IntentHandler {
if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) {
return;
}
if ( state == ACC_ON || state == ACC_OFF_DELAY ) {
Intent newIntent = new Intent( "com.freedom.ser.ACTION" );
newIntent.putExtra( "acc", true );
context.sendBroadcast( newIntent );
}
boolean accOn = state == ACC_ON;
if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) {
return;

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

@@ -92,7 +92,7 @@
android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
android:gravity="center_horizontal"
android:text="周边5公里，暂无交通事件"
android:textColor="@color/v2x_FFF_333"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<TextView
@@ -104,7 +104,7 @@
android:layout_marginTop="1px"
android:gravity="center_horizontal"
android:text="你可以试着分享一个事件给其他车主"
android:textColor="@color/v2x_FFF_333"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<RelativeLayout

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

@@ -23,7 +23,7 @@
android:gravity="center"
android:text="周边5公里，暂无交通事件\n
你可以试着分享一个交通事件给其他车主"
android:textColor="@color/v2x_FFF_333"
android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/dp_36"
app:layout_constraintBottom_toTopOf="@+id/btnShear"
app:layout_constraintEnd_toEndOf="parent"

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_event_panel_more_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 289 B

5
skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml
View File

@@ -2,6 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/module_v2x_surrounding_refresh_bt_radius" />
<solid android:color="#E6E6E6" />
<gradient
android:angle="135"
android:endColor="#dddddd"
android:startColor="#e6e6e6" />
</shape>