diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/gradle.properties b/gradle.properties index d7b7805fa1..777b379662 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.8 +CARCHATTING_VERSION=1.8.9 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java index 64c1c5723a..e72b57dd14 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java @@ -17,14 +17,14 @@ public class NavigatorApps { private static AppInfo app_ = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_disable, 1 ); // private static AppInfo app2 = new AppInfo( "音乐", "com.tencent.wecarflow", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 ); private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media_selector, 2 ); - private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 ); +// private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 ); private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist_selector, 4 ); public static List< AppInfo > getApps() { List< AppInfo > sApps = new ArrayList<>(); sApps.add( app ); sApps.add( app2 ); - sApps.add( app3 ); +// sApps.add( app3 ); sApps.add( app4 ); return sApps; } @@ -33,7 +33,7 @@ public class NavigatorApps { List< AppInfo > sApps = new ArrayList<>(); sApps.add( app ); sApps.add( app2 ); - sApps.add( app3 ); +// sApps.add( app3 ); sApps.add( app4 ); return sApps; } diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index 6ab6da70d9..60781ed8b7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ com.android.messaging com.android.contacts com.android.dialer + com.zhidao.imdemo com.mogo.launcher @@ -44,5 +45,6 @@ com.iflytek.inputmethod.pad com.nwd.tools.reboot com.android.car.setting + com.zhidao.imdemo diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000..361ea19865 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png differ diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index fb6d339554..78aa40001d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -120,9 +120,6 @@ public class EntrancePresenter extends Presenter implements Weathe // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } - if(DebugConfig.isMapBased()) { - requestCarModelList(); - } getCommonConfig(); } @@ -242,38 +239,4 @@ public class EntrancePresenter extends Presenter implements Weathe return ""; } } - - private void requestCarModelList() { - Map params = new HashMap<>(8); - params.put("sn", Utils.getSn()); -// params.put("sn", "ZD802B1932L00617"); - mNetWork.create(UserInfoNetApiServices.class, DztHttpConstant.getBaseUrl()). - requestCarModelList(params). - subscribeOn(Schedulers.io()). - observeOn(Schedulers.io()). - subscribe(new SubscribeImpl(RequestOptions.create(context)) { - @Override - public void onSuccess(CarModelListResponse o) { - super.onSuccess(o); - Logger.d(TAG, "请求车模列表成功: " + o); - // todo 保存到sp中 - SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", - GsonUtil.jsonFromObject(o.getResult())); - } - - @Override - public void onError(Throwable e) { - super.onError(e); - Logger.e(TAG, e, "请求自车模型失败"); - } - - @Override - public void onError(String message, int code) { - super.onError(message, code); - Logger.e(TAG, "请求自车模型失败: " + message); - } - }); - - } - } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java index ef6b3bd04c..e8afa9f17b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java @@ -23,7 +23,4 @@ public interface UserInfoNetApiServices { */ @GET("carlife/carMachine/getAccountInfo") Single requestUserInfo(@QueryMap Map params); - - @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") - Observable requestCarModelList(@QueryMap Map params); } diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ 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 e11c589602..13915be41a 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 @@ -62,7 +62,7 @@ android:layout_width="@dimen/modle_car_panel_call" android:layout_height="@dimen/modle_car_panel_call" android:layout_marginEnd="@dimen/modle_car_panel_call_margin" - android:background="@drawable/selector_service_car_panel_call" + android:background="@drawable/module_common_selector_call" android:padding="@dimen/module_services_panel_item_detail_padding" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 1ef623aac8..d7e2dd62a7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -15,7 +15,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; import com.mogo.utils.logger.Logger; @@ -35,6 +34,7 @@ public class V2XEventPanelModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { + Logger.e(MODULE_NAME, "事件模版 createFragment。。。。"); V2XServiceManager.init(context); return V2XEventPanelFragment.Companion.getInstance(); } @@ -92,21 +92,28 @@ public class V2XEventPanelModuleProvider implements @Override public void init(Context context) { + V2XServiceManager.init(context); Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。"); } @Override public void showPanelWithSelectedItem(int item) { - V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + } } @Override public void showPanel() { - V2XEventPanelFragment.Companion.getInstance().showPanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanel(); + } } @Override public void hidePanel() { - V2XEventPanelFragment.Companion.getInstance().hidePanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().hidePanel(); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index 834de905b1..214c4a0764 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder coordinates = message.getCoordinates(); List entityList = new ArrayList<>(); - // 移除上一次的数据 - //Context context = V2XServiceManager.getContext(); for (V2XMarkerEntity coordinate : coordinates) { //故障车机 if (coordinate.getTargetId() == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) { - //V2XMarkerEntity.UserInfoBean userInfoBean = coordinate.getUserInfo(); - //if (userInfoBean != null) { entityList.add(coordinate); - //} - //绘制 - //V2XServiceManager - // .getMoGoV2XMarkerManager() - // .drawableSpecialCarPOI(context, coordinate, V2XMarkerClickListener.getInstance()); } } if (!entityList.isEmpty()) { - //V2XUtils.runOnUiThread(() -> V2XServiceManager.getMoGoV2XScenarioManager().showOtherSeekHelpWindow(entityList)); V2XUtils.runOnUiThread(() -> { V2XMessageEntity> v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index a81d3afe76..5c9bfbafe2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -56,66 +56,70 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { //Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); - synchronized (V2XScenarioManager.class) { - // 展示 - V2XUtils.runOnUiThread(() -> { - // 提取之前存储的场景 - if (v2XMessageEntity != null) { + try { + synchronized (V2XScenarioManager.class) { + // 展示 + V2XUtils.runOnUiThread(() -> { + // 提取之前存储的场景 + if (v2XMessageEntity != null) { - // 广播给应用内部其它模块 - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + // 广播给应用内部其它模块 + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); - mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); - // 如果没有拿到之前的，根据类型分发 - if (mV2XScenario == null) { - switch (v2XMessageEntity.getType()) { - case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: - mV2XScenario = V2XRoadEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: - mV2XScenario = V2XSeekHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: - mV2XScenario = V2XFatigueDrivingScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: - mV2XScenario = V2XPushEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: - mV2XScenario = V2XPushLiveCarScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: - mV2XScenario = V2XAnimationScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: - mV2XScenario = V2XCarForHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: - mV2XScenario = V2XIllegalParkScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: - mV2XScenario = V2XEventUgcScenario.getInstance(); - break; - default: - Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); - TipToast.tip("当前V2X消息类型未定义"); - return; + mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); + // 如果没有拿到之前的，根据类型分发 + if (mV2XScenario == null) { + switch (v2XMessageEntity.getType()) { + case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: + mV2XScenario = V2XRoadEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: + mV2XScenario = V2XSeekHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: + mV2XScenario = V2XFatigueDrivingScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: + mV2XScenario = V2XPushEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: + mV2XScenario = V2XPushLiveCarScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: + mV2XScenario = V2XAnimationScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: + mV2XScenario = V2XCarForHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: + mV2XScenario = V2XIllegalParkScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: + mV2XScenario = V2XEventUgcScenario.getInstance(); + break; + default: + Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); + TipToast.tip("当前V2X消息类型未定义"); + return; + } + } + + // 展示最新的消息 + if (mV2XScenario != null) { + if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { + hidOtherPanel(); + } + mV2XScenario.init(v2XMessageEntity); + mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); } } - - // 展示最新的消息 - if (mV2XScenario != null) { - if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { - hidOtherPanel(); - } - mV2XScenario.init(v2XMessageEntity); - mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); - } - } - }); + }); + } + } catch (Exception e) { + e.printStackTrace(); } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index dd1f94d092..88fd3e48c6 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 43783d6c62..97e0aceb59 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -49,7 +49,7 @@ android:id="@+id/tagEventType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_36" + android:layout_marginStart="@dimen/dp_40" android:layout_marginTop="@dimen/dp_12" android:layout_marginBottom="@dimen/dp_36" android:background="@drawable/bg_v2x_event_type_read" @@ -87,7 +87,7 @@ android:id="@+id/llIllegalParkingLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/dp_40" + android:layout_marginRight="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike" app:layout_constraintTop_toTopOf="parent" @@ -97,7 +97,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..8fd4be0d32 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -14,18 +14,17 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_21" android:layout_marginEnd="@dimen/dp_31" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_borderColor="#4cffffff" + app:miv_borderColor="#3381A4DC" app:miv_failureHolder="@drawable/icon_default_user_head" app:miv_overlayImageId="@drawable/icon_default_user_head" app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" - app:miv_shapeBorderWidth="@dimen/dp_4" /> + app:miv_shapeBorderWidth="@dimen/dp_5" /> diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java new file mode 100644 index 0000000000..a23e8553bc --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java @@ -0,0 +1,34 @@ +package com.mogo.service.impl.adas; + +import com.mogo.commons.debug.DebugConfig; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.GET; +import retrofit2.http.QueryMap; + +interface CarModelInfoNetApiServices { + String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; + + static String getBaseUrl(){ + switch ( DebugConfig.getNetMode() ) { + case DebugConfig.NET_MODE_DEV: + return HOST_DEV; + case DebugConfig.NET_MODE_QA: + return HOST_TEST; + case DebugConfig.NET_MODE_DEMO: + return HOST_DEMO; + default: + return HOST_PRODUCT; + } + } + + @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") + Observable requestCarModelList(@QueryMap Map params); + + +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java new file mode 100644 index 0000000000..f30cc75145 --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java @@ -0,0 +1,47 @@ +package com.mogo.service.impl.adas; + +import com.mogo.module.common.entity.OwnCarModelEntity; + +import java.util.List; + +public class CarModelListInfo { + private String sn; + /** + * 热心指数 eg: 1 1.5 2 2.5 + */ + private float enthusiasmIndex; + private List imageData; + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public float getEnthusiasmIndex() { + return enthusiasmIndex; + } + + public void setEnthusiasmIndex(float enthusiasmIndex) { + this.enthusiasmIndex = enthusiasmIndex; + } + + public List getImageData() { + return imageData; + } + + public void setImageData(List imageData) { + this.imageData = imageData; + } + + @Override + public String toString() { + return "CarModelListInfo{" + + "sn='" + sn + '\'' + + ", enthusiasmIndex=" + enthusiasmIndex + + ", imageData=" + imageData + + '}'; + } +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java new file mode 100644 index 0000000000..8775e4bbd5 --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java @@ -0,0 +1,29 @@ +package com.mogo.service.impl.adas; + +import com.mogo.commons.data.BaseData; + +/** + * 请求根据热心指数获取自车图标列表的响应类 + * + * @author tongchenfei + */ +public class CarModelListResponse extends BaseData { + private CarModelListInfo result; + + public CarModelListInfo getResult() { + return result; + } + + public void setResult(CarModelListInfo result) { + this.result = result; + } + + @Override + public String toString() { + return "CarModelListResponse{" + + "result=" + result + + ", code=" + code + + ", msg='" + msg + '\'' + + '}'; + } +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index a82f54b337..277461c9d8 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -8,6 +8,8 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; @@ -22,6 +24,8 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.adasconfig.api.AdasConfigApiController; import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; @@ -34,7 +38,11 @@ import com.zhidao.autopilot.support.api.IAutopolitDataCallBack; import org.json.JSONObject; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import io.reactivex.schedulers.Schedulers; import static com.mogo.module.common.utils.SPConst.getSpGuide; @@ -132,10 +140,17 @@ public class MogoADASController implements IMogoADASController { @Override public void requestGetCarModelListInfo() { - Logger.d( TAG, "requestGetCarModelListInfo" ); - // 向adas发送车模list - AutopilotServiceManage.getInstance().settingCarModelListInfo( SharedPrefsMgr.getInstance( context ).getString( - "CAR_MODEL_LIST", "default-value" ) ); + if (DebugConfig.isMapBased()) { + Logger.d(TAG, "requestGetCarModelListInfo"); + // 向adas发送车模list + String carModelList = SharedPrefsMgr.getInstance(context).getString( + "CAR_MODEL_LIST", ""); + if (carModelList != null && !carModelList.isEmpty()) { + AutopilotServiceManage.getInstance().settingCarModelListInfo(carModelList); + } + // 此处进行网络请求，请求成功后再通知一次adas + requestCarModelList(); + } } @Override @@ -144,6 +159,8 @@ public class MogoADASController implements IMogoADASController { MyLocationUtil.emphasizeMyLocation(); } needEmphasizeMyLocation = false; + + useTestSn = !useTestSn; } @Override @@ -155,6 +172,8 @@ public class MogoADASController implements IMogoADASController { } } + private boolean useTestSn = false; + private void invokeShowADASOperation() { int delay = CarSeries.isF8xxSeries() ? 0 : 100; @@ -303,6 +322,47 @@ public class MogoADASController implements IMogoADASController { adasDataCallbackList.remove(callback); } + private static final String TEST_SN = "ZD802B1932L00617"; + private String currentSn = TEST_SN; + + private void requestCarModelList() { + Map params = new HashMap<>(8); + params.put("sn", Utils.getSn()); +// currentSn = useTestSn ? TEST_SN : Utils.getSn(); +// params.put("sn", currentSn); + MogoApisHandler.getInstance().getApis().getNetworkApi().create(CarModelInfoNetApiServices.class, CarModelInfoNetApiServices.getBaseUrl()). + requestCarModelList(params). + subscribeOn(Schedulers.io()). + observeOn(Schedulers.io()). + subscribe(new SubscribeImpl(RequestOptions.create(context)) { + @Override + public void onSuccess(CarModelListResponse o) { + super.onSuccess(o); + Logger.d(TAG, "请求车模列表成功: " + o); + // 保存到sp中 + String value = GsonUtil.jsonFromObject(o.getResult()); + SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", + value); + if(value != null && !value.isEmpty()){ + AutopilotServiceManage.getInstance().settingCarModelListInfo(value); + } + } + + @Override + public void onError(Throwable e) { + super.onError(e); + Logger.e(TAG, e, "请求自车模型失败"); + } + + @Override + public void onError(String message, int code) { + super.onError(message, code); + Logger.e(TAG, "请求自车模型失败: " + message); + } + }); + + } + @Override public void release() { AutopilotServiceManage.getInstance().release(); diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml new file mode 100644 index 0000000000..44b5570c79 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml deleted file mode 100644 index a0367b590f..0000000000 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png new file mode 100644 index 0000000000..cd40518ec2 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml index 79c69fb8a2..1de71f2b72 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -1,7 +1,7 @@ - +