提交UI改变

This commit is contained in:
2024-10-09 16:39:02 +08:00
parent d79dba045d
commit bf8268712b
42 changed files with 436 additions and 330 deletions

View File

@@ -363,13 +363,13 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mMainHomeCommunityViewHolder.onPauseVideo();
}
break;
case 1:
case 2:
MobclickAgent.onEvent(mContext, "community", "社区");
if (mMainHomeCommunityViewHolder != null) {
mMainHomeCommunityViewHolder.onResumePlay();
}
break;
case 2:
case 1:
MobclickAgent.onEvent(mContext, "information", "消息");
if (mMainHomeCommunityViewHolder != null) {
mMainHomeCommunityViewHolder.onPauseVideo();
@@ -1302,11 +1302,11 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
vh = mainHomeViewHolder;
} else if (position == 1) {
} else if (position == 2) {
mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//社区
vh = mMainHomeCommunityViewHolder;
} else if (position == 2) {
} else if (position == 1) {
mainMessageViewHolder = new MainMessageViewHolder(this, parent);
vh = mainMessageViewHolder;

View File

@@ -97,7 +97,7 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
if (position == choice) {
mName.setBackgroundResource(R.drawable.button_ffc621);
mName.setTextColor(Color.parseColor("#FFC621"));
mName.setTextColor(Color.parseColor("#2ED0FF"));
} else {
mName.setBackgroundResource(R.drawable.button_cbd5e0);
mName.setTextColor(Color.parseColor("#484D68"));

View File

@@ -2,15 +2,20 @@ package com.yunbao.main.views;
import android.content.Context;
import android.graphics.Color;
import com.google.android.material.appbar.AppBarLayout;
import androidx.core.content.ContextCompat;
import androidx.viewpager.widget.ViewPager;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.yunbao.common.adapter.ViewPagerAdapter;
import com.yunbao.common.custom.MyViewPager;
import com.yunbao.common.utils.DpUtil;
import com.yunbao.common.utils.SpUtil;
import com.yunbao.common.views.AbsMainViewHolder;
@@ -41,7 +46,7 @@ import java.util.List;
public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
private AppBarLayout mAppBarLayout;
protected ViewPager mViewPager;
protected MyViewPager mViewPager;
private MagicIndicator mIndicator;
private TextView mRedPoint;//显示未读消息数量的红点
protected AbsMainHomeChildViewHolder[] mViewHolders;
@@ -59,7 +64,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
public void init() {
mAppBarLayout = (AppBarLayout) findViewById(R.id.appBarLayout);
View mAppBarChildAt = mAppBarLayout.getChildAt(0);
AppBarLayout.LayoutParams mAppBarParams = (AppBarLayout.LayoutParams) mAppBarChildAt.getLayoutParams();
AppBarLayout.LayoutParams mAppBarParams = (AppBarLayout.LayoutParams) mAppBarChildAt.getLayoutParams();
mAppBarParams.setScrollFlags(0);
mAppBarLayout.addOnOffsetChangedListener(new AppBarStateListener() {
@Override
@@ -100,7 +105,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
mViewList.add(frameLayout);
}
mViewHolders = new AbsMainHomeChildViewHolder[pageCount];
mViewPager = (ViewPager) findViewById(R.id.viewPager);
mViewPager = (MyViewPager) findViewById(R.id.viewPager);
if (pageCount > 1) {
mViewPager.setOffscreenPageLimit(pageCount - 1);
}
@@ -137,7 +142,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
public IPagerTitleView getTitleView(Context context, final int index) {
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
simplePagerTitleView.setSelectedColor(Color.parseColor("#FFC621"));
simplePagerTitleView.setSelectedColor(Color.parseColor("#2ED0FF"));
simplePagerTitleView.setText(titles[index]);
simplePagerTitleView.setTextSize(18);
simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -145,7 +150,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
@Override
public void onClick(View v) {
if (mViewPager != null) {
mViewPager.setCurrentItem(index);
// mViewPager.setCurrentItem(index);
}
}
});
@@ -158,7 +163,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
linePagerIndicator.setXOffset(DpUtil.dp2px(5));
linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
linePagerIndicator.setColors(Color.parseColor("#FFC621"));
linePagerIndicator.setColors(Color.parseColor("#2ED0FF"));
return linePagerIndicator;
}
});
@@ -166,11 +171,11 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
ViewPagerHelper.bind(mIndicator, mViewPager);
mRedPoint = (TextView) findViewById(R.id.red_point);
mIndicator.setNavigator(commonNavigator);
ViewPagerHelper.bind(mIndicator, mViewPager);
//默认选择第几个
mIndicator.onPageSelected(1);
mViewPager.setCurrentItem(1);
mViewPager.setCurrentItem(0);
mIndicator.onPageSelected(0);
mViewPager.setCanScroll(false);
loadPageData(0);
unReadMsgHandle();
}

