diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java index c6d11ae933..72fdd12754 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java @@ -5,6 +5,7 @@ import android.os.Handler; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; +import android.widget.ImageView; import android.widget.RelativeLayout; import androidx.annotation.NonNull; @@ -44,6 +45,8 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME; public class V2XRoadEventWindow extends RelativeLayout implements V2XRefreshCallback, IV2XWindow { private String TAG = "V2XRoadEventDetailWindow"; + // 关闭按钮 + private ImageView mBtnCloseWindow; // 展示列表 private RecyclerView mRecyclerView; // 列表数据适配器 @@ -101,7 +104,17 @@ public class V2XRoadEventWindow extends RelativeLayout // 填充布局 LayoutInflater.from(context).inflate(R.layout.window_road_event_detail, this); // 详情列表 + mBtnCloseWindow = findViewById(R.id.btnCloseWindow); + // 详情列表 mRecyclerView = findViewById(R.id.rvRoadEventList); + + mBtnCloseWindow.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + close(); + } + }); + mV2XRoadEventAdapter = new V2XRoadEventAdapter(mItemList); mRecyclerView.setAdapter(mV2XRoadEventAdapter); // 设置切换样式 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png new file mode 100644 index 0000000000..095574d6e2 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png new file mode 100644 index 0000000000..e99eeaf974 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 8845ab2f25..13636e15b9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -109,8 +109,8 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml index 0d9fa87aed..0d28b2a2fa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail.xml @@ -1,12 +1,32 @@ - + android:layout_height="wrap_content"> + + + + + +