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

Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

Browse Source 
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml
#	skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
This commit is contained in:
董宏宇
2020-12-01 14:48:25 +08:00
parent 9d2b8d7c8b e7d84bdc5d
commit a5e7b71d95
17 changed files with 89 additions and 57 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.7
# 车聊聊接口
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();
}
}

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

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

@@ -65,6 +65,13 @@ 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 );
newIntent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES );
context.sendBroadcast( newIntent );
Logger.d( TAG, "发送广播：com.freedom.ser.ACTION" );
}
boolean accOn = state == ACC_ON;
if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) {
return;

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

16
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java
View File

@@ -198,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
spannableString.setSpan(new StyleSpan(Typeface.BOLD), 7,
originStr.length() - 5, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mTotalTv.setText(spannableString);
ttsForSurroundingFirstToday(exploreWayList.size());
} else {
mTopLayout.setVisibility(View.GONE);
mRecyclerView.setVisibility(View.GONE);
@@ -207,19 +209,19 @@ public class V2XSurroundingFragment extends MvpFragment<SurroundingEventView, Su
ttsForVoiceCheckout();
fromVoice = false;
}
ttsForSurroundingFirstToday();
}
/*
/**
* 手动点击周边事件 TTS播报
* */
private void ttsForSurroundingFirstToday() {
*/
private void ttsForSurroundingFirstToday(int eventCount) {
boolean hasBroadTts = V2XUtils.isFirstTodayWithKey("TTS_FOR_SURROUNDING_SELECTED");
if (hasBroadTts == false) {
if (poiInfosList.size() > 0) {
if (!hasBroadTts) {
if (eventCount > 0) {
AIAssist.getInstance(V2XUtils.getApp()).
speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null);
speakTTSVoice("发现周边" + eventCount + "条交通信息", null);
} else {
Logger.e(TAG,"周边没有发现交通信息");
}
}
}

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

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

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"

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-callchat-res/drawable/module_carchatting_launcher_calling_bg_light.xml
View File

@@ -3,6 +3,6 @@
<corners android:radius="@dimen/dp_30" />
<gradient
android:angle="180"
android:endColor="#F5F5F5"
android:endColor="#1AF5F5F5"
android:startColor="#F5F5F5" />
</shape>

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

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>

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>

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB