From 0e74652f41eac69b5a740bfe72c7ed0fd5bbe591 Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Fri, 1 Nov 2024 20:34:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E6=9B=B4?= =?UTF-8?q?=E5=A4=9A=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/background_40000_9.xml | 9 + .../main/res/mipmap-hdpi/ic_yola_msg_more.png | Bin 0 -> 272 bytes .../main/res/mipmap-mdpi/ic_yola_msg_more.png | Bin 0 -> 179 bytes .../res/mipmap-xhdpi/ic_yola_msg_more.png | Bin 0 -> 278 bytes .../res/mipmap-xxhdpi/ic_yola_msg_more.png | Bin 0 -> 512 bytes .../res/mipmap-xxxhdpi/ic_yola_msg_more.png | Bin 0 -> 626 bytes .../main/adapter/MainHomeLiveAdapter.java | 12 +- .../views/AbsMainHomeParentComViewHolder.java | 8 +- .../views/MainHomeLiveItemViewHolder.java | 9 +- .../views/MainHomeLiveWeekItemViewHolder.java | 2 +- .../main/views/MainHomeViewHolder2.java | 13 +- .../main/views/MainMessageHeadViewHolder.java | 10 +- .../main/views/MainMessageViewHolder2.java | 77 +++-- main/src/main/res/layout/activity_main.xml | 2 +- .../main/res/layout/item_main_home_lives.xml | 22 +- .../res/layout/item_main_home_lives_pola.xml | 316 ++++++++++++++++++ .../main/res/layout/view_live_week_item.xml | 28 +- .../layout/view_main_home_sud_game_list2.xml | 10 +- main/src/main/res/layout/view_main_me2.xml | 3 +- .../main/res/layout/view_main_message2.xml | 75 +++-- .../res/layout/view_main_message_head.xml | 19 +- .../res/mipmap-hdpi/ic_yola_live_fire.png | Bin 0 -> 373 bytes .../res/mipmap-mdpi/ic_yola_live_fire.png | Bin 0 -> 254 bytes .../res/mipmap-xhdpi/ic_yola_live_fire.png | Bin 0 -> 461 bytes .../res/mipmap-xxhdpi/ic_yola_live_fire.png | Bin 0 -> 750 bytes .../res/mipmap-xxxhdpi/ic_yola_live_fire.png | Bin 0 -> 788 bytes 26 files changed, 501 insertions(+), 114 deletions(-) create mode 100644 live/src/main/res/drawable/background_40000_9.xml create mode 100644 live/src/main/res/mipmap-hdpi/ic_yola_msg_more.png create mode 100644 live/src/main/res/mipmap-mdpi/ic_yola_msg_more.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_yola_msg_more.png create mode 100644 live/src/main/res/mipmap-xxhdpi/ic_yola_msg_more.png create mode 100644 live/src/main/res/mipmap-xxxhdpi/ic_yola_msg_more.png create mode 100644 main/src/main/res/layout/item_main_home_lives_pola.xml create mode 100644 main/src/main/res/mipmap-hdpi/ic_yola_live_fire.png create mode 100644 main/src/main/res/mipmap-mdpi/ic_yola_live_fire.png create mode 100644 main/src/main/res/mipmap-xhdpi/ic_yola_live_fire.png create mode 100644 main/src/main/res/mipmap-xxhdpi/ic_yola_live_fire.png create mode 100644 main/src/main/res/mipmap-xxxhdpi/ic_yola_live_fire.png diff --git a/live/src/main/res/drawable/background_40000_9.xml b/live/src/main/res/drawable/background_40000_9.xml new file mode 100644 index 000000000..302471008 --- /dev/null +++ b/live/src/main/res/drawable/background_40000_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/mipmap-hdpi/ic_yola_msg_more.png b/live/src/main/res/mipmap-hdpi/ic_yola_msg_more.png new file mode 100644 index 0000000000000000000000000000000000000000..6a76e19d55bfd6668c8d10c8f47a4abdaf2874ac GIT binary patch literal 272 zcmV+r0q_2aP)Px#%1J~)R7gwhlrav%FbqZQF6|h_VxpXp5sm;OX9OnXC?hN}s>D#TSdNM+Bxg*V zy!hMx2rDgIi3@)R9*BrU1XD^60C-uIYst6|A)FC$Kfy%gl5;)+z|#UZgJX=Nh+OB8 zuIol-zW)?VMB7rzZ4N=iT}tU|Py2*9V*nUJ2&YQwgSE~r;3=6t#<)R5VP>}0cY2@| ztSPCUJ6M(I6W|8o2BP*#>o~cAsM6K}tx}soOM%@$+(6XkYwc<`5LMcx=GY9XFT4RY WC6FH)wcB0*0000m+35|^&lU~CsS#PVQTNo2jW z61SAwCj*sZJG^e~ec)8&{XpksNh3qf(~DJyYP7GnP1~Eu|H1#}&l|Q*D~-JGJ@fzh bTGL+cS)k~>!bgojiy1s!{an^LB{Ts5=z&1e literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xhdpi/ic_yola_msg_more.png b/live/src/main/res/mipmap-xhdpi/ic_yola_msg_more.png new file mode 100644 index 0000000000000000000000000000000000000000..b93728c19b8de864fe3ee3e4cf573f04ceba4d14 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEjKx9jP7LeL$-D$|E_k{)hD5l( zoo36$kLn47MPx$x=BPqRA@u(T1!d;K@fd4Ai7NF4B|#m1n~+YZUnDmT&UL(+=zGu5rP3X;u)r9 z84;#rU0KQc96u_?sa5umqgbx5mOF(_9YVj?P4cZ0pa5y|S zvnK$1ivXF~kBD5W>T@pu4+evgh}^9LV`if)%O3gy_(nwT*8slFvTWs=O_1SY=@7!D znLW-7tNFc8MdZq3V!HqaP+Uh70EbIdnyBjWCKOy(!wYb+kK$T-2XIgguX0#@t7>sC z_v>1!m@g)Fp66!(Ohm@2`r>gNRsB5`UgtKK?*!~ZbAwH&aD(K#w5Gx?G&k6U3P&cN zi3byp$QE-s!%RFDsK~@4lC@nd&BWusdQ3bbIokjKVJ052q+C+hWoS8LTG@_(+oVQ} zy-?v8thT8p6>gInG4|rEFcS|Z9x;48Q`5!LOgxx)0A|KF9x;xy%NgbykMe;U-+09E z@LWwVOFKZR*MflS@zmW_RJgm^)!R80uE$e%SN#EOfdWkYT7mlj0000VAAn)aSW-5 zdwct%FO#9j@sImvFW}{Vz_zI|r%BkNX-A{qg4rFyC)jo|Y!ME~e9$v%0sH=DkrP{K%Mul6i7g`}Z!BIv{Xpb@97R$p<$} zJl^s6)?&TYoCfcMGkZ36Wv_pv#1+HAc%atm#q(PNPCviq_UqQ?n)Vy^{fjE;+8=(o z@!s#1Gw+sZT0O6s8?@??PlWIS^Ua@}H@)WhQQ6aJ7+2D0cXU=3gZD<6CDps0-uvA- z^KOmhwKLcLH||-}`##&!Vf)gstBtll=a)z`xaKi1im)EBki`-P0uF%=J>l0I&$PB$ zpL(prxZY(ZH+RFCR@Oba-wnmXcqFs6s?M~!?&Vb|PHdgHbHk$Tl9@*0V!SiCS2yI& z+gT7lDSd-~DZlW!18;7tGHKj1#BCKYxPdy~X%r_i_V3)#aXco1 { headVh.setIsRecyclable(false); return headVh; case WEEKLAYOUT: - return new MainHomeLiveWeekItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false)); +// View itemView= mInflater.inflate(R.layout.item_main_home_lives, parent, false); +// int width= (UIUtil.getScreenWidth(mContext) - UIUtil.dip2px(mContext,37))/2; +// itemView.setLayoutParams(new ViewGroup.LayoutParams(width , (int) (width*1.235))); + return new MainHomeLiveWeekItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives_pola, parent, false)); default: - return new MainHomeLiveItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives, parent, false)); +// View itemView2= mInflater.inflate(R.layout.item_main_home_lives_pola, parent, false); +// int width2= (UIUtil.getScreenWidth(mContext) - UIUtil.dip2px(mContext,37))/2; +// itemView2.setLayoutParams(new ViewGroup.LayoutParams(width2 , (int) (width2*1.235))); + return new MainHomeLiveItemViewHolder(mInflater.inflate(R.layout.item_main_home_lives_pola, parent, false)); } } diff --git a/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentComViewHolder.java b/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentComViewHolder.java index 62273bba0..60e7257c4 100644 --- a/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentComViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/AbsMainHomeParentComViewHolder.java @@ -234,11 +234,15 @@ public abstract class AbsMainHomeParentComViewHolder extends AbsMainViewHolder { mIndicator.setNavigator(commonNavigator); ViewPagerHelper.bind(mIndicator, mViewPager); //默认选择第几个 - mIndicator.onPageSelected(1); - mViewPager.setCurrentItem(1); + mIndicator.onPageSelected(getDefaultSelect()); + mViewPager.setCurrentItem(getDefaultSelect()); unReadMsgHandle(); } + public int getDefaultSelect(){ + return 1; + } + private void unReadMsgHandle() { String unReadCount = "0"; if (SpUtil.getInstance().getBooleanValue(SpUtil.HAS_SYSTEM_MSG)) { diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java index 7e24e732a..b34b18e6b 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveItemViewHolder.java @@ -9,6 +9,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; import com.jakewharton.rxbinding3.view.RxView; @@ -113,7 +114,8 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder { //直播中 mType.setImageResource(MainIconUtil.getLiveTypeIcon(bean.getType())); mType.setVisibility(View.VISIBLE); - mLiveIco.setImageResource(R.mipmap.icon_main_rest_work); + mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot); + mLiveIco.setVisibility(View.VISIBLE); mNum.setVisibility(View.VISIBLE); liveType.setVisibility(View.VISIBLE); mLiveState.setText(mContext.getString(R.string.lives_state)); @@ -122,7 +124,8 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder { //休息中 mType.setImageResource(MainIconUtil.getLiveTypeIcon(Constants.LIVE_TYPE_RESTING)); mType.setVisibility(View.GONE); - mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot); + // mLiveIco.setImageResource(R.mipmap.icon_main_rest_spot); + mLiveIco.setVisibility(View.INVISIBLE); mLiveState.setText(mContext.getString(R.string.rest_state)); liveType.setVisibility(View.GONE); mNum.setVisibility(View.GONE); @@ -153,7 +156,7 @@ public class MainHomeLiveItemViewHolder extends RecyclerView.ViewHolder { } else { viewBg.setVisibility(View.GONE); } - RelativeLayout.LayoutParams dragon_moneyLayoutParams = (RelativeLayout.LayoutParams) dragon_money.getLayoutParams(); + ConstraintLayout.LayoutParams dragon_moneyLayoutParams = (ConstraintLayout.LayoutParams) dragon_money.getLayoutParams(); if (bean.getRedPacketStatus() == 1) { dragon_moneyLayoutParams.topMargin = DpUtil.dp2px(55); redPacket.setVisibility(View.VISIBLE); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java index 237223194..82a2e3cb9 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java @@ -107,7 +107,7 @@ public class MainHomeLiveWeekItemViewHolder extends RecyclerView.ViewHolder { TextView textView = rootView.findViewById(R.id.name2); TextView title = rootView.findViewById(R.id.title); ImageView imageView = rootView.findViewById(R.id.week_live); - ImgLoader.display2(itemView.getContext(), model.getAnchor_avatar(), imageView,400,400); + ImgLoader.display2(itemView.getContext(), model.getAnchor_avatar(), imageView,itemView.getWidth(),itemView.getHeight()); textView.setText(model.getAnchor_name()); title.setText(model.getContent()); viewflipperBanner.addView(rootView); diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java index 71fe0c5de..1be5fae49 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java @@ -148,13 +148,8 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O typeHot = list.get(0).getEnglish(); select = list.get(0).getId(); } + list.add(0, getCoLiveClass()); list.add(0, getAttentionLiveClass()); - if (list.size() > 2) { - list.add(2, getCoLiveClass()); - } else { - list.add(getCoLiveClass()); - } - mShadow = findViewById(R.id.shadow); mBtnDismiss = findViewById(R.id.btn_dismiss); @@ -192,7 +187,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O } }); mRefreshView.setLayoutManager(gridLayoutManager); - ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 5, 0); + ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 7); decoration.setOnlySetItemOffsetsButNoDraw(true); mRefreshView.setItemDecoration(decoration); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); @@ -215,7 +210,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O targetList.addAll(list); } final MainHomeLivesClassAdapter topAdapter = new MainHomeLivesClassAdapter(mContext, targetList, false); - topAdapter.choice = 1; + topAdapter.choice = 2; topAdapter.setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(LiveClassBean bean, int position) { @@ -252,7 +247,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O if (position == 0) { Log.i("MainHomeViewHolder2", "mLiveOptFollAgent:"); flag= changeLiveOptAgent(mLiveOptFollAgent); - } else if (position == 2) { + } else if (position == 1) { Log.i("MainHomeViewHolder2", "mLiveOptComAgent:"); flag= changeLiveOptAgent(mLiveOptComAgent); } else { diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageHeadViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMessageHeadViewHolder.java index 9c9333e9f..12b8a3176 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMessageHeadViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainMessageHeadViewHolder.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import android.view.ViewGroup; import android.widget.FrameLayout; +import com.lxj.xpopup.XPopup; import com.yunbao.common.utils.MobclickAgent; import com.yunbao.common.utils.ProcessResultUtil; import com.yunbao.common.utils.RouteUtil; @@ -23,6 +24,8 @@ public class MainMessageHeadViewHolder extends AbsMainHomeParentComViewHolder { private boolean floatWarOrder; private String homeZdyPop; + XPopup.Builder moreXPopup; + public boolean isFloatWarOrder() { return floatWarOrder; @@ -92,7 +95,7 @@ public class MainMessageHeadViewHolder extends AbsMainHomeParentComViewHolder { } else if (position == 0) { mainMessageViewHolder2 = new MainMessageViewHolder2((MainActivity) mContext, parent); vh = mainMessageViewHolder2; - + mainMessageViewHolder2.setMoreView(findViewById(R.id.moreImg)); } else if (position == 1) { systemMessageViewHolder2 = new SystemMessageViewHolder2(mContext, parent,(MainActivity) mContext); vh = systemMessageViewHolder2; @@ -125,5 +128,8 @@ public class MainMessageHeadViewHolder extends AbsMainHomeParentComViewHolder { return new String[]{mContext.getString(R.string.activity_msg_title), mContext.getString(R.string.interaction_type)}; } - + @Override + public int getDefaultSelect() { + return 0; + } } diff --git a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java index 6a59ef05a..2d5a21831 100644 --- a/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/MainMessageViewHolder2.java @@ -134,6 +134,7 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { private MainActivity mContext; XPopup.Builder moreXPopup; private String homeZdyPop; + private View more; private ViewPager2 viewPager; private MagicIndicator mIndicator; @@ -187,6 +188,9 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { MessageIMManager.get(mContext).resetImUnReadMessageCount(mContext); } + public void setMoreView(View view){ + more=view; + } @Override public void init() { EventBus.getDefault().register(this); @@ -239,6 +243,13 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { netHandler = new Handler(Looper.getMainLooper()); + if(more!=null){ + moreXPopup = new XPopup.Builder(mContext).atView(more); + more.setOnClickListener(view -> { + moreXPopup.asCustom(new MsgMoreDialog(mContext)).show(); + }); + } + initData(); } @@ -466,6 +477,7 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { tabLayout1.setVisibility(View.GONE); tabLayout2.setVisibility(View.GONE); tabLayout3.setVisibility(View.GONE); + findViewById(R.id.line).setVisibility(View.GONE); //tabLayouts.setLayoutParams(params); } else if (userType == 1) {//主播A tab_icon.setVisibility(View.VISIBLE); @@ -549,9 +561,16 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { @Override public void onSuccess(MessageChatIsAnchor data) { DebugUtils.runDebugCode(() -> { + if(more!=null){ + more.setVisibility(View.VISIBLE); + } + }); if (data.getIsAnchor() == 1 && CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C")) { userType = 2;//主播B + if(more!=null){ + more.setVisibility(View.VISIBLE); + } viewPager.setUserInputEnabled(true); //mIndicator.setVisibility(View.VISIBLE); } else if (CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C")) { @@ -595,17 +614,17 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { textNewsNotice.setVisibility(View.GONE); } else { textNewsNotice.setVisibility(View.VISIBLE); - setChatApt(userBean.getType(),officialDate,officialContent); +// setChatApt(userBean.getType(),officialDate,officialContent); // officialDate.setText(userBean.getLastDate()); // officialContent.setText(userBean.getContent()); -// int numberInt = Integer.parseInt(userBean.getNum()); -// if (numberInt > 99) { -// textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); -// textNewsNotice.setText("99+"); -// } else { -// textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); -// textNewsNotice.setText(String.valueOf(numberInt)); -// } + int numberInt = Integer.parseInt(userBean.getNum()); + if (numberInt > 99) { + textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); + textNewsNotice.setText("99+"); + } else { + textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); + textNewsNotice.setText(String.valueOf(numberInt)); + } } //ImgLoader.display(mContext, userBean.getNewImage(), imgNewsNotice); @@ -659,17 +678,17 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { textSystemMessages.setVisibility(View.GONE); } else { textSystemMessages.setVisibility(View.VISIBLE); - systemDate.setText(userBean.getLastDate()); - systemContent.setText(userBean.getContent()); +// systemDate.setText(userBean.getLastDate()); +// systemContent.setText(userBean.getContent()); -// int numberInt = Integer.parseInt(userBean.getNum()); -// if (numberInt > 99) { -// textSystemMessages.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); -// textSystemMessages.setText("99+"); -// } else { -// textSystemMessages.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); -// textSystemMessages.setText(String.valueOf(numberInt)); -// } + int numberInt = Integer.parseInt(userBean.getNum()); + if (numberInt > 99) { + textSystemMessages.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); + textSystemMessages.setText("99+"); + } else { + textSystemMessages.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); + textSystemMessages.setText(String.valueOf(numberInt)); + } } //ImgLoader.display(mContext, userBean.getNewImage(), imgSystemMessages); ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.systemClickView), () -> { @@ -788,18 +807,18 @@ public class MainMessageViewHolder2 extends AbsMainHomeChildViewHolder { textNewsNotice.setVisibility(View.GONE); textNewsNotice.setText(""); } else { - // String number = textNewsNotice.getText().toString().trim(); + String number = textNewsNotice.getText().toString().trim(); textNewsNotice.setVisibility(View.VISIBLE); - setChatApt(model.getType(),officialDate,officialContent); -// int numberInt = Integer.parseInt(number) + 1; -// if (numberInt > 99) { -// textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); -// textNewsNotice.setText("99+"); -// } else { -// textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); -// textNewsNotice.setText(String.valueOf(numberInt)); -// } + // setChatApt(model.getType(),officialDate,officialContent); + int numberInt = Integer.parseInt(number) + 1; + if (numberInt > 99) { + textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9); + textNewsNotice.setText("99+"); + } else { + textNewsNotice.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12); + textNewsNotice.setText(String.valueOf(numberInt)); + } } diff --git a/main/src/main/res/layout/activity_main.xml b/main/src/main/res/layout/activity_main.xml index c1312181b..812b3991a 100644 --- a/main/src/main/res/layout/activity_main.xml +++ b/main/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#F7F7F7" + android:background="@color/white" app:contentAlpha="0.5" app:contentToggle="true" app:slideMode="left" diff --git a/main/src/main/res/layout/item_main_home_lives.xml b/main/src/main/res/layout/item_main_home_lives.xml index 0d704d999..848681f80 100644 --- a/main/src/main/res/layout/item_main_home_lives.xml +++ b/main/src/main/res/layout/item_main_home_lives.xml @@ -119,7 +119,7 @@ + android:layout_marginBottom="10dp"> + android:textSize="12sp" /> @@ -183,16 +184,18 @@ android:layout_marginBottom="40dp" android:src="@mipmap/multiplayerpk" /> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/main/src/main/res/layout/view_live_week_item.xml b/main/src/main/res/layout/view_live_week_item.xml index eb410dab7..eef5e74ea 100644 --- a/main/src/main/res/layout/view_live_week_item.xml +++ b/main/src/main/res/layout/view_live_week_item.xml @@ -1,22 +1,28 @@ - + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:layout_height="0dp" /> - + diff --git a/main/src/main/res/layout/view_main_home_sud_game_list2.xml b/main/src/main/res/layout/view_main_home_sud_game_list2.xml index 7d4e27496..237302711 100644 --- a/main/src/main/res/layout/view_main_home_sud_game_list2.xml +++ b/main/src/main/res/layout/view_main_home_sud_game_list2.xml @@ -4,16 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:src="@mipmap/bg_yola_index" android:orientation="vertical"> - + @@ -22,7 +22,6 @@ + android:orientation="vertical" + tools:background="@color/white"> + @@ -55,6 +56,7 @@ android:layout_marginEnd="18dp" android:textColor="@color/rc_auxiliary_color" android:textSize="12sp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/official_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/official_title" @@ -72,6 +74,7 @@ android:paddingEnd="6dp" android:textColor="@color/rc_secondary_color" android:textSize="12dp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/official_portrait" app:layout_constraintEnd_toStartOf="@+id/official_unread_count" app:layout_constraintStart_toStartOf="@+id/official_title" @@ -80,19 +83,19 @@ - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/official_portrait" + tools:visibility="visible" /> @@ -106,6 +109,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/system_portrait" /> + @@ -143,6 +147,7 @@ android:layout_marginEnd="18dp" android:textColor="@color/rc_auxiliary_color" android:textSize="12sp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/system_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/system_title" @@ -160,6 +165,7 @@ android:paddingEnd="6dp" android:textColor="@color/rc_secondary_color" android:textSize="12dp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/system_portrait" app:layout_constraintEnd_toStartOf="@+id/system_unread_count" app:layout_constraintStart_toStartOf="@+id/system_title" @@ -168,19 +174,19 @@ - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/system_portrait" + tools:visibility="visible" /> @@ -365,13 +371,14 @@ tools:visibility="visible" /> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tab1" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tab1" /> + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/main/src/main/res/layout/view_main_message_head.xml b/main/src/main/res/layout/view_main_message_head.xml index f59fcdce3..fe80a0353 100644 --- a/main/src/main/res/layout/view_main_message_head.xml +++ b/main/src/main/res/layout/view_main_message_head.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:background="@color/white" + android:background="@mipmap/bg_yola_index" android:orientation="vertical"> @@ -47,6 +47,19 @@ app:layout_constraintTop_toTopOf="parent" /> + + + + diff --git a/main/src/main/res/mipmap-hdpi/ic_yola_live_fire.png b/main/src/main/res/mipmap-hdpi/ic_yola_live_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..7594e2a764dfe8a85912f6b25ee55c56f2f99a79 GIT binary patch literal 373 zcmV-*0gC>KP)Px$FG)l}R5(wil0PU#aTLct-)xkH6q76lluTCkH!3!TU2ib@vq~1P7|Eb4Bt|P` z&>Li7e3)zsrH*@af4c8__r7~`>n^wR`JQvX->>+`qb%0UI)NcccUd!e@Br`#%t*Ru zC6EVC0@pEAk#wFG$b;9S;q@5!1g3zxr1v0_2R{S-iESr9EqZ$;9sBnt*vxt)y_#7C zI7^-R1z{=#N92HXJqz!K2WrUDa5_!5{d(V5y0 zY-S_C70_J*ZUlG{*eh^qlXietBj-0tZ1vHn053-;Z>OVcBeoM@ciOAiRdD;8N11fn zw{I2r?+>6VX*XRGFUV$;^Px#xJg7oR47x8&@D~_Q4j#&Z^8*GY6uB}kRp*FIRSzLkksHfLem6+!;n-VQ8)ww zfkxIhbrpL7f})+aWFOhkrQykW-~5JuzWD7jvyYF6cxwK&!4a--84-^Kx4{Vx@rkol zQWX)iADEf@=;5`|@)>)p*y%US%r5S0c-(+IY)c^nh literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-xhdpi/ic_yola_live_fire.png b/main/src/main/res/mipmap-xhdpi/ic_yola_live_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..89e8c459dd67129dba9a6ec417f7c7185785e777 GIT binary patch literal 461 zcmV;;0W$uHP)Px$hev{bym!6pZntyJ=l;+C{LlZ2e}44O9+^Nh+lW3~lyqAy zfUMvXPyj|H?Nvgnf@anTIOxwSFj5K40`>#DK~#?RNIESSX%=u9m`^Rf06KvNN%!Gc z7VsKqE)&fha0zrsT1v)$fM!;Z&jDNWN%hC((kg3a7db zOaUdJT~g^A=+OZWKp)ToY*nedXP`cwvmWJhIt?aUECMq?Q?)`4#@~U~G?;AB2kZWT zB~ur_Kr`!(l6zDG5-vFm!L>NSdCcb!JdX~cEsy4FL-4J}yoE75hTu!wQSt=26M_eR z>GNoxohSj!Y#i9k0q#rcOV^=y=7}268=zOxT^jUaUX5=_R`(1TlH_Rle~Oun0V^4< zo;Qctq&xiz#;wa+|0FON*QdXGGw`-`==qj(oZiLPx%s7XXYR9HvVms^NVQ5462f0Lrzib5%&hBTT%O5{ayXO{N{_VBb-fR80=p$1f zarwW%X4VLd0ZvN#k!9C1MQmoPfmWa$*d^&+T6k9QHsEj!dk@T(^f(PXEBFwwy#VwR zs7nJ+4K}lZz!_j!5a9=4k)&HmBF_RI9szCw6N&(y0u7QrSAu5&JMc-FiCZLX^8aQw zNYa;LzFEKrfZY`$S}3XA%=UX)Bs~oMvw&X#BP)PAB-NT(Gq4kwA?an|n37;KtC94p z(Amt^0;ekF5BLhq2c`i>fU`i8q^|C<<-k*c7n0t^`RWIB0OJ#Y-DNK@IXVw(V*eeI z{2KnXa^O9{8%ZrOczskRj{`Lc!RLXQz^DTMDUu#k0(Syl3ReIFfQ!JKgiv>T3k(DL z7mT?NOqKMzXvAhV5qK0|n>t`Ca4-e5l&e>`4U$?*fiD0{;zP2Sx>Me6z2zCMI zT_sOD3N(jc?Sa zuu9UU?s4T5h|3mlVPjK5LidlrQc2eff0R|3W;Pmd=`$}-5=qwLTkB%NbJ{~RmfY%a zRx@kzSD{amgczxeXOTAB2b_>pv?wLk)n+z0%6l!a7?>L?$PrQRcFF4RraRGl>Ta~S ga}Ji|ugH@22k4UD5>3jMrT_o{07*qoM6N<$f;;wC3IG5A literal 0 HcmV?d00001 diff --git a/main/src/main/res/mipmap-xxxhdpi/ic_yola_live_fire.png b/main/src/main/res/mipmap-xxxhdpi/ic_yola_live_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..a6fd3e6713d9e22aed178da526c45d01d0da7af2 GIT binary patch literal 788 zcmV+v1MB>WP)Px%&PhZ;R9HvtncGzxF%X7lI!HRe9fS@-1waLa3V;e?Dgal2sUW0+xPznvoC@L& zCj0M^e6(6!SF;;GMCb5gq|v9*Xl~1N;)73|kNyL;-jJFGMPyAxJ7(UsLb>ZT0e^IW zpF81eW`5LyoC6SSzli9XnfI-rnt*?Z=z{|UxQkXu6+jUI7y$jz45H76$fPI*N}`RKoNoF zpuyVl$joa85bJUEh(Lpp1r(99STqokDcS?Tp|ib@BI3UOperf?#3KMC?BzH_1a1Wz zOdTt;{*xo%jhU}qfhB-&!Z*x(?g38Ko)v@i41fMWlJRDLECIA>6as&r>owS(3j=#| zwP*h~xauSz><@0htlV^=>fZbY=-QWCV+#Ev!h#&2`%1reuk1=hYW-dfn4JrU4p(%@ z0lIbu)gw$*g{moZW=$U!qksWB!>Qbav|;a}rG0Xd0{j^<;v(rvlU6~%$^<}(B`D@0 z2DrpSC^^`61emBVN(5@p*@pn9CIH%SkT-TS3;DU?!-Oq- S7zO+Q0000