Merge remote-tracking branch 'origin/新潘多拉' into 新潘多拉
# Conflicts: # app/tmp/full-r8-config.txt # gradle.properties
This commit is contained in:
@@ -32,9 +32,11 @@ import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.constraintlayout.widget.Group;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.lifecycle.ViewModelProvider;
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter;
|
||||
import androidx.viewpager2.widget.ViewPager2;
|
||||
|
||||
@@ -43,12 +45,15 @@ import com.binioter.guideview.Guide;
|
||||
import com.binioter.guideview.GuideBuilder;
|
||||
import com.facebook.appevents.AppEventsLogger;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.lxj.xpopup.core.BasePopupView;
|
||||
import com.lxj.xpopup.enums.PopupPosition;
|
||||
import com.lxj.xpopup.interfaces.XPopupCallback;
|
||||
import com.opensource.svgaplayer.SVGADrawable;
|
||||
import com.opensource.svgaplayer.SVGAImageView;
|
||||
import com.opensource.svgaplayer.SVGAParser;
|
||||
import com.opensource.svgaplayer.SVGAVideoEntity;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
import com.yunbao.common.fragment.ChatViewModel;
|
||||
import com.yunbao.common.fragment.MainMessageRecommendFragment;
|
||||
import com.yunbao.common.utils.DebugUtils;
|
||||
import com.yunbao.common.utils.DialogUitl;
|
||||
@@ -73,6 +78,7 @@ import com.yunbao.common.utils.ToastUtil;
|
||||
import com.yunbao.common.utils.ViewPageIndicatorUtils;
|
||||
import com.yunbao.common.utils.WordUtil;
|
||||
import com.yunbao.common.views.AbsMainViewHolder;
|
||||
import com.yunbao.common.views.MsgChatTypeSelectPoPupView;
|
||||
import com.yunbao.common.views.MsgRecommendPopupView;
|
||||
import com.yunbao.common.views.MsgSysDelPopupView;
|
||||
import com.yunbao.common.views.weight.ViewClicksAntiShake;
|
||||
@@ -132,17 +138,20 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
private MagicIndicator mIndicator;
|
||||
private List<AbsMainMessageChatListFragment> fragmentList;
|
||||
|
||||
private ConstraintLayout tabLayout1, tabLayout2, tabLayout3;
|
||||
private Group tabLayout1, tabLayout2, tabLayout3;
|
||||
private TextView tab1, tab2, tab3;
|
||||
private ImageView imageView1, imageView2, imageView3;
|
||||
private View tab_line1, tab_line2, tab_line3;
|
||||
private ImageView tab_icon;
|
||||
|
||||
private List<ConstraintLayout> relativeLayouts = new ArrayList<>();
|
||||
private List<Group> relativeLayouts = new ArrayList<>();
|
||||
private List<TextView> tabTexts = new ArrayList<>();
|
||||
private List<View> tabLine = new ArrayList<>();
|
||||
private LinearLayout tabLayouts;
|
||||
private List<ImageView> tabExpend = new ArrayList<>();
|
||||
private ConstraintLayout tabLayouts;
|
||||
|
||||
private int userType = 0; // (0)普通用户 (1)主播A (2)主播B
|
||||
ChatViewModel chatViewModel;
|
||||
|
||||
public MainMessageViewHolder setHomeZdyPop(String homeZdyPop) {
|
||||
this.homeZdyPop = homeZdyPop;
|
||||
@@ -156,6 +165,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
public MainMessageViewHolder(MainActivity context, ViewGroup parentView) {
|
||||
super(context, parentView);
|
||||
mContext = context;
|
||||
chatViewModel= (new ViewModelProvider(mContext)).get(ChatViewModel.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -193,14 +203,28 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
tabLayouts = findViewById(R.id.tabLayouts);
|
||||
|
||||
tab_icon = findViewById(R.id.tab_icon);
|
||||
tabLayout1 = findViewById(R.id.tabLayout1);
|
||||
tabLayout2 = findViewById(R.id.tabLayout2);
|
||||
tabLayout3 = findViewById(R.id.tabLayout3);
|
||||
tabLayout1 = findViewById(R.id.group_tab1);
|
||||
tabLayout2 = findViewById(R.id.group_tab2);
|
||||
tabLayout3 = findViewById(R.id.group_tab3);
|
||||
|
||||
tab1 = findViewById(R.id.tab1);
|
||||
tab2 = findViewById(R.id.tab2);
|
||||
tab3 = findViewById(R.id.tab3);
|
||||
|
||||
imageView1 = findViewById(R.id.expendImg1);
|
||||
imageView2 = findViewById(R.id.expendImg2);
|
||||
imageView3 = findViewById(R.id.expendImg3);
|
||||
|
||||
imageView1.setOnClickListener(view -> {
|
||||
selectChatType(view, 0);
|
||||
});
|
||||
imageView2.setOnClickListener(view -> {
|
||||
selectChatType(view, 1);
|
||||
});
|
||||
imageView3.setOnClickListener(view -> {
|
||||
selectChatType(view, 2);
|
||||
});
|
||||
|
||||
tab_line1 = findViewById(R.id.tab_line1);
|
||||
tab_line2 = findViewById(R.id.tab_line2);
|
||||
tab_line3 = findViewById(R.id.tab_line3);
|
||||
@@ -224,6 +248,73 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
});
|
||||
}
|
||||
|
||||
private void selectChatType(View view, int position) {
|
||||
AbsMainMessageChatListFragment fragment = fragmentList.get(position);
|
||||
if (!(fragment instanceof MainMessageChatListFragment) || !(view instanceof ImageView)) {
|
||||
return;
|
||||
}
|
||||
MainMessageChatListFragment chatFragment = (MainMessageChatListFragment) fragment;
|
||||
ImageView expendImg = (ImageView) view;
|
||||
expendImg.setImageResource(R.mipmap.ic_expend_up);
|
||||
XPopup.Builder builder = new XPopup.Builder(mContext).atView(tabTexts.get(position));
|
||||
builder.offsetY(16);
|
||||
builder.dismissOnTouchOutside(true);
|
||||
builder.setPopupCallback(new XPopupCallback() {
|
||||
@Override
|
||||
public void onCreated(BasePopupView popupView) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void beforeShow(BasePopupView popupView) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onShow(BasePopupView popupView) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDismiss(BasePopupView popupView) {
|
||||
expendImg.setImageResource(R.mipmap.ic_expend_down);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void beforeDismiss(BasePopupView popupView) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBackPressed(BasePopupView popupView) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onKeyBoardStateChanged(BasePopupView popupView, int height) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDrag(BasePopupView popupView, int value, float percent, boolean upOrLeft) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClickOutside(BasePopupView popupView) {
|
||||
|
||||
}
|
||||
});
|
||||
builder.asCustom(new MsgChatTypeSelectPoPupView(mContext, chatFragment.getFilter(), new MsgChatTypeSelectPoPupView.ResultCallBack() {
|
||||
@Override
|
||||
public void callBack(int i,String str) {
|
||||
tabTexts.get(position).setText(str);
|
||||
chatFragment.setFilter(i);
|
||||
}
|
||||
})).show();
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void initFragment() {
|
||||
final String[] titles;
|
||||
fragmentList = new ArrayList<>();
|
||||
@@ -264,9 +355,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
return fragmentList.get(i);
|
||||
}
|
||||
});
|
||||
if(userType==1){
|
||||
if (userType == 1) {
|
||||
viewPager.setCurrentItem(1);
|
||||
}else{
|
||||
} else {
|
||||
viewPager.setCurrentItem(0);
|
||||
}
|
||||
viewPager.setUserInputEnabled(false);
|
||||
@@ -340,7 +431,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
@Override
|
||||
public void onPageSelected(int position) {
|
||||
super.onPageSelected(position);
|
||||
if(!StringUtil.isEmpty(search.getText().toString())) {
|
||||
if (!StringUtil.isEmpty(search.getText().toString())) {
|
||||
search.setText("");
|
||||
}
|
||||
selectTab(position);
|
||||
@@ -369,6 +460,12 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private void showChatTypeSelect() {
|
||||
|
||||
}
|
||||
|
||||
|
||||
private void initTabView() {
|
||||
relativeLayouts = new ArrayList<>();
|
||||
tabTexts = new ArrayList<>();
|
||||
@@ -382,14 +479,19 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
tabTexts.add(tab2);
|
||||
tabTexts.add(tab3);
|
||||
|
||||
tabExpend.add(imageView1);
|
||||
tabExpend.add(imageView2);
|
||||
tabExpend.add(imageView3);
|
||||
|
||||
tabLine.add(tab_line1);
|
||||
tabLine.add(tab_line2);
|
||||
tabLine.add(tab_line3);
|
||||
if (userType == 0) { //普通用户
|
||||
relativeLayouts.get(0).setVisibility(View.VISIBLE);
|
||||
tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
|
||||
tabTexts.get(0).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
|
||||
ViewGroup.LayoutParams params = tabLayouts.getLayoutParams();
|
||||
params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
|
||||
//tabExpend.get(0).setVisibility(View.VISIBLE);
|
||||
tabLayouts.setLayoutParams(params);
|
||||
} else if (userType == 1) {//主播A
|
||||
tab_icon.setVisibility(View.VISIBLE);
|
||||
@@ -409,10 +511,12 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
relativeLayouts.get(0).setVisibility(View.VISIBLE);
|
||||
tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_recommend));
|
||||
relativeLayouts.get(1).setVisibility(View.VISIBLE);
|
||||
tabTexts.get(1).setText(WordUtil.getNewString(R.string.message_chat_msg_all_an_a));
|
||||
tabTexts.get(1).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
|
||||
// tabExpend.get(1).setVisibility(View.VISIBLE);
|
||||
} else { //主播B
|
||||
tabExpend.get(0).setVisibility(View.VISIBLE);
|
||||
relativeLayouts.get(0).setVisibility(View.VISIBLE);
|
||||
tabTexts.get(0).setText(WordUtil.getNewString(R.string.message_chat_msg_all));
|
||||
tabTexts.get(0).setText(WordUtil.getNewString(chatViewModel.getTitleTextId()));
|
||||
relativeLayouts.get(1).setVisibility(View.VISIBLE);
|
||||
tabTexts.get(1).setText(WordUtil.getNewString(R.string.message_chat_msg_system));
|
||||
relativeLayouts.get(2).setVisibility(View.VISIBLE);
|
||||
@@ -420,7 +524,7 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
}
|
||||
for (int i = 0; i < relativeLayouts.size(); i++) {
|
||||
int finalI = i;
|
||||
relativeLayouts.get(i).setOnClickListener(new View.OnClickListener() {
|
||||
tabTexts.get(i).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
selectTab(finalI);
|
||||
@@ -428,9 +532,9 @@ public class MainMessageViewHolder extends AbsMainViewHolder {
|
||||
}
|
||||
});
|
||||
}
|
||||
if(userType==1){
|
||||
if (userType == 1) {
|
||||
selectTab(1);
|
||||
}else{
|
||||
} else {
|
||||
selectTab(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_gravity="end|bottom"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginTop="18dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
@@ -303,185 +303,412 @@
|
||||
android:layout_height="37dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tabLayouts"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="40dp"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="20dp">
|
||||
android:paddingStart="12dp"
|
||||
android:paddingEnd="12dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<TextView
|
||||
android:id="@+id/tab1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:maxWidth="100dp"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/view2"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="仅显示已读" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/tab_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:src="@mipmap/icon_msg_recommend"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tab1"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<View
|
||||
android:id="@+id/tab_line1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab1"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab1"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/expendImg1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="5dp"
|
||||
android:src="@mipmap/ic_expend_down"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tab1"
|
||||
app:layout_constraintStart_toEndOf="@+id/tab1"
|
||||
app:layout_constraintTop_toTopOf="@+id/tab1"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/group_tab1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout1"
|
||||
app:constraint_referenced_ids="tab1,tab_line1"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/view2"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tab2"
|
||||
app:layout_constraintStart_toEndOf="@+id/tab1"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tab2"
|
||||
android:maxWidth="100dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold"
|
||||
tools:visibility="visible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/view3"
|
||||
app:layout_constraintStart_toEndOf="@+id/view2"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="系统匹配" />
|
||||
|
||||
<View
|
||||
android:id="@+id/tab_line2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab2"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab2"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/expendImg2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
android:padding="5dp"
|
||||
android:src="@mipmap/ic_expend_down"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tab2"
|
||||
app:layout_constraintStart_toEndOf="@+id/tab2"
|
||||
app:layout_constraintTop_toTopOf="@+id/tab2"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/tab_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_toStartOf="@+id/tab_top1"
|
||||
android:src="@mipmap/icon_msg_recommend"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tab_top1"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tab_top1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tab1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="tab1"
|
||||
android:textSize="15dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/tab_line1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_below="@+id/tab_top1"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab1"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab1"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tab1" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/group_tab2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout2"
|
||||
app:constraint_referenced_ids="view2,tab2,tab_line2"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/view3"
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="1dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/tab3"
|
||||
app:layout_constraintStart_toEndOf="@+id/tab2"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:maxWidth="100dp"
|
||||
android:id="@+id/tab3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:textSize="15sp"
|
||||
android:textStyle="bold"
|
||||
tools:visibility="visible"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/view3"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:text="对方主动" />
|
||||
|
||||
<View
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tab_line3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab3"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab3"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/expendImg3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
android:padding="5dp"
|
||||
android:src="@mipmap/ic_expend_down"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/tab3"
|
||||
app:layout_constraintStart_toEndOf="@+id/tab3"
|
||||
app:layout_constraintTop_toTopOf="@+id/tab3"
|
||||
tools:visibility="gone" />
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tab_top2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tab2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="tab1"
|
||||
android:textSize="15dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/tab_line2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_below="@+id/tab_top2"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab2"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tab2" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
<androidx.constraintlayout.widget.Group
|
||||
android:id="@+id/group_tab3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tab_top3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tools:ignore="MissingConstraints">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tab3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="tab1"
|
||||
android:textSize="15dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="1.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<View
|
||||
android:id="@+id/tab_line3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_marginStart="3dp"
|
||||
android:layout_marginEnd="3dp"
|
||||
android:layout_height="3dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_below="@+id/tab_top3"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
app:layout_constraintEnd_toEndOf="@+id/tab3"
|
||||
app:layout_constraintStart_toStartOf="@+id/tab3"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tab3" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
app:constraint_referenced_ids="view3,tab3,tab_line3"/>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<!-- <LinearLayout-->
|
||||
<!-- android:id="@+id/tabLayouts"-->
|
||||
<!-- android:layout_width="match_parent"-->
|
||||
<!-- android:layout_height="40dp"-->
|
||||
<!-- android:gravity="center_vertical"-->
|
||||
<!-- android:paddingStart="20dp"-->
|
||||
<!-- android:paddingEnd="20dp">-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tabLayout1"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_weight="1"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- tools:visibility="visible">-->
|
||||
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/tab_icon"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_marginEnd="5dp"-->
|
||||
<!-- android:layout_toStartOf="@+id/tab_top1"-->
|
||||
<!-- android:src="@mipmap/icon_msg_recommend"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toStartOf="@+id/tab_top1"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:visibility="visible" />-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tab_top1"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="match_parent"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:gravity="center_horizontal"-->
|
||||
<!-- android:orientation="vertical"-->
|
||||
<!-- app:layout_constraintWidth_percent="0.8"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:ignore="MissingConstraints">-->
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:id="@+id/tab1"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:gravity="center"-->
|
||||
<!-- android:text="tab1"-->
|
||||
<!-- android:textSize="15dp"-->
|
||||
<!-- android:textStyle="bold"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="1.0"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent" />-->
|
||||
|
||||
<!-- <View-->
|
||||
<!-- android:id="@+id/tab_line1"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="3dp"-->
|
||||
<!-- android:layout_below="@+id/tab_top1"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:layout_marginStart="3dp"-->
|
||||
<!-- android:layout_marginTop="3dp"-->
|
||||
<!-- android:layout_marginEnd="3dp"-->
|
||||
<!-- android:background="@drawable/bg_main_com_type"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="@+id/tab1"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="@+id/tab1"-->
|
||||
<!-- app:layout_constraintTop_toBottomOf="@+id/tab1" />-->
|
||||
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/expendImg1"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:padding="5dp"-->
|
||||
<!-- android:src="@mipmap/ic_expend_down"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- android:layout_marginEnd="1dp"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="0.1"-->
|
||||
<!-- app:layout_constraintStart_toEndOf="@+id/tab_top1"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:visibility="visible" />-->
|
||||
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tabLayout2"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_weight="1"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- tools:visibility="visible">-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tab_top2"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="match_parent"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:gravity="center_horizontal"-->
|
||||
<!-- android:orientation="vertical"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:ignore="MissingConstraints">-->
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:id="@+id/tab2"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:gravity="center"-->
|
||||
<!-- android:text="tab1"-->
|
||||
<!-- android:textSize="15dp"-->
|
||||
<!-- android:textStyle="bold"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="1.0"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent" />-->
|
||||
|
||||
<!-- <View-->
|
||||
<!-- android:id="@+id/tab_line2"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="3dp"-->
|
||||
<!-- android:layout_below="@+id/tab_top2"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:layout_marginStart="3dp"-->
|
||||
<!-- android:layout_marginTop="3dp"-->
|
||||
<!-- android:layout_marginEnd="3dp"-->
|
||||
<!-- android:background="@drawable/bg_main_com_type"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="@+id/tab2"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="@+id/tab2"-->
|
||||
<!-- app:layout_constraintTop_toBottomOf="@+id/tab2" />-->
|
||||
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/expendImg2"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:padding="5dp"-->
|
||||
<!-- android:src="@mipmap/ic_expend_down"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="0.1"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toEndOf="@+id/tab_top2"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:visibility="visible" />-->
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tabLayout3"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_weight="1"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- tools:visibility="visible">-->
|
||||
|
||||
<!-- <androidx.constraintlayout.widget.ConstraintLayout-->
|
||||
<!-- android:id="@+id/tab_top3"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="match_parent"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:gravity="center_horizontal"-->
|
||||
<!-- android:orientation="vertical"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:ignore="MissingConstraints">-->
|
||||
|
||||
<!-- <TextView-->
|
||||
<!-- android:id="@+id/tab3"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:gravity="center"-->
|
||||
<!-- android:text="tab1"-->
|
||||
<!-- android:textSize="15dp"-->
|
||||
<!-- android:textStyle="bold"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="1.0"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent" />-->
|
||||
|
||||
<!-- <View-->
|
||||
<!-- android:id="@+id/tab_line3"-->
|
||||
<!-- android:layout_width="0dp"-->
|
||||
<!-- android:layout_height="3dp"-->
|
||||
<!-- android:layout_below="@+id/tab_top3"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:layout_marginStart="3dp"-->
|
||||
<!-- android:layout_marginTop="3dp"-->
|
||||
<!-- android:layout_marginEnd="3dp"-->
|
||||
<!-- android:background="@drawable/bg_main_com_type"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="@+id/tab3"-->
|
||||
<!-- app:layout_constraintStart_toStartOf="@+id/tab3"-->
|
||||
<!-- app:layout_constraintTop_toBottomOf="@+id/tab3" />-->
|
||||
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
|
||||
<!-- <ImageView-->
|
||||
<!-- android:id="@+id/expendImg3"-->
|
||||
<!-- android:layout_width="wrap_content"-->
|
||||
<!-- android:layout_height="wrap_content"-->
|
||||
<!-- android:layout_centerHorizontal="true"-->
|
||||
<!-- android:padding="5dp"-->
|
||||
<!-- app:layout_constraintHorizontal_bias="0.1"-->
|
||||
<!-- android:src="@mipmap/ic_expend_down"-->
|
||||
<!-- android:visibility="gone"-->
|
||||
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
|
||||
<!-- app:layout_constraintEnd_toEndOf="parent"-->
|
||||
<!-- app:layout_constraintStart_toEndOf="@+id/tab_top3"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent"-->
|
||||
<!-- tools:visibility="visible" />-->
|
||||
<!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
|
||||
<!-- </LinearLayout>-->
|
||||
|
||||
<androidx.viewpager2.widget.ViewPager2
|
||||
android:id="@+id/viewPager"
|
||||
|
||||
BIN
main/src/main/res/mipmap-mdpi/ic_expend_down.png
Normal file
BIN
main/src/main/res/mipmap-mdpi/ic_expend_down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 377 B |
BIN
main/src/main/res/mipmap-mdpi/ic_expend_up.png
Normal file
BIN
main/src/main/res/mipmap-mdpi/ic_expend_up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 366 B |
BIN
main/src/main/res/mipmap-xxhdpi/ic_expend_down.png
Normal file
BIN
main/src/main/res/mipmap-xxhdpi/ic_expend_down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1009 B |
BIN
main/src/main/res/mipmap-xxhdpi/ic_expend_up.png
Normal file
BIN
main/src/main/res/mipmap-xxhdpi/ic_expend_up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 950 B |
BIN
main/src/main/res/mipmap-xxxhdpi/ic_expend_down.png
Normal file
BIN
main/src/main/res/mipmap-xxxhdpi/ic_expend_down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 455 B |
BIN
main/src/main/res/mipmap-xxxhdpi/ic_expend_up.png
Normal file
BIN
main/src/main/res/mipmap-xxxhdpi/ic_expend_up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 433 B |
Reference in New Issue
Block a user