diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index d96ea854c6..6d92d114de 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -67,16 +67,16 @@ public abstract class BaseNaviInfoView { protected String getFormatSurplusTime( int seconds ) { if ( seconds > 60 * 60 ) { - mFormatSurplusTimeUnit = "h"; + mFormatSurplusTimeUnit = "小时"; return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) ); } if ( seconds > 60 ) { - mFormatSurplusTimeUnit = "min"; + mFormatSurplusTimeUnit = "分钟"; return String.format( "%.1f", ( ( float ) seconds ) / 60 ); } - mFormatSurplusTimeUnit = "s"; + mFormatSurplusTimeUnit = "秒"; return String.format( "%d", seconds ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 50497023b5..b93f3bedce 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -47,6 +47,7 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher; import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; +import com.mogo.module.service.network.bean.TtsConfigEntity; import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse; @@ -332,10 +333,8 @@ public class MogoServices implements IMogoMapListener, } mIsMainPageFirstResume = false; LauncherCardRefresher.getInstance(mContext).stop(); - - mTtsModle.playTts(); -// playAppTts(); + playAppTts(); } else { unregisterInternalUnWakeupWords(); @@ -390,7 +389,7 @@ public class MogoServices implements IMogoMapListener, if (DebugConfig.isLauncher()) { return; } - + mTtsModle.playTts(); } /** diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java index cfc4bec45b..de632983fd 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/onlinecar/panel/OnlineCarPanelAdapter.java @@ -22,7 +22,6 @@ import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.module.service.Utils; import com.mogo.utils.ResourcesHelper; -import com.mogo.utils.WindowUtils; import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.CallChattingProviderConstant; @@ -67,7 +66,6 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter { - //TODO 拨打电话 Map params = new HashMap<>(); MarkerUserInfo userInfo = mDatums.get(position).getUserInfo(); params.put(CallChattingProviderConstant.CCPROVIDER_SN, userInfo.getSn()); @@ -123,11 +121,6 @@ class OnlineCarPanelAdapter extends RecyclerView.Adapter { -// //TODO 拨打电话 -// -// -// }); } private String getDistanceStr(MarkerLocation location, double lon, double lat) { diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal.png new file mode 100644 index 0000000000..c597a3f1d0 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png new file mode 100644 index 0000000000..399904b858 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_nomal_light.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed.png new file mode 100644 index 0000000000..bb366564b9 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png new file mode 100644 index 0000000000..c84f7d2c5d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_call_pressed_light.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal.png new file mode 100644 index 0000000000..090f492954 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png new file mode 100644 index 0000000000..7667efbfbd Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_nomal_light.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed.png new file mode 100644 index 0000000000..4394952533 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png new file mode 100644 index 0000000000..ca30ef96f6 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_pannel_detials_pressed_light.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call.xml new file mode 100644 index 0000000000..996ca09227 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml new file mode 100644 index 0000000000..2c36033d92 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials.xml new file mode 100644 index 0000000000..449db76333 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml new file mode 100644 index 0000000000..70f871f8a9 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_pannel_detials_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index 54c81aa3d8..3978ff4297 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -57,12 +57,11 @@ diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml index 730973e0ef..8fb8c16e93 100644 --- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml @@ -22,6 +22,13 @@ 64px 6.5px 10px + 54px + 20px + 22px + + 12px + 16px + 2px 2px diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index 5576dbf74f..a5a63b9493 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -22,6 +22,12 @@ 64px 6.5px 10px + 54px + 20px + 22px + 12px + 16px + 2px 2px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml index 6fe1da3ee0..9f26351058 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -23,6 +23,11 @@ 120px 20px + + 98px + 46px + 40px + 20px 20px 20px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index 8e62dc5efc..1881b587f6 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -29,6 +29,11 @@ 50px 28px + + 98px + 46px + 40px + 36px 50px 36px diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index fe41b7df41..df03037594 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -23,6 +23,11 @@ 120px 20px + 98px + 46px + 40px + + 2px 2px 0px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 73b7bea220..a9d2cfd849 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -209,11 +209,13 @@ public class V2XSurroundingFragment extends MvpFragment + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse_light.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse_light.xml new file mode 100644 index 0000000000..e2ee5fc07c --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_colse_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index b2df95c2a1..b3ecc8754a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -28,23 +28,32 @@ android:layout_height="match_parent" android:layout_alignParentTop="true" android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" + android:gravity="center_vertical" android:text="周围5公里,共15条交通信息" android:textColor="@color/v2x_white" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> - + android:gravity="center"> + + + @@ -146,9 +155,9 @@ + android:layout_height="match_parent" + android:visibility="gone"> + android:layout_height="25px" + android:layout_alignParentTop="true" + android:layout_centerVertical="true" + android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" + android:src="@drawable/icon_report_err" /> @@ -180,9 +189,9 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index a5723f4c4c..59446aa2c7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_79" android:layout_height="@dimen/dp_79" android:layout_marginRight="@dimen/dp_50" - android:background="@drawable/v2x_panel_close" + android:background="@drawable/v2x_selector_colse" app:layout_constraintBottom_toBottomOf="@+id/rgTabSelect" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index d097e0e44c..504372c37b 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -43,7 +43,7 @@ 8px 2px 30px - 34px + 22px 12px 16px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index eafb0c59f3..15fbda4e62 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -44,7 +44,7 @@ 8px 2px 30px - 34px + 22px 12px 16px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index e82f40ef3b..ad5a85c3fe 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -41,13 +41,13 @@ 16px 5px 80px - 33px + 22px 20px 30px 42px - 32px + 30px 36px 30px 50px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 5b9f3c3410..eeaac5851d 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -23,8 +23,8 @@ 200px 100px 90px - 162px - 64px + 168px + 68px 80px 26px 270px @@ -41,13 +41,13 @@ 16px 5px 80px - 33px + 22px 20px 30px 42px - 32px + 30px 36px 30px 50px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 4b859dcf2e..149ad99723 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -24,8 +24,8 @@ 200px 100px 50px - 90px - 36px + 168px + 68px 40px 15px 150px @@ -41,14 +41,15 @@ 8px 2px 30px - 50px + 22px 24px - 18px + 30px 20px 16px 28px + 82px 16px 117px