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

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>