View File

@@ -174,9 +174,10 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
String[] titles;
private void initTab() {
titles = new String[]{"社區", "短劇"};
//TODO 短剧
titles = new String[]{"社區"/*, "短劇"*/};
if (!WordUtil.isNewZh()) {
titles = new String[]{"Community", "Theater"};
titles = new String[]{"Community"/*, "Theater"*/};
}
CommonNavigator commonNavigator = new CommonNavigator(mContext);
commonNavigator.setAdjustMode(true);
@@ -190,7 +191,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
public IPagerTitleView getTitleView(Context context, int index) {
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
simplePagerTitleView.setSelectedColor(Color.parseColor("#FFC621"));
simplePagerTitleView.setSelectedColor(Color.parseColor("#2ED0FF"));
simplePagerTitleView.setText(titles[index]);
simplePagerTitleView.setTextSize(18);
simplePagerTitleView.getPaint().setFakeBoldText(true);
@@ -215,7 +216,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
linePagerIndicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
linePagerIndicator.setXOffset(DpUtil.dp2px(5));
linePagerIndicator.setRoundRadius(DpUtil.dp2px(2));
linePagerIndicator.setColors(Color.parseColor("#FFC621"));
linePagerIndicator.setColors(Color.parseColor("#2ED0FF"));
return linePagerIndicator;
}
});

View File

