From 0a08b67fb1b91071779bc3b934094e409d56a9b1 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Sat, 14 Sep 2024 10:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E7=9A=84=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/views/AbsViewHolder.java | 16 +- .../yunbao/live/views/AbsLiveViewHolder.java | 6 +- .../live/views/LiveAudienceViewHolder.java | 33 +- .../live/views/PortraitLiveManager.java | 1 + .../main/res/layout/view_live_audience.xml | 400 ++++++++---------- .../res/layout/view_live_audience_part.xml | 168 -------- .../res/mipmap-hdpi/ic_live_new_voice.png | Bin 0 -> 1130 bytes .../res/mipmap-mdpi/ic_live_new_voice.png | Bin 0 -> 669 bytes .../res/mipmap-xhdpi/ic_live_new_voice.png | Bin 0 -> 1408 bytes .../res/mipmap-xxxhdpi/ic_live_new_voice.png | Bin 0 -> 1813 bytes 10 files changed, 224 insertions(+), 400 deletions(-) delete mode 100644 live/src/main/res/layout/view_live_audience_part.xml create mode 100644 live/src/main/res/mipmap-hdpi/ic_live_new_voice.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_live_new_voice.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_live_new_voice.png diff --git a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java index b28a9f85a..3a095be5c 100644 --- a/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java +++ b/common/src/main/java/com/yunbao/common/views/AbsViewHolder.java @@ -26,7 +26,13 @@ public abstract class AbsViewHolder implements LifeCycleListener { mTag = getClass().getSimpleName(); mContext = context; mParentView = parentView; - mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false); + try { + mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false); + }catch (Exception e){ + L.e("AbsViewHolder",e.toString()); + } + if (mContentView == null) + L.e("AbsViewHolder","mContentView==null"); init(); } @@ -35,7 +41,13 @@ public abstract class AbsViewHolder implements LifeCycleListener { processArguments(args); mContext = context; mParentView = parentView; - mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false); + try { + mContentView = LayoutInflater.from(context).inflate(getLayoutId(), mParentView, false); + }catch (Exception e){ + L.e("AbsViewHolder",e.toString()); + } + if (mContentView == null) + L.e("AbsViewHolder","mContentView==null"); init(); } diff --git a/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java b/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java index 8fd5702fa..89d5922c3 100644 --- a/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/AbsLiveViewHolder.java @@ -19,7 +19,7 @@ import org.greenrobot.eventbus.EventBus; public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.OnClickListener { - public TextView mRedPoint;//消息上的红点 + public View mRedPoint;//消息上的红点 public View mRedPointPrivilege;//皇冠上的点 public AbsLiveViewHolder(Context context, ViewGroup parentView) { @@ -30,8 +30,8 @@ public abstract class AbsLiveViewHolder extends AbsViewHolder implements View.On public void init() { findViewById(R.id.et_input).setOnClickListener(this); findViewById(R.id.btn_msg).setOnClickListener(this); - mRedPoint = (TextView) findViewById(R.id.red_point); - mRedPointPrivilege = findViewById(R.id.privilege_red_point); + mRedPoint = findViewById(R.id.red_point); + //mRedPointPrivilege = findViewById(R.id.privilege_red_point); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index 5bb08a201..0a957990a 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -92,8 +92,8 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { private ImageView giftImage, liveNewPeople; private String newPeopleUrl = null; private View mNewPeopleRedDot; - private LinearLayout voiceButton; - private ImageView mRole;//特权 + private ImageView voiceButton; + // private ImageView mRole;//特权 private ImageView mPlay;//玩 private ImageView mCheat;//整蛊 private ImageView pd_pao, combo; @@ -150,15 +150,15 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { // msgRedPoint = findViewById(R.id.msg_red_point); // totalImage = findViewById(R.id.total_image); // totalRedPoint = findViewById(R.id.total_red_point); - - voiceButton = (LinearLayout) findViewById(R.id.voice_button); + Log.i("LiveAudienceViewHolder", "init"); + voiceButton = findViewById(R.id.voice_button); giftImage = (ImageView) findViewById(R.id.gift_image); quick_gift_remaining_quantity = (TextView) findViewById(R.id.quick_gift_remaining_quantity); time_text = (TextView) findViewById(R.id.time_text); liveNewPeople = (ImageView) findViewById(R.id.live_new_people); viewFlipper = (ViewFlipper) findViewById(R.id.viewflipper_banner); - mRole = (ImageView) findViewById(R.id.live_privilege); + mCheat = (ImageView) findViewById(R.id.live_cheat); mPlay = (ImageView) findViewById(R.id.live_play); stationHornBanner = findViewById(R.id.station_horn_banner); @@ -166,12 +166,13 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { pd_pao = (ImageView) findViewById(R.id.pd_pao); combo = (ImageView) findViewById(R.id.combo); circleProgress = (CircleProgress2) findViewById(R.id.circleProgress); + //mRole = (ImageView) findViewById(R.id.live_privilege); combo.setVisibility(View.GONE); liveNewPeople.setOnClickListener(this); - mRole.setOnClickListener(this); + //mRole.setOnClickListener(this); mCheat.setOnClickListener(this); mPlay.setOnClickListener(this); - + Log.i("LiveAudienceViewHolder", "init2"); findViewById(R.id.btn_mic).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -206,7 +207,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { }); findViewById(R.id.btn_more).setOnClickListener(this); - + Log.i("LiveAudienceViewHolder", "init3"); v_msg_redpoint = (View) findViewById(R.id.v_msg_redpoint); //底部改造 ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.total_image), new ViewClicksAntiShake.ViewClicksCallBack() { @@ -240,6 +241,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { } }); + Log.i("LiveAudienceViewHolder", "init4"); // //底部礼物弹窗 ImgLoader.displayGif(mContext, R.mipmap.live_lw, giftImage); @@ -258,7 +260,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { // ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_role : R.mipmap.live_icon_role_en, mRole); // ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_play : R.mipmap.live_icon_play_en, mPlay); // ImgLoader.display(mContext, TextUtils.equals(language, "zh") ? R.mipmap.live_icon_cheat : R.mipmap.live_icon_cheat_en, mCheat); - + Log.i("LiveAudienceViewHolder", "init5"); voiceButton.setOnTouchListener((v, event) -> { MobclickAgent.onEvent(mContext, "live_room_voice_chat_btn", "直播间点开最下面的语音输入的聊天按钮"); if (event.getAction() == MotionEvent.ACTION_DOWN) { @@ -310,6 +312,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { } return true; }); + Log.i("LiveAudienceViewHolder", "init6"); mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext); quick_gift_remaining_quantity.setVisibility(View.GONE); time_text.setVisibility(View.GONE); @@ -372,6 +375,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { } }); + Log.i("LiveAudienceViewHolder", "init7"); combo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -407,6 +411,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { findViewById(R.id.total_image_red_point).setVisibility(View.GONE); } getMsgCount(); + Log.i("LiveAudienceViewHolder", "init8"); } private void getMsgCount() { @@ -705,10 +710,12 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { openZGListWindow(); } else if (i == R.id.live_new_people) { openNewPeopleDialog(); - } else if (i == R.id.live_privilege) { - MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮"); - openRoleDialog(); - } else if (i == R.id.live_cheat) { + } +// else if (i == R.id.live_privilege) { +// MobclickAgent.onEvent(mContext, "live_room_privilege", "直播间下面打开皇冠按钮"); +// openRoleDialog(); +// } + else if (i == R.id.live_cheat) { } else if (i == R.id.live_play) { diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index d2e572d22..24068bdc6 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -499,6 +499,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe enterRoomNew(); Bus.get().post(new LiveOpenSuccessEvent()); } catch (Exception e) { + Log.e("进入房间异常", e.toString()); e.printStackTrace(); } } diff --git a/live/src/main/res/layout/view_live_audience.xml b/live/src/main/res/layout/view_live_audience.xml index d0daa7dc5..087cf0acc 100644 --- a/live/src/main/res/layout/view_live_audience.xml +++ b/live/src/main/res/layout/view_live_audience.xml @@ -114,20 +114,199 @@ - + tools:layout_marginBottom="45dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:gravity="center_vertical" + android:visibility="gone" + tools:visibility="visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -511,18 +495,6 @@ android:visibility="gone" /> - diff --git a/live/src/main/res/layout/view_live_audience_part.xml b/live/src/main/res/layout/view_live_audience_part.xml deleted file mode 100644 index b4ff81aa0..000000000 --- a/live/src/main/res/layout/view_live_audience_part.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/live/src/main/res/mipmap-hdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-hdpi/ic_live_new_voice.png new file mode 100644 index 0000000000000000000000000000000000000000..360fea89a06006202c6acd6be14e8800dda30bf6 GIT binary patch literal 1130 zcmV-w1eN=VP)Px(BuPX;R9Hu?mwV{la~Q{8Zwz7Xx7;aGD;h(XTbi&85n(YJ4O@h5Lb6aAn@cXC z`NNXsI;;5u$)(Mjf0l_xE^89YE%OJn?eTf9=dANP&N<)D@$>w1F5mO{yr0Yac|Xq) z16o9E2kZch$fJJ)>m+R$mHY{1LjDYRRdlN{7#ALOkgAMMY;H%jM5HW2+RcbPQb~M<~4yg0!PGsz@5N)ze;+j z^U{cL&7Un!U7pWIOIpznyf1J>IEqh!y?}=$-O}r_B;9MtffbTQ4+r>K;3?o&V2q^I z{Vt1$>w(9Cp9&{NN%Ct~Yl?Ud;3!v0I;yE|5pgu|9yE^;4@%1;3`QA{tK|%#%Y@ZERi&}0(fU&RWf{DAA0OL zEt4dzkBCcv=gV;LupcLBS%YLc8ar#LJXF#j5wR!WfnlbfRoe3HPT@5cqF%tGa{l_cd+ye}zz$vn%r7WS2==*p3nrQ*-G%!kPBu@-Qhw#Ou*!OY!lh zax?H(sqxj4Oxi8>FUgDuljAMmm@@+Q@4EcZf$aTK$uWHtr0k*xB8q`_NmhWlWI&^i@fI8ezBGp z*1Cn>m-Imm8LEI=7bRPr-Yc?~Esci*{@=8rS6aI{G7xZ^0~3Mg%EPx%S4l)cR5(wKluL-tQ5eR5k83tkLuA2}iOIq=5tAquvmgtiNJChRi6Zxu6iXzL z1(K9|SlA%3VKcHIatY&BBT-V4Ymf8leADNf?>{qV`Tw8uJI{IF=Y2#E%eH_iz@)tG zF7QZ_i;l&Cs>}8S;5^V!vEeGPT+*j%2de^Y*8&fKAHXKy1~3p<0_+A}0aGP?t%P<1 z+U^Hj0Gfe%N$<-K*`5tt2R2AL+!tUC&Y(E4-OoOC9<$J0r90$Be&{j#u z3V>ID>A)CC-+BW^GoAv=B%LY%UIyj>qa=OlE3i${kpkdZU@=f5>2o)r?P0)BNpG`V zLg6Y&CklWUlM5CA!vko0Jn&l5&wn+veGr%_sWJb2)`usD3r1%s2B%OJHTEbo)~Il z1e<`#lAc6)%7OiXeZabO^C4i1q)^;#*&Ydm7iZ<<=^B9lMlTmU(j*%6GK1r}G24Su zXiNm=0jq%!&Agik2k%hO+{2i1ENV$+Yi8+s9&`l zES)P%?9zs8m5=GE_aw!1^tgHj=FyB~>5vp7+2i^PXu07Q*)!Ga00000NkvXXu0mjf D2}&kR literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png b/live/src/main/res/mipmap-xhdpi/ic_live_new_voice.png new file mode 100644 index 0000000000000000000000000000000000000000..70b1e2be7419bbad1977a665b27ee87c14dd8547 GIT binary patch literal 1408 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