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 000000000..6a76e19d5
Binary files /dev/null and b/live/src/main/res/mipmap-hdpi/ic_yola_msg_more.png differ
diff --git a/live/src/main/res/mipmap-mdpi/ic_yola_msg_more.png b/live/src/main/res/mipmap-mdpi/ic_yola_msg_more.png
new file mode 100644
index 000000000..7b93d5c7c
Binary files /dev/null and b/live/src/main/res/mipmap-mdpi/ic_yola_msg_more.png differ
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 000000000..b93728c19
Binary files /dev/null and b/live/src/main/res/mipmap-xhdpi/ic_yola_msg_more.png differ
diff --git a/live/src/main/res/mipmap-xxhdpi/ic_yola_msg_more.png b/live/src/main/res/mipmap-xxhdpi/ic_yola_msg_more.png
new file mode 100644
index 000000000..1743d7457
Binary files /dev/null and b/live/src/main/res/mipmap-xxhdpi/ic_yola_msg_more.png differ
diff --git a/live/src/main/res/mipmap-xxxhdpi/ic_yola_msg_more.png b/live/src/main/res/mipmap-xxxhdpi/ic_yola_msg_more.png
new file mode 100644
index 000000000..f32740363
Binary files /dev/null and b/live/src/main/res/mipmap-xxxhdpi/ic_yola_msg_more.png differ
diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
index 78e6ad58b..c62131fa4 100644
--- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
@@ -35,6 +35,8 @@ import com.yunbao.main.R;
import com.yunbao.main.views.MainHomeLiveItemViewHolder;
import com.yunbao.main.views.MainHomeLiveWeekItemViewHolder;
+import net.lucode.hackware.magicindicator.buildins.UIUtil;
+
import java.util.List;
@@ -117,9 +119,15 @@ public class MainHomeLiveAdapter extends RefreshAdapter {
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 000000000..7594e2a76
Binary files /dev/null and b/main/src/main/res/mipmap-hdpi/ic_yola_live_fire.png differ
diff --git a/main/src/main/res/mipmap-mdpi/ic_yola_live_fire.png b/main/src/main/res/mipmap-mdpi/ic_yola_live_fire.png
new file mode 100644
index 000000000..3423d0bec
Binary files /dev/null and b/main/src/main/res/mipmap-mdpi/ic_yola_live_fire.png differ
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 000000000..89e8c459d
Binary files /dev/null and b/main/src/main/res/mipmap-xhdpi/ic_yola_live_fire.png differ
diff --git a/main/src/main/res/mipmap-xxhdpi/ic_yola_live_fire.png b/main/src/main/res/mipmap-xxhdpi/ic_yola_live_fire.png
new file mode 100644
index 000000000..52b9266d0
Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/ic_yola_live_fire.png differ
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 000000000..a6fd3e671
Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/ic_yola_live_fire.png differ