@@ -133,11 +133,11 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
return;
}
if (position == -1) {
} else if (position == 0) {
} else if (position == 1) {
mainHomeFollLiveViewHolder = new MainHomeFollLiveViewHolder(mContext, parent);
vh = mainHomeFollLiveViewHolder;
} else if (position == 1) {
} else if (position == 0) {
mainHomeLiveViewHolder = new MainHomeLiveViewHolder(mContext, parent);
vh = mainHomeLiveViewHolder;
@@ -176,7 +176,12 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
@Override
protected String[] getTitles() {
return new String[]{mContext.getString(R.string.follow), mContext.getString(R.string.hot), mContext.getString(R.string.recomment), mContext.getString(R.string.main_tabs_red_packet),};
return new String[]{
// mContext.getString(R.string.follow),
mContext.getString(R.string.hot),
// mContext.getString(R.string.recomment),
// mContext.getString(R.string.main_tabs_red_packet),
};
}

View File

@@ -3,7 +3,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="30dp" />
<solid android:color="#fdbe40 " />
<solid android:color="#2ED0FF " />
</shape>
</item>
</selector>

View File

@@ -3,16 +3,56 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:background="#fff"
android:layout_height="match_parent"
tools:context=".activity.EntryActivity">
<com.yunbao.main.views.CustomVideoView
android:id="@+id/video_view"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/cover"
android:layout_width="match_parent"
android:layout_height="342dp"
android:scaleType="centerCrop"
android:src="@mipmap/bg_app_launch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/app_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:transitionName="app_logo"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@mipmap/ic_app_launch_logo" />
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
app:srcCompat="@mipmap/ic_app_launch_name" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/img_view"
android:layout_width="match_parent"
@@ -237,8 +277,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/customer_service2"
android:textColor="@color/white"
android:textSize="11sp" />
android:textColor="#424242"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
@@ -254,7 +294,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/next_step_is_consent"
android:textColor="#ffb1b1b1"
android:textColor="#ABABAB"
android:textSize="10sp" />
@@ -263,6 +303,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:textStyle="bold"
android:text="@string/user_protocol2"
android:textColor="#ffb1b1b1"
android:textSize="10sp" />
@@ -278,6 +319,7 @@
<TextView
android:id="@+id/btn_tip1"
android:layout_width="wrap_content"
android:textStyle="bold"
android:layout_height="match_parent"
android:layout_marginLeft="1dp"
android:text="@string/privacy_terms"
@@ -294,14 +336,15 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="80dp"
android:src="@mipmap/white_logo" />
android:src="@mipmap/white_logo"
android:visibility="gone" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/webview_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="gone">
<View
android:id="@+id/view2"

View File

@@ -38,7 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/find_pwd_forget"
android:textColor="#ffff8d41"
android:textColor="#2ED0FF"
android:textSize="24sp"
android:layout_marginLeft="41dp"
android:layout_marginTop="30dp"

View File

@@ -41,8 +41,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="45dp"
android:layout_marginTop="49dp"
android:text="Hello"
android:textColor="#ffff8d41"
android:text="Hello,"
android:textColor="#2ED0FF"
android:textSize="33sp"
android:textStyle="bold" />

View File

@@ -41,7 +41,7 @@
android:layout_marginTop="30dp"
android:layout_marginBottom="25dp"
android:text="@string/sign_up_for"
android:textColor="#ffff8d41"
android:textColor="#2ED0FF"
android:textSize="24sp" />
<LinearLayout

View File

@@ -53,7 +53,7 @@
android:layout_height="match_parent"
android:layout_marginRight="60dp"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_video"
app:tbn_icon_array_id="@array/main_tab_list"
app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent"
app:tbn_text_color_unchecked="@color/gray1"
@@ -63,7 +63,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:tbn_icon_array_id="@array/main_tab_list"
app:tbn_icon_array_id="@array/main_tab_video"
app:tbn_icon_size="28dp"
app:tbn_text_color_checked="@color/colorAccent"
app:tbn_text_color_unchecked="@color/gray1"
@@ -96,17 +96,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:layout_weight="1">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:gravity="right">
<TextView
android:id="@+id/v_table_redpoint"
android:layout_width="20dp"
@@ -118,6 +109,16 @@
android:visibility="gone" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="5dp"
android:layout_weight="1"
android:gravity="right">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -43,6 +43,7 @@
<TextView
android:id="@+id/tvPlay"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
@@ -92,7 +93,7 @@
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
<com.yunbao.common.custom.MyViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"

View File

@@ -63,7 +63,7 @@
android:layout_alignParentBottom="true"
android:layout_marginLeft="10dp"
android:textColor="@color/colorPrimary"
android:text="PD LIVE"
android:text="HOSO"
android:paddingTop="2dp"
android:textSize="20sp"
android:textStyle="bold" />

View File

@@ -42,6 +42,35 @@
android:layout_marginTop="42dp"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="114dp"
android:layout_height="match_parent"
android:layout_marginRight="18dp"
android:gravity="center|right">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="86dp"
android:layout_height="86dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="9dp"
android:scaleType="centerCrop"
app:riv_border_color="#FFFFFF"
app:riv_border_width="2dp"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:autoPlay="true" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -53,8 +82,8 @@
android:id="@+id/complete_information_radius"
android:layout_width="7dp"
android:layout_height="7dp"
android:layout_marginStart="115.9dp"
android:layout_marginEnd="4dp"
android:layout_gravity="end"
android:layout_marginEnd="24dp"
app:cardBackgroundColor="#FF5730"
app:cardCornerRadius="20dp" />
@@ -62,7 +91,8 @@
android:id="@+id/complete_information"
android:layout_width="107.9dp"
android:layout_height="25.25dp"
android:layout_marginStart="21dp"
android:layout_gravity="end"
android:layout_marginEnd="21dp"
android:layout_marginTop="-5dp"
android:background="@mipmap/icon_complete_information">
@@ -79,7 +109,7 @@
android:id="@+id/lt_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:layout_marginTop="8dp"
android:gravity="center"
android:orientation="horizontal">
@@ -106,7 +136,6 @@
android:id="@+id/signature"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:layout_marginTop="6dp"
android:text="这个人很懒,什么也没留下。"
android:textColor="@color/gray_cccccc"
@@ -117,47 +146,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="21dp"
android:layout_weight="1"
android:gravity="center|left">
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="21dp"
android:layout_height="15dp"
android:src="@mipmap/good_nub"
android:visibility="gone" />
<ImageView
android:layout_width="30dp"
android:layout_height="15dp"
android:src="@mipmap/icon_userid" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/gray_B1B1B1"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:id="@+id/btn_copy"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/border_grey"
android:gravity="center"
android:text="@string/copy"
android:textColor="#ff9f9f9f"
android:textSize="10sp"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
@@ -200,45 +188,203 @@
android:layout_marginLeft="3dp"
android:background="@mipmap/icon_arrow_right"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginLeft="21dp"
android:layout_weight="1"
android:gravity="center|left">
<ImageView
android:layout_width="30dp"
android:layout_height="15dp"
android:src="@mipmap/icon_userid" />
<TextView
android:id="@+id/id_val"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/gray_B1B1B1"
android:textSize="12sp" />
<ImageView
android:id="@+id/good_nub_ico"
android:layout_width="21dp"
android:layout_height="15dp"
android:src="@mipmap/good_nub"
android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/btn_copy"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/border_grey"
android:gravity="center"
android:text="@string/copy"
android:textColor="#ff9f9f9f"
android:textSize="10sp"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width="114dp"
android:layout_height="match_parent"
android:layout_marginRight="18dp"
android:gravity="center|right">
</LinearLayout>
<LinearLayout
android:id="@+id/ll_me_vip"
android:layout_below="@id/lt_me_top"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="86dp"
android:layout_height="86dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="9dp"
android:scaleType="centerCrop"
app:riv_border_color="#FFFFFF"
app:riv_border_width="2dp"
app:riv_oval="true" />
<FrameLayout
android:id="@+id/lt_guard"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/gift_svga"
android:layout_width="104dp"
android:layout_height="104dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:autoPlay="true" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_guard_me" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/live_guard"
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/guard_for_your_beloved_one"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
<View
android:layout_width="18dp"
android:layout_height="1dp" />
<FrameLayout
android:id="@+id/lt_noble"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:id="@+id/user_noble_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text=""
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/open_noble_text"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:visibility="gone" />
</FrameLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="114dp"
android:layout_below="@id/lt_me_top"
android:layout_below="@id/ll_me_vip"
android:layout_marginTop="12dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/bg_me_data"
@@ -249,7 +395,6 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -260,7 +405,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
@@ -268,18 +412,18 @@
<ImageView
android:layout_width="39dp"
android:layout_height="39dp"
android:src="@mipmap/home_me_diamonds" />
android:src="@mipmap/home_me_gold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/diamond"
android:text="@string/golden_bean"
android:textColor="@color/gray1"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:id="@+id/coin"
android:id="@+id/gold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
@@ -289,6 +433,8 @@
</LinearLayout>
<LinearLayout
android:layout_width="1dp"
android:layout_height="match_parent"
@@ -310,7 +456,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
@@ -349,7 +494,6 @@
android:layout_height="42dp"
android:background="@color/gray_dcdcdc" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -360,7 +504,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="6dp">
@@ -368,18 +511,18 @@
<ImageView
android:layout_width="39dp"
android:layout_height="39dp"
android:src="@mipmap/home_me_gold" />
android:src="@mipmap/home_me_diamonds" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/golden_bean"
android:text="@string/diamond"
android:textColor="@color/gray1"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:id="@+id/gold"
android:id="@+id/coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
@@ -396,8 +539,9 @@
android:layout_height="45dp"
android:paddingBottom="3dp">
<LinearLayout
android:id="@+id/btn_coin"
android:id="@+id/btn_gold"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -407,7 +551,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/charge"
android:text="@string/receive"
android:textColor="@color/gray_B1B1B1"
android:textSize="12sp" />
@@ -417,7 +561,6 @@
android:layout_marginLeft="3dp"
android:background="@mipmap/icon_arrow_right" />
</LinearLayout>
<LinearLayout
android:id="@+id/lt_star_coin"
android:layout_width="match_parent"
@@ -440,9 +583,8 @@
android:layout_marginLeft="3dp"
android:background="@mipmap/icon_arrow_right" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_gold"
android:id="@+id/btn_coin"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -452,7 +594,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/receive"
android:text="@string/charge"
android:textColor="@color/gray_B1B1B1"
android:textSize="12sp" />
@@ -494,150 +636,6 @@
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
android:id="@+id/lt_noble"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="12dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:id="@+id/user_noble_ico"
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_vip_gold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:id="@+id/user_noble_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text=""
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/user_noble_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/open_noble_text"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
<View
android:id="@+id/v_noble"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_marginRight="30dp"
android:background="@mipmap/icon_more_gray"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:visibility="gone" />
</FrameLayout>
<View
android:layout_width="18dp"
android:layout_height="1dp" />
<FrameLayout
android:id="@+id/lt_guard"
android:layout_width="0dp"
android:layout_height="81dp"
android:layout_marginTop="12dp"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:background="@drawable/bg_me_data"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_marginTop="4dp"
android:layout_marginEnd="14dp"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false">
<ImageView
android:layout_width="48dp"
android:layout_height="45dp"
android:src="@mipmap/icon_guard_me" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="vertical"
android:paddingLeft="18dp"
android:paddingRight="6dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="@string/live_guard"
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/guard_for_your_beloved_one"
android:textColor="#000000"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
</LinearLayout>
<LinearLayout

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB