From 9f30e724e95bb436e58a6f8a82e915faf3526ba8 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Wed, 27 Jul 2022 10:52:14 +0800 Subject: [PATCH] 11111 --- .../dialog/InstructorOperationDialog.java | 20 +++++++ .../event/InstructorOperationEvent.java | 9 +++ .../res/drawable/instructor_operation_bg.xml | 5 ++ .../res/layout/view_instructor_operation.xml | 53 ++++++++++++------ common/src/main/res/values/strings.xml | 2 +- .../res/layout/rc_conversationlist_item.xml | 2 +- .../rc_unread_count_bg_normal.png | Bin 0 -> 1878 bytes .../yunbao/main/activity/MainActivity.java | 19 ++++++- .../res/layout/view_system_message_item.xml | 2 +- .../rc_unread_count_bg_normal.png | Bin 0 -> 1878 bytes 10 files changed, 89 insertions(+), 23 deletions(-) create mode 100644 common/src/main/java/com/yunbao/common/event/InstructorOperationEvent.java create mode 100644 common/src/main/res/drawable/instructor_operation_bg.xml create mode 100644 live/src/main/res/mipmap-xxxhdpi/rc_unread_count_bg_normal.png create mode 100644 main/src/main/res/mipmap-xxhdpi/rc_unread_count_bg_normal.png diff --git a/common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java b/common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java index bffb2a483..ec8b1493c 100644 --- a/common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/InstructorOperationDialog.java @@ -1,14 +1,20 @@ package com.yunbao.common.dialog; +import android.os.Bundle; import android.view.Gravity; +import android.view.View; import android.view.Window; import android.view.WindowManager; +import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import com.yunbao.common.R; +import com.yunbao.common.event.InstructorOperationEvent; + +import org.greenrobot.eventbus.EventBus; import java.lang.reflect.Field; @@ -18,6 +24,7 @@ public class InstructorOperationDialog extends AbsDialogFragment { protected int getLayoutId() { return R.layout.view_instructor_operation; } + /** * 主要时这个方法。上面两个方法只是获取布局用的，可以不要 * @@ -46,6 +53,7 @@ public class InstructorOperationDialog extends AbsDialogFragment { ft.add(this, tag); ft.commitAllowingStateLoss(); } + @Override protected int getDialogStyle() { return R.style.dialog2; @@ -65,4 +73,16 @@ public class InstructorOperationDialog extends AbsDialogFragment { params.gravity = Gravity.CENTER; window.setAttributes(params); } + + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + mRootView.findViewById(R.id.hurry_contact).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + EventBus.getDefault().post(new InstructorOperationEvent()); + dismiss(); + } + }); + } } diff --git a/common/src/main/java/com/yunbao/common/event/InstructorOperationEvent.java b/common/src/main/java/com/yunbao/common/event/InstructorOperationEvent.java new file mode 100644 index 000000000..15e3934f3 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/event/InstructorOperationEvent.java @@ -0,0 +1,9 @@ +package com.yunbao.common.event; + +import com.yunbao.common.bean.BaseModel; + +/** + * 新人面向指导员的跳转弹窗 + */ +public class InstructorOperationEvent extends BaseModel { +} diff --git a/common/src/main/res/drawable/instructor_operation_bg.xml b/common/src/main/res/drawable/instructor_operation_bg.xml new file mode 100644 index 000000000..e540e31b4 --- /dev/null +++ b/common/src/main/res/drawable/instructor_operation_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/view_instructor_operation.xml b/common/src/main/res/layout/view_instructor_operation.xml index d23329136..2bb12a57f 100644 --- a/common/src/main/res/layout/view_instructor_operation.xml +++ b/common/src/main/res/layout/view_instructor_operation.xml @@ -18,7 +18,7 @@ - + android:background="@drawable/instructor_operation_bg" + android:gravity="center_horizontal" + android:orientation="vertical" + android:paddingStart="5dp" + android:paddingTop="9dp" + android:paddingEnd="5dp" + android:paddingBottom="9dp"> + + + + + - + app:cardElevation="0dp"> 歡迎來到PD LIVE 這有各類好看有趣的主播\n還有各種豐富的活動玩法 在找您喜歡的主播嗎？ - 聯系您的專屬指導員,\n給您匹配更多風格的主播唷！ + 聯系您的專屬指導員,\br\br給您匹配更多風格的主播唷！ 趕快聯系他/她吧！ diff --git a/live/src/main/res/layout/rc_conversationlist_item.xml b/live/src/main/res/layout/rc_conversationlist_item.xml index 139eacb2f..0257ae7e1 100644 --- a/live/src/main/res/layout/rc_conversationlist_item.xml +++ b/live/src/main/res/layout/rc_conversationlist_item.xml @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - app:srcCompat="@drawable/rc_unread_count_bg_normal" /> + app:srcCompat="@mipmap/rc_unread_count_bg_normal" /> WXQfYJyi8ZJ4MNQ`f`+YK1JnB>iS^WOJ= z|MC9+pQiG%()6_4GzfyyeO`A3m?vptR0?=shT7V|lqz{&Rv>6}rZ$E_>)Xde(1={# zU#V77FOrNHG19CU;Eb_|1keyPtuQ9hOf{#%0WQP~PUOacPY{@Aoycqpg;A1=tKz-& zGB>Nf%+J(UGY%FhoDNTmk$@n=sWcpmgaw6+IgvOo3D(*+iokJ*TJ1!NG=*>_RSvsE znS-rH%)nrn6}CByxYca4nDj7#5jctwC~h&}IB6kB+yo~c1Zb1lAX(uqN$3J!PNYgz zB@#uW(Wo(MGKz8t#T^cZ#z7DUfG{X^f=b5>f|5VP;N}!Y<|UOE1z2OG17fY}M1ZA( zE<~gxt)L{r1OkS}XbHuQnC4O($TCTsR4a$$%2@{G!d!$CR0Ux1Bvz^tRZ*!D|Asnw z{D=Y&T8c{Qc&sgvNK%EOdKLmV5&?NETJhIO99qFCVy(<@o`t~7e9aq)bjcj8in3o6 z!$TKUK4daX5JnR`g`yc=(45dcB*M9Am2)EC-UtI`GY~dEj**0kG@A=BJBeX~P)cO^ zVBKS(X43K~6eJBxtMtEuS%wUXa)bsh^AS44p^^|n;A9|4mlzghpcq(ZdU)UGa+S+s zkPm|crJ}SL_IX@Z++npE2qPXhm!e3Yps2LKa6Y#a0pT(7JWE<^4jVxSO$G;R#|>sX zW;f6T%@{a4VGi0ckiv{*NZu_nwOSGk$+Q1cex}TWBBaAl%%hd2mOZ4GSHQj2C5mSj zSCd$Uc{rXhB+Y1r;6xZL12`5*Z1YbXfkE166$eQFAuk4DiWpR*w9FNSK(zit=ApoR zR4dv+PtdJ*ZO}$^0OAr$lI}V;>ZiVHOnS+-fWv3(;ewbH`nZD zFTG>`KJ$&eB_l7^u9{RmZPt-=<4vKdPgy^GwV`*YLj|Up&a3S!v$uT_ zI{DG&$#?H|G@jUVV^>>)zW?KOGk>4IwPaaSd6#`{Dz&8CW6x;5I%>^Ry}R;8*1dGN zCU9WG{i#2tW;E~d)~swhLmc?@kFqppR^+V#U61Q@wr;}MO(~bMu4it7zstHl_JRI9 z;z4^lPUVd|K4x~)Dcjr}y-SKcx8dHq2!-Trxl%fN%Knzk6Z3*okM8(#2Gg-N&LuVa5=(*N)bh{F$Ke>Cg{$h!(wfWT6 p{>J(T`wF@X4^Q8>`qm3K(EY?K+0WcB8=?LAe4a9QXYqn1e*%`$i{tWXQfYJyi8ZJ4MNQ`f`+YK1JnB>iS^WOJ= z|MC9+pQiG%()6_4GzfyyeO`A3m?vptR0?=shT7V|lqz{&Rv>6}rZ$E_>)Xde(1={# zU#V77FOrNHG19CU;Eb_|1keyPtuQ9hOf{#%0WQP~PUOacPY{@Aoycqpg;A1=tKz-& zGB>Nf%+J(UGY%FhoDNTmk$@n=sWcpmgaw6+IgvOo3D(*+iokJ*TJ1!NG=*>_RSvsE znS-rH%)nrn6}CByxYca4nDj7#5jctwC~h&}IB6kB+yo~c1Zb1lAX(uqN$3J!PNYgz zB@#uW(Wo(MGKz8t#T^cZ#z7DUfG{X^f=b5>f|5VP;N}!Y<|UOE1z2OG17fY}M1ZA( zE<~gxt)L{r1OkS}XbHuQnC4O($TCTsR4a$$%2@{G!d!$CR0Ux1Bvz^tRZ*!D|Asnw z{D=Y&T8c{Qc&sgvNK%EOdKLmV5&?NETJhIO99qFCVy(<@o`t~7e9aq)bjcj8in3o6 z!$TKUK4daX5JnR`g`yc=(45dcB*M9Am2)EC-UtI`GY~dEj**0kG@A=BJBeX~P)cO^ zVBKS(X43K~6eJBxtMtEuS%wUXa)bsh^AS44p^^|n;A9|4mlzghpcq(ZdU)UGa+S+s zkPm|crJ}SL_IX@Z++npE2qPXhm!e3Yps2LKa6Y#a0pT(7JWE<^4jVxSO$G;R#|>sX zW;f6T%@{a4VGi0ckiv{*NZu_nwOSGk$+Q1cex}TWBBaAl%%hd2mOZ4GSHQj2C5mSj zSCd$Uc{rXhB+Y1r;6xZL12`5*Z1YbXfkE166$eQFAuk4DiWpR*w9FNSK(zit=ApoR zR4dv+PtdJ*ZO}$^0OAr$lI}V;>ZiVHOnS+-fWv3(;ewbH`nZD zFTG>`KJ$&eB_l7^u9{RmZPt-=<4vKdPgy^GwV`*YLj|Up&a3S!v$uT_ zI{DG&$#?H|G@jUVV^>>)zW?KOGk>4IwPaaSd6#`{Dz&8CW6x;5I%>^Ry}R;8*1dGN zCU9WG{i#2tW;E~d)~swhLmc?@kFqppR^+V#U61Q@wr;}MO(~bMu4it7zstHl_JRI9 z;z4^lPUVd|K4x~)Dcjr}y-SKcx8dHq2!-Trxl%fN%Knzk6Z3*okM8(#2Gg-N&LuVa5=(*N)bh{F$Ke>Cg{$h!(wfWT6 p{>J(T`wF@X4^Q8>`qm3K(EY?K+0WcB8=?LAe4a9QXYqn1e*%`$i{t