UI改版
@ -2,8 +2,8 @@
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<gradient
|
||||
android:angle="-45"
|
||||
android:endColor="#EB6FFF"
|
||||
android:startColor="#FF83C6" />
|
||||
android:endColor="#FF0FA4FF"
|
||||
android:startColor="#FF0FA4FF" />
|
||||
<corners
|
||||
android:bottomLeftRadius="90dp"
|
||||
android:bottomRightRadius="90dp"
|
||||
|
BIN
common/src/main/res/mipmap-mdpi/icon_collectibles.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.2 KiB |
@ -875,8 +875,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
//RandomPkDialogFragment fragment = new RandomPkDialogFragment();
|
||||
//fragment.show(this.getSupportFragmentManager(), "RandomPkDialogFragment");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void showStartDialog() {
|
||||
@ -904,7 +902,6 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1288,8 +1285,10 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
|
||||
} else if (position == 1) {
|
||||
/*mainHomeViewHolder = new MainHomeViewHolder(mContext, parent);
|
||||
vh = mainHomeViewHolder;*/
|
||||
mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
|
||||
vh = mMainHomeCommunityViewHolder;
|
||||
/* mMainHomeCommunityViewHolder = new MainHomeCommunityViewHolder(mContext, parent, this);//直播
|
||||
vh = mMainHomeCommunityViewHolder;*/
|
||||
mainHomeComViewHolder = new MainHomeComViewHolder(mContext, MainActivity.this, parent);
|
||||
vh = mainHomeComViewHolder;
|
||||
} else if (position == 2) {
|
||||
mainMessageViewHolder = new MainMessageViewHolder(this, parent);
|
||||
vh = mainMessageViewHolder;
|
||||
|
@ -94,13 +94,10 @@ public class MainHomeComClassAdapter extends RecyclerView.Adapter<MainHomeComCla
|
||||
} else {
|
||||
mName.setText(bean.getTalk_name());
|
||||
}
|
||||
|
||||
if (position == choice) {
|
||||
mName.setBackgroundResource(R.drawable.bg_main_community_type_01);
|
||||
mName.setTextColor(Color.parseColor("#FFFFFF"));
|
||||
mName.setTextColor(Color.parseColor("#FF0FA4FF"));
|
||||
} else {
|
||||
mName.setBackgroundResource(R.drawable.bg_main_community_type_02);
|
||||
mName.setTextColor(Color.parseColor("#777777"));
|
||||
mName.setTextColor(Color.parseColor("#FF777777"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -67,10 +67,13 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
|
||||
|
||||
@Override
|
||||
public int getItemViewType(int position) {
|
||||
if (position == 0) {
|
||||
if (position == 4) {
|
||||
return HEAD;
|
||||
} else if (position > 0) {
|
||||
LiveBean mode = mList.get(position - 1);
|
||||
} else{
|
||||
if(position>4){
|
||||
|
||||
}
|
||||
LiveBean mode = mList.get(position>4?position-1:position);
|
||||
if (TextUtils.equals(mode.getIs_week(), "1")) {
|
||||
return WEEKLAYOUT;
|
||||
} else {
|
||||
@ -114,8 +117,9 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
|
||||
|
||||
@Override
|
||||
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
|
||||
int nowPosition = position>4?position-1:position;
|
||||
if (vh instanceof MainHomeLiveWeekItemViewHolder) {
|
||||
((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
|
||||
((MainHomeLiveWeekItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveWeekItemViewHolder.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(LiveBean bean, int position) {
|
||||
if (mOnItemClickListener != null) {
|
||||
@ -124,7 +128,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
|
||||
}
|
||||
});
|
||||
} else if (vh instanceof MainHomeLiveItemViewHolder) {
|
||||
((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(position - 1), position - 1, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
|
||||
((MainHomeLiveItemViewHolder) vh).loadViewDate(mList.get(nowPosition), nowPosition, Height, new MainHomeLiveItemViewHolder.OnItemClickListener() {
|
||||
@Override
|
||||
public void onItemClick(LiveBean bean, int position) {
|
||||
if (mOnItemClickListener != null) {
|
||||
@ -137,7 +141,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
|
||||
|
||||
@Override
|
||||
public int getItemCount() {
|
||||
return super.getItemCount() + 1;
|
||||
return super.getItemCount();
|
||||
}
|
||||
|
||||
class HeadVh extends RecyclerView.ViewHolder {
|
||||
|
@ -96,11 +96,9 @@ public class MainHomeLivesClassAdapter extends RecyclerView.Adapter<MainHomeLive
|
||||
}
|
||||
|
||||
if (position == choice) {
|
||||
mName.setBackgroundResource(R.drawable.button_ffc621);
|
||||
mName.setTextColor(Color.parseColor("#7d77fc"));
|
||||
mName.setTextColor(Color.parseColor("#FF0FA4FF"));
|
||||
} else {
|
||||
mName.setBackgroundResource(R.drawable.button_cbd5e0);
|
||||
mName.setTextColor(Color.parseColor("#484D68"));
|
||||
mName.setTextColor(Color.parseColor("#FF777777"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
|
||||
|
||||
private AppBarLayout mAppBarLayout;
|
||||
protected ViewPager mViewPager;
|
||||
private MagicIndicator mIndicator;
|
||||
public MagicIndicator mIndicator;
|
||||
private TextView mRedPoint;//显示未读消息数量的红点
|
||||
protected AbsMainHomeChildViewHolder[] mViewHolders;
|
||||
private MainAppBarLayoutListener mAppBarLayoutListener;
|
||||
@ -138,8 +138,8 @@ public abstract class AbsMainHomeParentViewHolder extends AbsMainViewHolder {
|
||||
@Override
|
||||
public IPagerTitleView getTitleView(Context context, final int index) {
|
||||
SimplePagerTitleView simplePagerTitleView = new ColorTransitionPagerTitleView(context);
|
||||
simplePagerTitleView.setNormalColor(Color.parseColor("#B1B1B1"));
|
||||
simplePagerTitleView.setSelectedColor(Color.parseColor("#7d77fc"));
|
||||
simplePagerTitleView.setNormalColor(Color.parseColor("#FF777777"));
|
||||
simplePagerTitleView.setSelectedColor(Color.parseColor("#FF333333"));
|
||||
simplePagerTitleView.setText(titles[index]);
|
||||
simplePagerTitleView.setTextSize(18);
|
||||
simplePagerTitleView.getPaint().setFakeBoldText(true);
|
||||
@ -160,7 +160,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("#7d77fc"));
|
||||
linePagerIndicator.setColors(Color.parseColor("#FF0FA4FF"));
|
||||
return linePagerIndicator;
|
||||
}
|
||||
});
|
||||
|
@ -30,7 +30,7 @@ import org.greenrobot.eventbus.EventBus;
|
||||
* MainActivity 首页-社区
|
||||
*/
|
||||
|
||||
public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
|
||||
public class MainHomeComViewHolder extends AbsMainHomeParentViewHolder {
|
||||
private MainHomeFollComViewHolder mainHomeFollLiveViewHolder;
|
||||
private MainHomeNewViewHolder mainHomeLiveViewHolder;
|
||||
private MainHomeRecomComViewHolder mainHomeRecomComViewHolder;
|
||||
@ -115,11 +115,11 @@ public class MainHomeComViewHolder extends AbsMainHomeParentComViewHolder {
|
||||
RouteUtil.forwardCommunityActivity();
|
||||
mIndicator.onPageSelected(selected);
|
||||
setCurPosition(selected);
|
||||
refreshIndex(selected);
|
||||
//refreshIndex(selected);
|
||||
return;
|
||||
}
|
||||
selected = position;
|
||||
refreshIndex(position);
|
||||
//refreshIndex(position);
|
||||
switch (position) {
|
||||
case 0:
|
||||
floatWarOrder = false;
|
||||
|
@ -163,7 +163,7 @@ public class MainHomeLiveViewHolder extends AbsMainHomeChildViewHolder implement
|
||||
gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
|
||||
@Override
|
||||
public int getSpanSize(int position) {
|
||||
if (position == 0) {
|
||||
if (position == 4) {
|
||||
return 2;
|
||||
}
|
||||
return 1;
|
||||
|
@ -1,6 +1,11 @@
|
||||
package com.yunbao.main.views;
|
||||
|
||||
import static com.yunbao.common.manager.imrongcloud.RongcloudIMManager.connectIM;
|
||||
|
||||
import android.Manifest;
|
||||
import android.app.Dialog;
|
||||
import android.content.Context;
|
||||
import android.os.Build;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.FrameLayout;
|
||||
@ -8,18 +13,42 @@ import android.widget.HorizontalScrollView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.lxj.xpopup.XPopup;
|
||||
import com.yunbao.common.CommonAppConfig;
|
||||
import com.yunbao.common.Constants;
|
||||
import com.yunbao.common.dialog.MessageSayHiNotifyDialog;
|
||||
import com.yunbao.common.http.HttpCallback;
|
||||
import com.yunbao.common.http.LiveHttpUtil;
|
||||
import com.yunbao.common.manager.IMLoginManager;
|
||||
import com.yunbao.common.utils.AppManager;
|
||||
import com.yunbao.common.utils.DialogUitl;
|
||||
import com.yunbao.common.utils.MobclickAgent;
|
||||
import com.yunbao.common.activity.AbsActivity;
|
||||
import com.yunbao.common.event.FloatWarOrderEvent;
|
||||
import com.yunbao.common.glide.ImgLoader;
|
||||
import com.yunbao.common.utils.MessageSayHiNotifyManager;
|
||||
import com.yunbao.common.utils.PluginManager;
|
||||
import com.yunbao.common.utils.ProcessResultUtil;
|
||||
import com.yunbao.common.utils.RouteUtil;
|
||||
import com.yunbao.common.utils.ToastUtil;
|
||||
import com.yunbao.common.utils.WordUtil;
|
||||
import com.yunbao.live.LiveConfig;
|
||||
import com.yunbao.live.activity.LiveAnchorActivity;
|
||||
import com.yunbao.live.activity.LiveRyAnchorActivity;
|
||||
import com.yunbao.live.activity.LiveSwAnchorActivity;
|
||||
import com.yunbao.live.bean.LiveKsyConfigBean;
|
||||
import com.yunbao.main.R;
|
||||
import com.yunbao.main.activity.MainActivity;
|
||||
import com.yunbao.main.dialog.MainStartDialogFragment;
|
||||
|
||||
import org.greenrobot.eventbus.EventBus;
|
||||
|
||||
import io.rong.imlib.RongIMClient;
|
||||
|
||||
/**
|
||||
* Created by cxf on 2018/9/22.
|
||||
* MainActivity 首页 删除
|
||||
@ -52,6 +81,8 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
|
||||
public void init() {
|
||||
super.init();
|
||||
|
||||
mProcessResultUtil = new ProcessResultUtil((FragmentActivity) mContext);
|
||||
|
||||
img_trophy = (ImageView) findViewById(R.id.img_trophy);
|
||||
|
||||
ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy);
|
||||
@ -69,8 +100,102 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
|
||||
RouteUtil.forwardCommunityActivity();
|
||||
}
|
||||
});
|
||||
findViewById(R.id.btn_live).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
boolean isAnchor = IMLoginManager.get(mContext).getUserInfo().anchorUserType();
|
||||
if (isAnchor) {
|
||||
String[] permissions;
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
|
||||
permissions = new String[]{
|
||||
//Manifest.permission.READ_MEDIA_IMAGES, 去掉选择图片的权限,到里面选择封面的时候再去申请
|
||||
Manifest.permission.CAMERA,
|
||||
Manifest.permission.RECORD_AUDIO
|
||||
};
|
||||
} else {
|
||||
permissions = new String[]{
|
||||
Manifest.permission.READ_EXTERNAL_STORAGE,
|
||||
Manifest.permission.WRITE_EXTERNAL_STORAGE,
|
||||
Manifest.permission.CAMERA,
|
||||
Manifest.permission.RECORD_AUDIO
|
||||
};
|
||||
}
|
||||
mProcessResultUtil.requestPermissions(permissions, mStartLiveRunnable);
|
||||
} else {
|
||||
ToastUtil.show(mContext.getString(R.string.only_open_anchor));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private Runnable mStartLiveRunnable = new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (CommonAppConfig.LIVE_SDK_CHANGED) {
|
||||
if (mGetLiveSdkCallback == null) {
|
||||
mGetLiveSdkCallback = new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, final String[] info) {
|
||||
if (code == 0 && info.length > 0) {
|
||||
LiveHttpUtil.getisRong(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] info1) {
|
||||
try {
|
||||
LiveHttpUtil.getIsSw(new HttpCallback() {
|
||||
@Override
|
||||
public void onSuccess(int code, String msg, String[] infos) {
|
||||
JSONObject obj = JSON.parseObject(info[0]);
|
||||
JSONObject obj1 = JSON.parseObject(info1[0]);
|
||||
try {
|
||||
if(code==201){ //声网
|
||||
LiveSwAnchorActivity.forward(mContext, Constants.LIVE_SDK_SW, JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
|
||||
}else if(code==200){//融云
|
||||
LiveRyAnchorActivity.forward(mContext, obj.getIntValue("live_sdk"), JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
} catch (Exception e) {
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
if (!CommonAppConfig.IS_PLUGIN_MODEL || PluginManager.getInstance().isDownloadApk()) {
|
||||
PluginManager.getInstance().loadAnchorPlugin(it -> {
|
||||
LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
|
||||
});
|
||||
} else {
|
||||
String tips = "需要下載開播插件,是否下載";
|
||||
if (!WordUtil.isNewZh()) {
|
||||
tips = "You need to download the plug-in, whether to download";
|
||||
}
|
||||
DialogUitl.showSimpleDialog(mContext, tips, new DialogUitl.SimpleCallback() {
|
||||
@Override
|
||||
public void onConfirmClick(Dialog dialog, String content) {
|
||||
Dialog downloadDialog = DialogUitl.loadingDialog(mContext, "Downloading...");
|
||||
downloadDialog.show();
|
||||
PluginManager.getInstance().loadAnchorPlugin(it -> {
|
||||
LiveHttpUtil.getLiveSdk(mGetLiveSdkCallback);
|
||||
downloadDialog.dismiss();
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
} else {
|
||||
LiveAnchorActivity.forward(mContext, CommonAppConfig.LIVE_SDK_USED, LiveConfig.getDefaultKsyConfig());
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private HttpCallback mGetLiveSdkCallback;
|
||||
private ProcessResultUtil mProcessResultUtil;
|
||||
|
||||
public void setCurPosition(int position) {
|
||||
mViewPager.setCurrentItem(position);
|
||||
}
|
||||
|
@ -437,11 +437,11 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
|
||||
Constants.myUid = u.getGoodnum();
|
||||
Constants.myAvatar = u.getAvatar();
|
||||
if (u.getUserInfoComplete() == 1) {
|
||||
findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
|
||||
findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
|
||||
//findViewById(R.id.complete_information_radius).setVisibility(View.INVISIBLE);
|
||||
//findViewById(R.id.complete_information).setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
|
||||
findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
|
||||
//findViewById(R.id.complete_information_radius).setVisibility(View.VISIBLE);
|
||||
//findViewById(R.id.complete_information).setVisibility(View.VISIBLE);
|
||||
}
|
||||
EventBus.getDefault().post(new CompleteInformationEvent().setCompleteInformation(findViewById(R.id.complete_information).getVisibility() == View.VISIBLE));
|
||||
}
|
||||
|
5
main/src/main/res/drawable/bg_msg_top_title.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="4dp"/>
|
||||
<solid android:color="#FF0FA4FF"/>
|
||||
</shape>
|
5
main/src/main/res/drawable/bg_my_info_input.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="15dp"/>
|
||||
<solid android:color="#FFFFBA26"/>
|
||||
</shape>
|
@ -1,21 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:paddingRight="5dp"
|
||||
android:paddingTop="12dp"
|
||||
android:paddingBottom="10dp">
|
||||
android:paddingBottom="10dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_class_name"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="30dp"
|
||||
android:background="@drawable/bg_main_com_type"
|
||||
android:gravity="center"
|
||||
android:layout_width="65dp"
|
||||
android:layout_height="26dp"
|
||||
android:text="音乐"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="13sp" />
|
||||
android:textSize="16sp"
|
||||
android:gravity="center"
|
||||
android:textColor="#FF777777"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="135dp"
|
||||
android:orientation="vertical">
|
||||
@ -26,9 +25,8 @@
|
||||
android:id="@+id/banner"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="3dp"
|
||||
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
app:delay_time="3000"
|
||||
app:indicator_drawable_selected="@drawable/bg_home_indicator_selected"
|
||||
app:indicator_drawable_unselected="@drawable/bg_home_indicator_unselected"
|
||||
|
@ -3,7 +3,6 @@
|
||||
android:orientation="vertical"
|
||||
android:gravity="center"
|
||||
android:paddingRight="5dp"
|
||||
android:layout_marginLeft="15dp"
|
||||
android:paddingTop="12dp"
|
||||
android:paddingBottom="10dp"
|
||||
android:layout_width="wrap_content"
|
||||
@ -16,8 +15,7 @@
|
||||
android:text="音乐"
|
||||
android:textSize="16sp"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/button_ffc621"
|
||||
android:textColor="#FFC621"/>
|
||||
android:textColor="#FF777777"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
@ -21,6 +21,7 @@
|
||||
<ImageView
|
||||
android:id="@+id/index"
|
||||
android:layout_width="30dp"
|
||||
android:visibility="gone"
|
||||
android:layout_height="15dp"
|
||||
android:src="@mipmap/icon_index" />
|
||||
|
||||
|
@ -19,8 +19,8 @@
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="37dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_height="45dp"
|
||||
android:layout_marginTop="22dp"
|
||||
app:layout_scrollFlags="scroll|enterAlways">
|
||||
|
||||
<HorizontalScrollView
|
||||
@ -50,9 +50,9 @@
|
||||
android:gravity="center"
|
||||
android:paddingTop="1dp"
|
||||
android:text="@string/main_type_theater"
|
||||
android:textColor="#B1B1B1"
|
||||
android:textColor="#FF777777"
|
||||
android:layout_marginBottom="3dp"
|
||||
android:textSize="16dp"
|
||||
android:textSize="18dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
||||
@ -62,14 +62,23 @@
|
||||
android:id="@+id/ijiasdw"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentBottom="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_live"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:contentDescription="TODO"
|
||||
android:onClick="mainClick"
|
||||
android:padding="9dp"
|
||||
android:src="@mipmap/icon_main_live" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_search"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:contentDescription="TODO"
|
||||
android:onClick="mainClick"
|
||||
android:padding="9dp"
|
||||
@ -80,7 +89,6 @@
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:contentDescription="TODO"
|
||||
android:onClick="mainClick"
|
||||
android:padding="6dp" />
|
||||
|
@ -11,7 +11,7 @@
|
||||
android:id="@+id/appBarLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@android:color/transparent"
|
||||
android:fadingEdge="none"
|
||||
app:elevation="0dp"
|
||||
@ -19,13 +19,13 @@
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="37dp"
|
||||
android:layout_marginTop="28dp"
|
||||
app:layout_scrollFlags="scroll|enterAlways">
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="60dp"
|
||||
android:layout_height="37dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
@ -43,13 +43,11 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_toRightOf="@+id/indicator"
|
||||
android:gravity="center"
|
||||
android:paddingTop="1dp"
|
||||
android:text="@string/main_type_theater"
|
||||
android:textColor="@color/black1"
|
||||
android:textSize="16dp"
|
||||
android:textColor="#FF777777"
|
||||
android:textSize="18dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
@ -3,7 +3,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/gray2"
|
||||
android:background="#FFF7F8FA"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="50dp">
|
||||
|
||||
@ -27,43 +27,95 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
android:paddingTop="30dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<View
|
||||
<RelativeLayout
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="240dp"
|
||||
android:background="@mipmap/new_bg" />
|
||||
android:layout_height="40dp">
|
||||
|
||||
<TextView
|
||||
android:text="個人中心"
|
||||
android:textSize="24dp"
|
||||
android:textColor="#FF333333"
|
||||
android:textStyle="bold"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="4dp"
|
||||
android:background="@drawable/bg_msg_top_title"
|
||||
android:scaleType="fitXY" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/rt_setting"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:src="@mipmap/main_my_more"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:id="@+id/lt_me_top"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="144dp"
|
||||
android:layout_marginTop="42dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="55dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="108dp"
|
||||
android:layout_height="100dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:gravity="center|right">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
android:id="@+id/edit_me_avatar"
|
||||
android:layout_width="68dp"
|
||||
android:layout_height="68dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="10dp"
|
||||
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="94dp"
|
||||
android:layout_height="94dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:scaleType="centerCrop"
|
||||
app:autoPlay="true" />
|
||||
|
||||
</RelativeLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center|left"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.cardview.widget.CardView
|
||||
android:id="@+id/complete_information_radius"
|
||||
android:layout_width="7dp"
|
||||
android:layout_height="7dp"
|
||||
android:layout_marginStart="115.9dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
app:cardBackgroundColor="#FF5730"
|
||||
android:visibility="gone"
|
||||
app:cardCornerRadius="20dp" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/complete_information"
|
||||
android:layout_width="107.9dp"
|
||||
android:layout_height="25.25dp"
|
||||
android:layout_marginStart="21dp"
|
||||
android:visibility="gone"
|
||||
android:layout_marginTop="-5dp"
|
||||
android:background="@mipmap/icon_complete_information">
|
||||
|
||||
@ -80,7 +132,6 @@
|
||||
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">
|
||||
@ -90,9 +141,11 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="用戶名稱"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/black2"
|
||||
android:textSize="19sp"
|
||||
android:textStyle="bold" />
|
||||
android:textSize="15sp"
|
||||
/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/btn_edit"
|
||||
@ -107,22 +160,20 @@
|
||||
android:id="@+id/signature"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="21dp"
|
||||
android:layout_marginTop="6dp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="这个人很懒,什么也没留下。"
|
||||
android:textColor="@color/gray_cccccc"
|
||||
android:textSize="12sp" />
|
||||
android:textSize="11sp" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="30dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginLeft="21dp"
|
||||
android:layout_height="28dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center|left">
|
||||
|
||||
@ -134,8 +185,8 @@
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="15dp"
|
||||
android:layout_width="13dp"
|
||||
android:layout_height="13dp"
|
||||
android:src="@mipmap/icon_userid" />
|
||||
|
||||
<TextView
|
||||
@ -148,7 +199,7 @@
|
||||
|
||||
<TextView
|
||||
android:id="@+id/btn_copy"
|
||||
android:layout_width="30dp"
|
||||
android:layout_width="28dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginRight="5dp"
|
||||
@ -161,15 +212,15 @@
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="48dp"
|
||||
android:layout_marginLeft="15dp"
|
||||
android:layout_height="28dp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center|left">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_lv_pic"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="15dp"
|
||||
android:layout_width="13dp"
|
||||
android:layout_height="13dp"
|
||||
android:src="@mipmap/icon_userlv" />
|
||||
|
||||
<ImageView
|
||||
@ -206,32 +257,30 @@
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="114dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginRight="18dp"
|
||||
android:gravity="center|right">
|
||||
android:id="@+id/complete_information"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.makeramen.roundedimageview.RoundedImageView
|
||||
android:id="@+id/edit_me_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" />
|
||||
<TextView
|
||||
android:text="完成填寫領大禮"
|
||||
android:textColor="#FFFFFFFF"
|
||||
android:textStyle="bold"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@drawable/bg_my_info_input"
|
||||
android:textSize="11dp"
|
||||
android:gravity="center"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_width="91dp"
|
||||
android:layout_height="44dp"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/complete_information_radius"
|
||||
android:layout_width="39dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_height="39dp"
|
||||
android:src="@mipmap/main_my_info_icon" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -267,8 +316,8 @@
|
||||
android:paddingTop="6dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="39dp"
|
||||
android:layout_height="39dp"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@mipmap/home_me_diamonds" />
|
||||
|
||||
<TextView
|
||||
@ -317,8 +366,8 @@
|
||||
android:paddingTop="6dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="39dp"
|
||||
android:layout_height="39dp"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@mipmap/icon_collectibles" />
|
||||
|
||||
<TextView
|
||||
@ -367,8 +416,8 @@
|
||||
android:paddingTop="6dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="39dp"
|
||||
android:layout_height="39dp"
|
||||
android:layout_width="18dp"
|
||||
android:layout_height="18dp"
|
||||
android:src="@mipmap/home_me_gold" />
|
||||
|
||||
<TextView
|
||||
@ -495,6 +544,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
@ -734,9 +784,9 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/rt_setting"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:visibility="gone"
|
||||
android:paddingLeft="21dp">
|
||||
|
||||
<ImageView
|
||||
|
@ -25,7 +25,6 @@
|
||||
android:id="@+id/top_noback"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:text="@string/activity_msg_title"
|
||||
android:textColor="#ff161616"
|
||||
android:textSize="24sp"
|
||||
@ -34,11 +33,11 @@
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<ImageView
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="6.3dp"
|
||||
android:scaleType="fitXY"
|
||||
android:src="@mipmap/icon_index" />
|
||||
android:layout_height="4dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/bg_msg_top_title"
|
||||
android:scaleType="fitXY" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -66,7 +65,7 @@
|
||||
android:layout_gravity="end|bottom"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="18dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:layout_weight="0.1"
|
||||
android:src="@mipmap/ic_msg_contacts"
|
||||
@ -90,33 +89,30 @@
|
||||
<LinearLayout
|
||||
android:id="@+id/top_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<!--系统消息-->
|
||||
<RelativeLayout
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="94dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_news_notice"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:layout_alignBottom="@+id/tv_news_notice"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:src="@mipmap/ic_msg_notice" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_news_notice"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text="@string/activity_msg_news_notice"
|
||||
android:textColor="#333333"
|
||||
@ -130,8 +126,6 @@
|
||||
android:id="@+id/text_news_notice"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="17dp"
|
||||
android:background="@drawable/background_system_message"
|
||||
android:gravity="center"
|
||||
@ -140,32 +134,30 @@
|
||||
android:textSize="12sp"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="94dp"
|
||||
android:layout_weight="1">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_news_interaction"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:layout_alignBottom="@+id/tv_news_interaction"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginBottom="19dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:src="@mipmap/ic_msg_interaction" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_news_interaction"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text="@string/activity_msg_newts_interaction"
|
||||
android:textColor="#333333"
|
||||
@ -179,8 +171,6 @@
|
||||
android:id="@+id/text_news_interaction"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="17dp"
|
||||
android:background="@drawable/background_system_message"
|
||||
android:gravity="center"
|
||||
@ -188,33 +178,30 @@
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="94dp"
|
||||
android:layout_weight="1">
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_system_messages"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:layout_alignBottom="@+id/tv_system_messages"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:src="@mipmap/ic_msg_message" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_system_messages"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text="@string/activity_msg_system_message"
|
||||
android:textColor="#333333"
|
||||
@ -228,8 +215,6 @@
|
||||
android:id="@+id/text_system_messages"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="17dp"
|
||||
android:background="@drawable/background_system_message"
|
||||
android:gravity="center"
|
||||
@ -237,31 +222,30 @@
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="94dp"
|
||||
android:layout_weight="1">
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_news_online"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="54dp"
|
||||
android:layout_alignBottom="@+id/tv_news_online"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:src="@mipmap/ic_msg_service" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv_news_online"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:gravity="center"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text="@string/activity_msg_news_online"
|
||||
android:textColor="#333333"
|
||||
@ -275,8 +259,6 @@
|
||||
android:id="@+id/text_news_online"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="20dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="17dp"
|
||||
android:background="@drawable/background_system_message"
|
||||
android:gravity="center"
|
||||
@ -284,7 +266,9 @@
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp"
|
||||
android:visibility="gone" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
@ -312,12 +296,12 @@
|
||||
android:paddingEnd="20dp">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/tab_icon"
|
||||
@ -363,11 +347,11 @@
|
||||
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: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"
|
||||
@ -377,12 +361,12 @@
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tab_top2"
|
||||
@ -414,12 +398,12 @@
|
||||
<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: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"
|
||||
@ -429,12 +413,12 @@
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:id="@+id/tabLayout3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
android:layout_weight="1"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/tab_top3"
|
||||
@ -466,12 +450,12 @@
|
||||
<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: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"
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.8 KiB |
BIN
main/src/main/res/mipmap-mdpi/icon_collectibles.png
Normal file
After Width: | Height: | Size: 5.7 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 944 B After Width: | Height: | Size: 821 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
BIN
main/src/main/res/mipmap-mdpi/main_my_info_icon.png
Normal file
After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 961 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1020 B |
BIN
main/src/main/res/mipmap-xxhdpi/icon_main_live.png
Normal file
After Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1004 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 889 B |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
BIN
main/src/main/res/mipmap-xxhdpi/main_my_more.png
Normal file
After Width: | Height: | Size: 2.2 KiB |