From b696445914e1f4b67eac3a56362cb777659cf7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 11 Aug 2020 11:38:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=BA=86=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scene/road/V2XRoadEventWindow.java | 13 +++++++ .../res/drawable-ldpi/icon_window_close.png | Bin 0 -> 1355 bytes .../res/drawable-ldpi/icon_window_close2.png | Bin 0 -> 1197 bytes .../main/res/layout/item_v2x_event_detail.xml | 4 +- ...e_v2x_event_panel_fragment_event_panel.xml | 4 +- .../res/layout/window_road_event_detail.xml | 36 ++++++++++++++---- 6 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_window_close2.png 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 0000000000000000000000000000000000000000..095574d6e2d07e6640c2a5b0a2364060888a8e84 GIT binary patch literal 1355 zcmV-R1+@B!P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}N|wMj%lR9FesnafWTK^(_tW(&2T zT!e}|5)VFzXhj}Dj7E%6Z+g(E(RdR)X}oA+;$NT_6Hh)k5sfCAs5kYX2Oki?5EWBA znFt0bCy+;h-EqEKw_V!VZg<*JoXc)!e!t&*b~-!ro9|MRMd6&&y1M3ezrXl6VRRGW zypmG7fl(SHgmQx$5n(e!!TaW&qc5N_%RT63+4)pzrUzh>lSme%q>`U?R;u+K|k*{O|*2K z>~hma{XUJIDi3a4oERT{?-bJ!I23AoplQCV!jU;S=b>KAI_*#} zSY10lJ|cY~rN9{3f3SIAat}!vYZN2BARFlvV9eRrG+5D*O?e89Y3=LRR}DrYBg6K_ zWiK68gObuUz4?E^>fhKrZQ;hN78Y>c+Gl|B`?vIRdMQpDYj`wx2!f{vd(?I!EittG#Hjgrobm&w@JgfvWLWsuyzcZbx} zRFUcFKjg&8^CS|Pl-fE~A~OUlLq02vJU@2*_Bs<59n{uVlLzLBV@wW|nkxULvETa%dSW zY~cf6rNZbY8rs#?BNC2Qr2xXo2@LV z(z%93|K@oyc3^bE$*f)mZF%NmWUW|W6&r{83DydMQMc}_d6)3#8qw_s(a$l+=#H*kW*ODKC0vxXLe41*#g$4Os{+yL9H z(`q1l5n&6TOmYut?}C*qDyAFD@({hbk05H8(Wu?aP_Sr%L7ICq%=+!H+Fyj-TnE zB0AX@y57zf2ZrPc6|vB8$^C=LF2}}!VF<~S5I&XcRJh-KD#nx`SOyG*1(K(j*m}aG zFn3@8i(T~rNs6`xEenz-RK&ud#(G`S7jF!G>+MQrNCAccR6|IfP!W?IR^qpz>s?>J z^hg&0DKMa*&qDHqiYR_An>uLEN5M3}$U4EIPhpe3#5R@xQ)|W2H8&eQ84mY-aEstN!u9~>XD?GU%#{vj3<%Jx_I1|YpX}ZfuoVE)1bUoE zm>_X^RgLgr@s0Sf_}J}>k=395sswBWfY#;w>6VDI0iQ6BU^)DB`xkr2A-8RLObq}4 N002ovPDHLkV1g_#ScCuo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e99eeaf97444e50f5ae58384095d1ad92135e19b GIT binary patch literal 1197 zcmV;e1XBBnP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91ET97b1ONa40RR91EC2ui0Q_#}qW}N|7fD1xR9FesnaxiVK@`ACTWuBM zN3_NdjM2mxx(BNT!`T6gOrh*1LW_?Zie-Ul!CP5I_WPrP(Nzrx-b6gPxoP}wWX27?l z$4z6e_TD7ou#k8FSxHEb~Iguq6|TE@r6 zb4yE0gZX@(Fw|6NLtFYZZRlU=Fyhpt=R2ax+WuW!HB3A^JNv4yudgsVIyzLTRNk$w zt{OKn6B85H=jZ2N_V@QcDHIBi*VotIuC1;8aSa#dlI?35NUUSKMNEv0j66)GQjQyC zv)SJ1>FF1Md1vMxb(u`YS?%B}tX?$LYIQ^I7fYqmK?q21lS6>7ik|b<1bt^h;D9ti4-5?S)Gh0V-JG19e73l_ z$mTtY?Bl-=M6E5XX7jNkoAQLXffx4a%*@Pp)i*-9i-m89TKlk?jD=>hw6Z$w#0{|Q zabX$i2w<#$r6Y?8S`F4hScXhmg)#-v$xt+M-me( zZcwY$ek(t2A@pB>iKEtGji>X2Wq~a(FTe2%d43s@F$2Vj5@b5-u*TkibgMEL6S)_d zX(84v{b*%n<#oiwv5kc}HX?agNwHYWvo}zk+_37NA9OC4`ydbdRkgDyH;EFwHyv7Z za+)qIEPNC{bv8Q!yWtmSNfgx4hK}^1ukC!&9>zT^jATX6J69n;*ln@vN+y%<#g~iC z(k+(84Y2Ig)YS92xw%TnY23|z%9kybFj#o^-L)~i{v=F0DsgaVVcg5c1ROT!U_}AL zXq}2~7IecLM{;O6G_tE&_`aT@;Xt66!k*c-P_-F%I%sAR6BN zyud(mmIXLxTb-1WOin0k5EC#BNG9yy0$<;0+y*JjnBPp}`T^6HFwzN2V_73CP|bj; z$I>Y0TiyjKw^}L~2cP}V4cxN?0n-+r<}H^!Gby|sLg?cEjfMqgnnwCm878KtWP_A+ZI@LWbbh*{#aDNs^o!*B!s{d`Rn!{p&OBMw}Pve00000 LNkvXXu0mjfZru`Z literal 0 HcmV?d00001 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"> + + + + + +