diff --git a/.idea/misc.xml b/.idea/misc.xml index e0db5eedc8..b707a9f159 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -15,6 +15,8 @@ + + diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 0e693aaf2a..a79b1a81d2 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -138,7 +138,7 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onCarStateData(CarStateInfo carStateInfo) { - Logger.d(TAG, "onCarStateData " + carStateInfo); + //Logger.d(TAG, "onCarStateData " + carStateInfo); for (IAdasDataListener listener : iAdasEventListeners) { if (listener != null) { listener.ownerCarStateInfo(gson.toJson(carStateInfo)); diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java index 1890c30da2..e0c44c00fb 100644 --- a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java +++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java @@ -6,5 +6,7 @@ package com.mogo.module.warning; */ public class WaringConst { public static String MODULE_NAME = "MODULE_LEFT_PANEL"; - public static String PATH_NAME = "/left/panel"; + + public static String BROADCAST_TEST_CONTROL_TYPE_EXTRA_KEY = "waring_type"; + } diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/notification/NotificationManager.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/notification/NotificationManager.java index 835fc0af5c..9b918c1dbc 100644 --- a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/notification/NotificationManager.java +++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/notification/NotificationManager.java @@ -1,5 +1,13 @@ package com.mogo.module.warning.notification; +import android.app.Activity; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Toast; + +import com.mogo.module.warning.R; + /** * @author xiaoyuzhou * @date 2021/8/3 5:50 下午 @@ -7,4 +15,15 @@ package com.mogo.module.warning.notification; */ public class NotificationManager { + + public static void show(Activity activity) { + LayoutInflater inflater = activity.getLayoutInflater(); + View view = inflater.inflate(R.layout.notification_v2x_msg_vr, null); + Toast toast = new Toast(activity.getApplicationContext()); + toast.setGravity(Gravity.CENTER_VERTICAL, 0, 0); + toast.setDuration(Toast.LENGTH_SHORT); + toast.setView(view); + toast.show(); + } + } diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/receiver/TestObuBroadcastReceiver.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/receiver/TestObuBroadcastReceiver.java new file mode 100644 index 0000000000..4512e128c0 --- /dev/null +++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/receiver/TestObuBroadcastReceiver.java @@ -0,0 +1,46 @@ +package com.mogo.module.warning.receiver; + + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import com.mogo.module.warning.WaringConst; +import com.mogo.utils.logger.Logger; + +/** + * V2X 测试面板广播接收，目的是可以通过广播调用起来面板 + * + * @author donghongyu + */ +public class TestObuBroadcastReceiver extends BroadcastReceiver { + private static final String TAG = "TestPanelBroadcastReceiver"; + + private Context mContext; + + @Override + public void onReceive(Context context, Intent intent) { + try { + this.mContext = context; + int waringType = intent.getIntExtra(WaringConst.BROADCAST_TEST_CONTROL_TYPE_EXTRA_KEY, 0); + Logger.d(TAG, "waringType:" + waringType); + + // 分发场景 + dispatchSceneTest(waringType); + } catch (Exception e) { + e.printStackTrace(); + } + } + + + /** + * 分发处理场景 + * + * @param sceneType 场景类型 + */ + private void dispatchSceneTest(int sceneType) { + Logger.d(TAG, "sceneType=" + sceneType); + + } + +} diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.kt b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.kt index 88f7f33d68..e4cd110549 100644 --- a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.kt @@ -1,29 +1,21 @@ -package com.mogo.module.warning.ui; +package com.mogo.module.warning.ui -import androidx.annotation.NonNull; - -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.module.warning.R; +import com.mogo.commons.mvp.MvpFragment +import com.mogo.module.warning.R +import com.mogo.module.warning.ui.WaringView +import com.mogo.module.warning.ui.WaringPresenter /** * @author xiaoyuzhou * @date 2021/8/3 2:40 下午 */ -public class MoGoWarningFragment extends MvpFragment implements WaringView { - - @Override - protected int getLayoutId() { - return R.layout.fragment_warning; +class MoGoWarningFragment : MvpFragment(), WaringView { + override fun getLayoutId(): Int { + return R.layout.fragment_warning } - @Override - protected void initViews() { - + override fun initViews() {} + override fun createPresenter(): WaringPresenter { + return WaringPresenter(this) } - - @NonNull - @Override - protected WaringPresenter createPresenter() { - return new WaringPresenter(this); - } -} +} \ No newline at end of file diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_abnormal_vehicle.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_abnormal_vehicle.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_abnormal_vehicle.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_abnormal_vehicle.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_avoid_special_vehicles.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_avoid_special_vehicles.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_avoid_special_vehicles.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_avoid_special_vehicles.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_blind_area_collision.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_blind_area_collision.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_blind_area_collision.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_blind_area_collision.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_collision_warning.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_collision_warning.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_collision_warning.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_collision_warning.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_emergency_brake.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_emergency_brake.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_emergency_brake.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_emergency_brake.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_motorcycle_collision.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_motorcycle_collision.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_motorcycle_collision.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_motorcycle_collision.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_pedestrian_collision.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_pedestrian_collision.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_pedestrian_collision.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_pedestrian_collision.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_reverse_overtaking.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_reverse_overtaking.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_reverse_overtaking.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_reverse_overtaking.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_road_construction.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_road_construction.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_road_construction.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_road_construction.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_road_dangerous.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_road_dangerous.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_road_dangerous.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_road_dangerous.png diff --git a/modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_vehicle_control.png b/modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_vehicle_control.png similarity index 100% rename from modules/mogo-module-warning/src/main/res/drawable-xhdpi-2560x1440/icon_waring_v2x_vehicle_control.png rename to modules/mogo-module-warning/src/main/res/drawable-xxxhdpi/icon_waring_v2x_vehicle_control.png diff --git a/modules/mogo-module-warning/src/main/res/drawable/bg_warning_bg.xml b/modules/mogo-module-warning/src/main/res/drawable/bg_warning_bg.xml new file mode 100644 index 0000000000..7ba3f1ef29 --- /dev/null +++ b/modules/mogo-module-warning/src/main/res/drawable/bg_warning_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-warning/src/main/res/layout/notification_v2x_msg_vr.xml b/modules/mogo-module-warning/src/main/res/layout/notification_v2x_msg_vr.xml index 77d9ef65f8..1002bae69e 100644 --- a/modules/mogo-module-warning/src/main/res/layout/notification_v2x_msg_vr.xml +++ b/modules/mogo-module-warning/src/main/res/layout/notification_v2x_msg_vr.xml @@ -1,6 +1,37 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:layout_gravity="center_horizontal" + android:background="@drawable/bg_warning_bg" + android:paddingStart="38px" + android:paddingTop="27px" + android:paddingEnd="38px" + android:paddingBottom="27px"> + + + + \ No newline at end of file