From 25a926e5075268c803302d272d3b1baf802fd7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E7=9A=AE?=
<14840170+lao-pi123@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 16:08:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E7=89=88=20=E6=88=91?=
=?UTF-8?q?=E7=9A=84=20=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/src/main/res/values/colors.xml | 3 +
.../yunbao/main/views/MainMeViewHolder.java | 143 +---
.../main/views/MainMeViewHolder_PD.java | 701 ++++++++++++++++++
main/src/main/res/drawable/new_me_shape.xml | 6 +
main/src/main/res/drawable/new_me_shape_1.xml | 5 +
main/src/main/res/drawable/new_me_shape_2.xml | 5 +
.../main/res/drawable/new_me_shape_line.xml | 7 +
main/src/main/res/layout/view_new_main_me.xml | 477 ++++++++++++
main/src/main/res/mipmap-xxhdpi/bg1.webp | Bin 0 -> 743126 bytes
main/src/main/res/mipmap-xxhdpi/shezhi.webp | Bin 0 -> 3542 bytes
main/src/main/res/mipmap-xxxhdpi/bg1.webp | Bin 0 -> 1418144 bytes
main/src/main/res/mipmap-xxxhdpi/gui.webp | Bin 0 -> 25448 bytes
main/src/main/res/mipmap-xxxhdpi/image.webp | Bin 0 -> 5994 bytes
.../main/res/mipmap-xxxhdpi/image_3120.webp | Bin 0 -> 6102 bytes
main/src/main/res/mipmap-xxxhdpi/jiahao.webp | Bin 0 -> 998 bytes
main/src/main/res/mipmap-xxxhdpi/shezhi.webp | Bin 0 -> 2048 bytes
main/src/main/res/mipmap-xxxhdpi/shouhu.webp | Bin 0 -> 26824 bytes
.../src/main/res/mipmap-xxxhdpi/subtract.webp | Bin 0 -> 7214 bytes
main/src/main/res/mipmap-xxxhdpi/xiugai.webp | Bin 0 -> 924 bytes
19 files changed, 1243 insertions(+), 104 deletions(-)
create mode 100644 main/src/main/java/com/yunbao/main/views/MainMeViewHolder_PD.java
create mode 100644 main/src/main/res/drawable/new_me_shape.xml
create mode 100644 main/src/main/res/drawable/new_me_shape_1.xml
create mode 100644 main/src/main/res/drawable/new_me_shape_2.xml
create mode 100644 main/src/main/res/drawable/new_me_shape_line.xml
create mode 100644 main/src/main/res/layout/view_new_main_me.xml
create mode 100644 main/src/main/res/mipmap-xxhdpi/bg1.webp
create mode 100644 main/src/main/res/mipmap-xxhdpi/shezhi.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/bg1.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/gui.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/image.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/image_3120.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/jiahao.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/shezhi.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/shouhu.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/subtract.webp
create mode 100644 main/src/main/res/mipmap-xxxhdpi/xiugai.webp
diff --git a/common/src/main/res/values/colors.xml b/common/src/main/res/values/colors.xml
index 5fe3b1b9b..dd185dfa8 100644
--- a/common/src/main/res/values/colors.xml
+++ b/common/src/main/res/values/colors.xml
@@ -87,4 +87,7 @@
#F4F4F4
#555555
#525252
+
+ #FF8D8D
+ #FF7CB6
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
index 6ff717a41..d70964312 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@@ -17,6 +17,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -93,29 +94,18 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
private ImageView mAvatar;
private TextView mName, tv_level;
- private ImageView mSex;
- private ImageView mLevelAnchor;
- private ImageView mLevel, img_setting;
private TextView mID;
- private TextView mFollow;
- private TextView mFans;
private boolean mPaused;
private RecyclerView mRecyclerView;
private MainMeAdapter mAdapter;
- private TextView signature;
private TextView coin, gold, star_coin;//金豆,钻石,星币
- private TextView btnCopy;
- private SVGAImageView gift_svga;
- private View v_noble;
- private FrameLayout lt_noble;
// private LinearLayout btnUserNoble;
- private ImageView user_noble_ico, good_nub_ico, img_lv_pic;
- private TextView user_noble_text, user_noble_time, tv_setting;
+ private ImageView user_noble_ico;
+ private TextView user_noble_text, user_noble_time;
private UserItemBean beanStetting = null, beanKefu = null;
private boolean firstInto = true;
private Banner banner_me;
- private LinearLayout lt_advertisement;
- private View redPoint;
+ private CardView lt_advertisement;
public MainMeViewHolder(Context context, ViewGroup parentView) {
super(context, parentView);
@@ -123,14 +113,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
@Override
protected int getLayoutId() {
- return R.layout.view_main_me;
+ return R.layout.view_new_main_me;
}
@SuppressLint("WrongViewCast")
@Override
public void init() {
mAvatar = (ImageView) findViewById(R.id.avatar);
- redPoint = findViewById(R.id.red_point);
ViewClicksAntiShake.clicksAntiShake(mAvatar, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
@@ -141,69 +130,52 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
mName = (TextView) findViewById(R.id.name);
- gift_svga = (SVGAImageView) findViewById(com.yunbao.live.R.id.gift_svga);
- ViewClicksAntiShake.clicksAntiShake(gift_svga, new ViewClicksAntiShake.ViewClicksCallBack() {
- @Override
- public void onViewClicks() {
- MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
- RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
- }
- });
+
+
user_noble_ico = (ImageView) findViewById(R.id.user_noble_ico);
- mLevelAnchor = (ImageView) findViewById(R.id.level_anchor);
- mLevel = (ImageView) findViewById(R.id.level);
tv_level = (TextView) findViewById(R.id.tv_level);
- good_nub_ico = (ImageView) findViewById(R.id.good_nub_ico);
mID = (TextView) findViewById(R.id.id_val);
- signature = (TextView) findViewById(R.id.signature);
coin = (TextView) findViewById(R.id.coin);
star_coin = (TextView) findViewById(R.id.star_coin);
gold = (TextView) findViewById(R.id.gold);
- btnCopy = (TextView) findViewById(R.id.btn_copy);
user_noble_text = (TextView) findViewById(R.id.user_noble_text);
- img_setting = (ImageView) findViewById(R.id.img_setting);
- v_noble = (View) findViewById(R.id.v_noble);
- lt_noble = (FrameLayout) findViewById(R.id.lt_noble);
user_noble_time = (TextView) findViewById(R.id.user_noble_time);
+
banner_me = (Banner) findViewById(R.id.banner_me);
- lt_advertisement = (LinearLayout) findViewById(R.id.lt_advertisement);
- img_lv_pic = (ImageView) findViewById(R.id.img_lv_pic);
- tv_setting = (TextView) findViewById(R.id.tv_setting);
+ lt_advertisement = (CardView) findViewById(R.id.lt_advertisement);
+
+
findViewById(R.id.lt_star_coin).setOnClickListener(this);
findViewById(R.id.btn_coin).setOnClickListener(this);
findViewById(R.id.btn_gold).setOnClickListener(this);
-
- findViewById(R.id.rt_kefu).setOnClickListener(this);
findViewById(R.id.rt_setting).setOnClickListener(this);
- findViewById(R.id.lt_noble).setOnClickListener(this);
- findViewById(R.id.lt_name).setOnClickListener(this);
- findViewById(R.id.signature).setOnClickListener(this);
- findViewById(R.id.lt_guard).setOnClickListener(this);
- btnCopy.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
- cm.setText(mID.getText() + "");
- Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show();
- }
- });
+ findViewById(R.id.name).setOnClickListener(this);
+ findViewById(R.id.btn_edit).setOnClickListener(this);
+ //贵族中心 guizu_center_tv,user_noble_ico,user_noble_text,user_noble_time
+ findViewById(R.id.guizu_center_tv).setOnClickListener(this);
+ findViewById(R.id.user_noble_ico).setOnClickListener(this);
+ findViewById(R.id.user_noble_text).setOnClickListener(this);
+ findViewById(R.id.user_noble_time).setOnClickListener(this);
+
+ // 守护 shouhu_center,shouhu_center_iv,shouhu_center_tv,shouhu_center_tv2
+ findViewById(R.id.shouhu_center).setOnClickListener(this);
+ findViewById(R.id.shouhu_center_iv).setOnClickListener(this);
+ findViewById(R.id.shouhu_center_tv).setOnClickListener(this);
+ findViewById(R.id.shouhu_center_tv2).setOnClickListener(this);
+
+
+
mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
+
banner_me.setOutlineProvider(new ViewOutlineProvider() {
@Override
public void getOutline(View view, Outline outline) {
outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10);
}
});
- redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE);
- ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() {
- @Override
- public void onViewClicks() {
- mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
- }
- });
}
@Override
@@ -307,6 +279,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
}
}
showBanner();
+
ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
mName.setText(u.getUserNiceName());
if (!"0".endsWith(u.getNoble_id())) {
@@ -325,44 +298,18 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
}
}
- signature.setText(singnature);
CommonAppConfig appConfig = CommonAppConfig.getInstance();
- if (u.getDress().getAvatar_frame() != null) {
- if (u.getDress().getAvatar_frame().contains("svga")) {
- try {
- new SVGAParser(mContext).parse(new URL(u.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() {
- @Override
- public void onComplete(SVGAVideoEntity videoItem) {
- SVGADrawable drawable = new SVGADrawable(videoItem);
- gift_svga.setImageDrawable(drawable);
- SVGAViewUtils.playEndClear(gift_svga, false);
- }
-
- @Override
- public void onError() {
- }
- });
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- } else {
- ImgLoader.display(mContext, u.getDress().getAvatar_frame(), gift_svga);
- }
- }
if (u.getDress().getMedal() != null) {
Log.e("tag", u.getDress().getMedal());
- ImgLoader.displayWithError(mContext, u.getDress().getMedal(), user_noble_ico, R.mipmap.icon_vip_gold);
+ ImgLoader.displayWithError(mContext, u.getDress().getMedal(), user_noble_ico, R.mipmap.gui);
} else {
- user_noble_ico.setImageResource(R.mipmap.icon_vip_gold);
+ user_noble_ico.setImageResource(R.mipmap.gui);
}
if ("C".equals(u.getUsers_type())) {
Constants.isAnchor = true;
- good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
-
- ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
//主播等级
tv_level.setOnClickListener(new View.OnClickListener() {
@Override
@@ -372,14 +319,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ZhuangBanActivity.forward(mContext, url);
}
});
- tv_level.setText(u.getLevel() + "");
+ tv_level.setText("LV " + u.getLevel() );
} else {
Constants.isAnchor = false;
new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() {
@Override
public void onLoadSuccess(Drawable drawable) {
- ImgLoader.display2(mContext, drawable, mLevel);
+// ImgLoader.display2(mContext, drawable, mLevel);
}
@Override
@@ -396,15 +343,13 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
ZhuangBanActivity.forward(mContext, url);
}
});
- tv_level.setText(u.getLevel() + "");
+ tv_level.setText("LV " + u.getLevel() );
}
//修改靓号图标 个人中心
if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
- good_nub_ico.setVisibility(View.VISIBLE);
mID.setText(" " + u.getGoodnum());
} else {
- good_nub_ico.setVisibility(View.GONE);
mID.setText(u.getLiangNameTip());
}
if (list != null && list.size() > 0) {
@@ -428,20 +373,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
}
if (beanKefu != null) {
}
- if (beanStetting != null) {
- ImgLoader.display(mContext, beanStetting.getThumb(), img_setting);
- tv_setting.setText(beanStetting.getName());
- }
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);
- } else {
- 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));
}
@Override
@@ -523,7 +456,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
public void onClick(View v) {
int i = v.getId();
- if (i == R.id.lt_name) {
+ if (i == R.id.btn_edit || i == R.id.name) {
mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
} else if (i == R.id.signature) {
mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
@@ -546,13 +479,15 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
WebViewActivity.forward(mContext, beanKefu.getHref(), false);
} else if (i == R.id.rt_setting) {
forwardSetting();
- } else if (i == R.id.lt_noble) {
+ } else if (i == R.id.guizu_center_tv || i == R.id.user_noble_ico || i == R.id.user_noble_text || i == R.id.user_noble_time) {
+ //贵族中心 guizu_center_tv,user_noble_ico,user_noble_text,user_noble_time
MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
Constants.isTitle = true;
UserBean u = CommonAppConfig.getInstance().getUserBean();
String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
ZhuangBanActivity.forward(mContext, url, false);
- } else if (i == R.id.lt_guard) {
+ } else if (i == R.id.shouhu_center || i == R.id.shouhu_center_iv || i == R.id.shouhu_center_tv || i == R.id.shouhu_center_tv2) {
+ // 守护 shouhu_center,shouhu_center_iv,shouhu_center_tv,shouhu_center_tv2
MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数");
Constants.isTitle = true;
UserBean u = CommonAppConfig.getInstance().getUserBean();
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder_PD.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder_PD.java
new file mode 100644
index 000000000..7e93c2371
--- /dev/null
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder_PD.java
@@ -0,0 +1,701 @@
+package com.yunbao.main.views;
+
+import android.annotation.SuppressLint;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Outline;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ms.banner.Banner;
+import com.ms.banner.BannerConfig;
+import com.ms.banner.listener.OnBannerClickListener;
+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.CommonAppContext;
+import com.yunbao.common.Constants;
+import com.yunbao.common.HtmlConfig;
+import com.yunbao.common.activity.WebViewActivity;
+import com.yunbao.common.bean.GoogleBean;
+import com.yunbao.common.bean.UserBean;
+import com.yunbao.common.bean.UserItemBean;
+import com.yunbao.common.event.CompleteInformationEvent;
+import com.yunbao.common.glide.ImgLoader;
+import com.yunbao.common.http.HttpCallback;
+import com.yunbao.common.interfaces.CommonCallback;
+import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.manager.APKManager;
+import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.MobclickAgent;
+import com.yunbao.common.utils.RouteUtil;
+import com.yunbao.common.utils.SVGAViewUtils;
+import com.yunbao.common.utils.StringUtil;
+import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.AbsMainViewHolder;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
+import com.yunbao.live.activity.LiveRecordActivity;
+import com.yunbao.live.activity.RoomManageActivity;
+import com.yunbao.live.activity.WebViewActivityMedal;
+import com.yunbao.live.bean.SlideBean;
+import com.yunbao.live.utils.LiveTextRender;
+import com.yunbao.live.views.CustomMyViewHolder;
+import com.yunbao.main.R;
+import com.yunbao.main.activity.EditProfileActivity;
+import com.yunbao.main.activity.FansActivity;
+import com.yunbao.main.activity.FollowActivity;
+import com.yunbao.main.activity.MyProfitActivity;
+import com.yunbao.main.activity.MyVideoActivity;
+import com.yunbao.main.activity.MyWalletActivity;
+import com.yunbao.main.activity.RewardActivity;
+import com.yunbao.main.activity.SettingActivity;
+import com.yunbao.main.activity.ThreeDistributActivity;
+import com.yunbao.main.activity.ZhuangBanActivity;
+import com.yunbao.main.adapter.MainMeAdapter;
+import com.yunbao.main.http.MainHttpConsts;
+import com.yunbao.main.http.MainHttpUtil;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Created by cxf on 2018/9/22.
+ * 我的
+ */
+
+public class MainMeViewHolder_PD extends AbsMainViewHolder implements OnItemClickListener, View.OnClickListener {
+
+ private ImageView mAvatar;
+ private TextView mName, tv_level;
+ private ImageView mSex;
+ private ImageView mLevelAnchor;
+ private ImageView mLevel, img_setting;
+ private TextView mID;
+ private TextView mFollow;
+ private TextView mFans;
+ private boolean mPaused;
+ private RecyclerView mRecyclerView;
+ private MainMeAdapter mAdapter;
+ private TextView signature;
+ private TextView coin, gold, star_coin;//金豆,钻石,星币
+ private TextView btnCopy;
+ private SVGAImageView gift_svga;
+ private View v_noble;
+ private FrameLayout lt_noble;
+ // private LinearLayout btnUserNoble;
+ private ImageView user_noble_ico, good_nub_ico, img_lv_pic;
+ private TextView user_noble_text, user_noble_time, tv_setting;
+ private UserItemBean beanStetting = null, beanKefu = null;
+ private boolean firstInto = true;
+ private Banner banner_me;
+ private LinearLayout lt_advertisement;
+ private View redPoint;
+
+ public MainMeViewHolder_PD(Context context, ViewGroup parentView) {
+ super(context, parentView);
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.view_main_me;
+ }
+
+ @SuppressLint("WrongViewCast")
+ @Override
+ public void init() {
+ mAvatar = (ImageView) findViewById(R.id.avatar);
+ redPoint = findViewById(R.id.red_point);
+ ViewClicksAntiShake.clicksAntiShake(mAvatar, new ViewClicksAntiShake.ViewClicksCallBack() {
+ @Override
+ public void onViewClicks() {
+ MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
+ RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
+ }
+ });
+
+
+ mName = (TextView) findViewById(R.id.name);
+ gift_svga = (SVGAImageView) findViewById(com.yunbao.live.R.id.gift_svga);
+ ViewClicksAntiShake.clicksAntiShake(gift_svga, new ViewClicksAntiShake.ViewClicksCallBack() {
+ @Override
+ public void onViewClicks() {
+ MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
+ RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
+ }
+ });
+ user_noble_ico = (ImageView) findViewById(R.id.user_noble_ico);
+ mLevelAnchor = (ImageView) findViewById(R.id.level_anchor);
+ mLevel = (ImageView) findViewById(R.id.level);
+ tv_level = (TextView) findViewById(R.id.tv_level);
+ good_nub_ico = (ImageView) findViewById(R.id.good_nub_ico);
+ mID = (TextView) findViewById(R.id.id_val);
+ signature = (TextView) findViewById(R.id.signature);
+ coin = (TextView) findViewById(R.id.coin);
+ star_coin = (TextView) findViewById(R.id.star_coin);
+ gold = (TextView) findViewById(R.id.gold);
+ btnCopy = (TextView) findViewById(R.id.btn_copy);
+ user_noble_text = (TextView) findViewById(R.id.user_noble_text);
+ img_setting = (ImageView) findViewById(R.id.img_setting);
+ v_noble = (View) findViewById(R.id.v_noble);
+ lt_noble = (FrameLayout) findViewById(R.id.lt_noble);
+ user_noble_time = (TextView) findViewById(R.id.user_noble_time);
+ banner_me = (Banner) findViewById(R.id.banner_me);
+ lt_advertisement = (LinearLayout) findViewById(R.id.lt_advertisement);
+ img_lv_pic = (ImageView) findViewById(R.id.img_lv_pic);
+ tv_setting = (TextView) findViewById(R.id.tv_setting);
+ findViewById(R.id.lt_star_coin).setOnClickListener(this);
+ findViewById(R.id.btn_coin).setOnClickListener(this);
+ findViewById(R.id.btn_gold).setOnClickListener(this);
+
+ findViewById(R.id.rt_kefu).setOnClickListener(this);
+ findViewById(R.id.rt_setting).setOnClickListener(this);
+ findViewById(R.id.lt_noble).setOnClickListener(this);
+ findViewById(R.id.lt_name).setOnClickListener(this);
+ findViewById(R.id.signature).setOnClickListener(this);
+ findViewById(R.id.lt_guard).setOnClickListener(this);
+
+ btnCopy.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+ cm.setText(mID.getText() + "");
+ Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show();
+ }
+ });
+ mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
+ mRecyclerView.setHasFixedSize(true);
+ mRecyclerView.setLayoutManager(new GridLayoutManager(mContext, 4, GridLayoutManager.VERTICAL, false));
+ banner_me.setOutlineProvider(new ViewOutlineProvider() {
+ @Override
+ public void getOutline(View view, Outline outline) {
+ outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), 10);
+ }
+ });
+ redPoint.setVisibility(APKManager.get().getApkVerNew() ? View.GONE : View.VISIBLE);
+ ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.complete_information), new ViewClicksAntiShake.ViewClicksCallBack() {
+ @Override
+ public void onViewClicks() {
+ mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
+ }
+ });
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mPaused = true;
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (isShowed() && mPaused) {
+ loadData();
+ }
+ mPaused = false;
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ MainHttpUtil.cancel(MainHttpConsts.GET_BASE_INFO);
+ }
+
+ @Override
+ public void loadData() {
+ MainHttpUtil.getGoogle(mCallback1);
+ MainHttpUtil.getBaseInfo(mCallback);
+ MainHttpUtil.getBalance(new HttpCallback() {
+ @Override
+ public void onSuccess(int code, String msg, String[] info) {
+ if (code == 0) {
+ JSONObject obj = JSONObject.parseObject(info[0]);
+ String golds = obj.getString("gold");
+ String coins = obj.getString("coin");
+ String yuanbaos = obj.getString("yuanbao");
+ if (golds.length() > 8) {
+ gold.setText(golds.substring(0, golds.length() - 6) + "M");
+ } else if (golds.length() > 6) {
+ gold.setText(golds.substring(0, golds.length() - 3) + "K");
+ } else {
+ gold.setText(golds);
+ }
+ if (coins.length() > 8) {
+ coin.setText(coins.substring(0, coins.length() - 6) + "M");
+ } else if (coins.length() > 6) {
+ coin.setText(coins.substring(0, coins.length() - 3) + "K");
+ } else {
+ coin.setText(coins);
+ }
+ BigDecimal yuanbao = new BigDecimal(yuanbaos);
+ String yuanbaoStr = String.valueOf(yuanbao.intValue());
+ if (yuanbaoStr.length() > 9) {
+ star_coin.setText(yuanbaoStr.substring(0, yuanbaoStr.length() - 6) + "M");
+ } else if (yuanbaoStr.length() > 7) {
+ star_coin.setText(yuanbaoStr.substring(0, yuanbaoStr.length() - 3) + "K");
+ } else {
+ star_coin.setText(yuanbaos);
+ }
+ } else {
+ ToastUtil.show(msg);
+ }
+ }
+ });
+
+ }
+
+
+ //获取谷歌
+ //谷歌支付是否打开 1是打开 0 关闭
+ String Is_hide = "1";
+ private CommonCallback mCallback1 = new CommonCallback() {
+ @Override
+ public void callback(GoogleBean bean) {
+ if (bean != null) {
+ Is_hide = bean.getIs_hide();
+ }
+ }
+ };
+
+ private CommonCallback mCallback = new CommonCallback() {
+ @Override
+ public void callback(UserBean bean) {
+ List list = CommonAppConfig.getInstance().getUserItemList();
+ if (bean != null) {
+ showData(bean, list);
+ }
+ }
+ };
+
+ private List mBannerListNew = new ArrayList<>();
+
+ private void showData(UserBean u, List list) {
+ mBannerList.clear();
+ mBannerListNew.clear();
+ if (!StringUtil.isEmpty(u.getSlide())) {
+ mBannerListNew.addAll(JSON.parseArray(u.getSlide(), SlideBean.class));
+ for (SlideBean bean : mBannerListNew) {
+ if (bean.getSlide_status().equals("1")) {
+ mBannerList.add(bean);
+ }
+ }
+ }
+ showBanner();
+ ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
+ mName.setText(u.getUserNiceName());
+ if (!"0".endsWith(u.getNoble_id())) {
+ user_noble_text.setText(u.getNoble_name());
+ user_noble_time.setText(u.getNoble_end_time());
+ } else {
+ user_noble_text.setText(WordUtil.isNewZh() ? "貴族中心" : "VIP Center");
+ user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text));
+ }
+ String singnature = u.getSignature();
+ if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") || TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
+ if (WordUtil.isNewZh()) {
+ singnature = "這個人很懶，什麼也沒留下";
+ } else {
+ singnature = "The guy was lazy and didn't write anything.";
+ }
+
+ }
+ signature.setText(singnature);
+ CommonAppConfig appConfig = CommonAppConfig.getInstance();
+
+ if (u.getDress().getAvatar_frame() != null) {
+ if (u.getDress().getAvatar_frame().contains("svga")) {
+ try {
+ new SVGAParser(mContext).parse(new URL(u.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() {
+ @Override
+ public void onComplete(SVGAVideoEntity videoItem) {
+ SVGADrawable drawable = new SVGADrawable(videoItem);
+ gift_svga.setImageDrawable(drawable);
+ SVGAViewUtils.playEndClear(gift_svga, false);
+ }
+
+ @Override
+ public void onError() {
+ }
+ });
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ } else {
+ ImgLoader.display(mContext, u.getDress().getAvatar_frame(), gift_svga);
+ }
+ }
+
+ if (u.getDress().getMedal() != null) {
+ Log.e("tag", u.getDress().getMedal());
+ ImgLoader.displayWithError(mContext, u.getDress().getMedal(), user_noble_ico, R.mipmap.icon_vip_gold);
+ } else {
+ user_noble_ico.setImageResource(R.mipmap.icon_vip_gold);
+ }
+ if ("C".equals(u.getUsers_type())) {
+ Constants.isAnchor = true;
+ good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
+
+
+ ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
+ //主播等级
+ tv_level.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ MobclickAgent.onEvent(mContext, "my_top_level", "个人中心最上面的等级");
+ String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
+ ZhuangBanActivity.forward(mContext, url);
+ }
+ });
+ tv_level.setText(u.getLevel() + "");
+
+ } else {
+ Constants.isAnchor = false;
+ new LiveTextRender().getLevelImage(mContext, u.getLevel(), new ImgLoader.DrawableCallback() {
+ @Override
+ public void onLoadSuccess(Drawable drawable) {
+ ImgLoader.display2(mContext, drawable, mLevel);
+ }
+
+ @Override
+ public void onLoadFailed() {
+
+ }
+ });
+ //用户等级
+ tv_level.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ MobclickAgent.onEvent(mContext, "my_top_level", "个人中心最上面的等级");
+ String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + ((IMLoginManager.get(CommonAppContext.sInstance.getBaseContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
+ ZhuangBanActivity.forward(mContext, url);
+ }
+ });
+ tv_level.setText(u.getLevel() + "");
+
+ }
+ //修改靓号图标 个人中心
+ if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
+ good_nub_ico.setVisibility(View.VISIBLE);
+ mID.setText(" " + u.getGoodnum());
+ } else {
+ good_nub_ico.setVisibility(View.GONE);
+ mID.setText(u.getLiangNameTip());
+ }
+ if (list != null && list.size() > 0) {
+ List listNow = new ArrayList<>();
+ for (UserItemBean userItemBean : list) {
+ if (userItemBean.getId() != 21 && userItemBean.getId() != 13) {
+ listNow.add(userItemBean);
+ } else if (userItemBean.getId() == 21) {
+ beanKefu = userItemBean;
+ } else if (userItemBean.getId() == 13) {
+ beanStetting = userItemBean;
+ }
+ }
+ if (mAdapter == null) {
+ mAdapter = new MainMeAdapter(mContext, listNow);
+ mAdapter.setOnItemClickListener(this);
+ mRecyclerView.setAdapter(mAdapter);
+ } else {
+ mAdapter.setList(listNow);
+ }
+ }
+ if (beanKefu != null) {
+ }
+ if (beanStetting != null) {
+ ImgLoader.display(mContext, beanStetting.getThumb(), img_setting);
+ tv_setting.setText(beanStetting.getName());
+ }
+ 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);
+ } else {
+ 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));
+ }
+
+ @Override
+ public void onItemClick(UserItemBean bean, int position) {
+ String url = bean.getHref();
+ if (TextUtils.isEmpty(url)) {
+ switch (bean.getId()) {
+ case 1:
+ forwardProfit();
+ break;
+ case 2:
+ MobclickAgent.onEvent(mContext, "my_wallet", "个人中心点钱包");
+ forwardCoin();
+ break;
+ case 13:
+// forwardSetting();
+ break;
+ case 19:
+ forwardMyVideo();
+ break;
+ case 20:
+ MobclickAgent.onEvent(mContext, "my_room", "个人中心点房间管理");
+ forwardRoomManage();
+ break;
+ case 26:
+ case 17:
+ RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
+ break;
+ }
+ } else {
+ //21 在线客服
+ Log.i("tag", bean.getId() + "");
+ if (bean.getId() == 8) {//三级分销
+ ThreeDistributActivity.forward(mContext, bean.getName(), url);
+ } else {
+ if (bean.getId() == 31) {
+ MobclickAgent.onEvent(mContext, "my_medal", "个人中心点勋章");
+ //跳转网页版粉丝徽章
+ WebViewActivityMedal.forward(mContext, url);
+ } else if (bean.getId() == 5) {
+ MobclickAgent.onEvent(mContext, "my_decorate", "个人中心点装扮");
+ Constants.isTitle = true;
+ ZhuangBanActivity.forward(mContext, CommonAppConfig.HOST + "/h5/Personality.html");
+ } else if (bean.getId() == 23) { //獎勵中心
+ MobclickAgent.onEvent(mContext, "my_award", "獎勵中心");
+ Log.i("tsa", url);
+ RewardActivity.forward(mContext, url);
+ } else if (bean.getId() == 4) {
+
+ url = HtmlConfig.SHOP + "?t=" + Math.random() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + ((IMLoginManager.get(mContext).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) ? "1" : "0");
+ WebViewActivity.forward(mContext, url, false);
+ } else if (bean.getId() == 3) {//我的等级
+ MobclickAgent.onEvent(mContext, "my_level", "个人中心点我的等级");
+ Constants.myIntoIndex = 2;
+ Constants.isTitle = false;
+ ZhuangBanActivity.forward(mContext, url);
+ } else {
+ if (bean.getId() == 11) {
+ MobclickAgent.onEvent(mContext, "my_anchor", "个人中心点主播中心");
+ }
+ if (bean.getId() == 25) {
+ MobclickAgent.onEvent(mContext, "my_friend_invitation", "个人中心点好友邀请");
+ }
+ if (bean.getId() == 24) {
+ MobclickAgent.onEvent(mContext, "my_pack", "个人中心点包裹");
+ }
+ if (bean.getId() == 17 || bean.getId() == 26) {
+ RouteUtil.forwardActivity(RouteUtil.PATH_FEEDBACK_ACTIVITY);
+ } else
+ WebViewActivity.forward(mContext, url, false);
+ }
+
+ }
+ }
+ }
+
+
+ @Override
+ public void onClick(View v) {
+
+ int i = v.getId();
+ if (i == R.id.lt_name) {
+ mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
+ } else if (i == R.id.signature) {
+ mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
+ } else if (i == R.id.lt_star_coin) {
+ Map map_ekv = new HashMap();
+ map_ekv.put("from", "xb");
+ MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+ mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 1));
+ } else if (i == R.id.btn_coin) {
+ Map map_ekv = new HashMap();
+ map_ekv.put("from", "zs");
+ MobclickAgent.onEvent(mContext, "my_recharge", map_ekv);
+ mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 0));
+ } else if (i == R.id.btn_gold) {
+ MobclickAgent.onEvent(mContext, "my_receive", "充值旁边领取金豆的按钮");
+ // mContext.startActivity(new Intent(mContext, MyWalletActivity.class).putExtra("p", 2));
+ String url = CommonAppConfig.HOST + "/index.php?g=Appapi&m=task&a=index";
+ RewardActivity.forward(mContext, url);
+ } else if (i == R.id.rt_kefu) {
+ WebViewActivity.forward(mContext, beanKefu.getHref(), false);
+ } else if (i == R.id.rt_setting) {
+ forwardSetting();
+ } else if (i == R.id.lt_noble) {
+ MobclickAgent.onEvent(mContext, "my_noble", "个人中心点贵族");
+ Constants.isTitle = true;
+ UserBean u = CommonAppConfig.getInstance().getUserBean();
+ String url = CommonAppConfig.HOST + "/h5/Noble/index.html?nickname=" + u.getUserNiceName() + "&usernobId=" + u.getNoble_id() + "&token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+ ZhuangBanActivity.forward(mContext, url, false);
+ } else if (i == R.id.lt_guard) {
+ MobclickAgent.onEvent(mContext, "my_guard_btn", "我的-守护点击次数及人数");
+ Constants.isTitle = true;
+ UserBean u = CommonAppConfig.getInstance().getUserBean();
+ String url = CommonAppConfig.HOST + "/h5/Guard/index.html?token=" + CommonAppConfig.getInstance().getToken()
+ + "&uid=" + CommonAppConfig.getInstance().getUid() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+ ZhuangBanActivity.forward(mContext, url, false);
+ }
+
+
+ }
+
+ /**
+ * 编辑个人资料
+ */
+ private void forwardEditProfile() {
+ mContext.startActivity(new Intent(mContext, EditProfileActivity.class));
+ }
+
+ /**
+ * 我的关注
+ */
+ private void forwardFollow() {
+ FollowActivity.forward(mContext, CommonAppConfig.getInstance().getUid(), 0);
+ }
+
+ /**
+ * 我的粉丝
+ */
+ private void forwardFans() {
+ FansActivity.forward(mContext, CommonAppConfig.getInstance().getUid());
+ }
+
+ /**
+ * 直播记录
+ */
+ private void forwardLiveRecord() {
+ LiveRecordActivity.forward(mContext, CommonAppConfig.getInstance().getUserBean());
+ }
+
+ /**
+ * 我的收益
+ */
+ private void forwardProfit() {
+ mContext.startActivity(new Intent(mContext, MyProfitActivity.class));
+ }
+
+ /**
+ * 我的钻石
+ */
+ private void forwardCoin() {
+ RouteUtil.forwardMyCoin(mContext);
+
+ }
+
+ /**
+ * 设置
+ */
+ private void forwardSetting() {
+ mContext.startActivity(new Intent(mContext, SettingActivity.class));
+ }
+
+ /**
+ * 我的视频
+ */
+ private void forwardMyVideo() {
+ mContext.startActivity(new Intent(mContext, MyVideoActivity.class));
+ }
+
+ /**
+ * 房间管理
+ */
+ private void forwardRoomManage() {
+ mContext.startActivity(new Intent(mContext, RoomManageActivity.class));
+ }
+
+
+ public static List mBannerList = new ArrayList<>();
+
+ private void showBanner() {
+ if (mBannerList == null || mBannerList.size() <= 0 || banner_me == null) {
+ lt_advertisement.setVisibility(View.GONE);
+ return;
+ }
+ lt_advertisement.setVisibility(View.VISIBLE);
+ if (mBannerList.size() == 1) {
+ banner_me.setAutoPlay(false)
+ .setPages(mBannerList, new CustomMyViewHolder())
+ .setDelayTime(3000)
+ .setBannerStyle(BannerConfig.NOT_INDICATOR)
+ .setOnBannerClickListener(new OnBannerClickListener() {
+ @Override
+ public void onBannerClick(List datas, int p) {
+ if (mBannerList != null) {
+ if (p >= 0 && p < mBannerList.size()) {
+ SlideBean bean = mBannerList.get(p);
+ if (!bean.getSlide_url().equals("")) {
+ Constants.isTitle = true;
+ String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+ WebViewActivity.forward(mContext, url, false, false);
+
+ Map map_ekv = new HashMap();
+ map_ekv.put("link", url);
+ MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
+
+ }
+ }
+ }
+ }
+ })
+ .start();
+ } else {
+ banner_me.setAutoPlay(true)
+ .setPages(mBannerList, new CustomMyViewHolder())
+ .setDelayTime(3000)
+ .setBannerStyle(BannerConfig.NOT_INDICATOR)
+ .setOnBannerClickListener(new OnBannerClickListener() {
+ @Override
+ public void onBannerClick(List datas, int p) {
+ if (mBannerList != null) {
+ if (p >= 0 && p < mBannerList.size()) {
+ SlideBean bean = mBannerList.get(p);
+ if (!bean.getSlide_url().equals("")) {
+ Constants.isTitle = true;
+ String url = bean.getSlide_url() + "?uid=" + CommonAppConfig.getInstance().getUid() + "&token=" + CommonAppConfig.getInstance().getToken() + "&isZh=" + (WordUtil.isNewZh() ? "1" : "0");
+ RouteUtil.forwardCustomerService(url);
+
+ Map map_ekv = new HashMap();
+ map_ekv.put("link", url);
+ MobclickAgent.onEvent(mContext, "my_banner", map_ekv);
+
+ /*if(bean.getSlide_id().equals("95")){
+ RouteUtil.forwardCustomerService(url);
+ }else {
+ ZhuangBanActivity.forward(mContext, url, false);
+ }*/
+ }
+ }
+ }
+ }
+ })
+ .start();
+ }
+ }
+
+}
+
diff --git a/main/src/main/res/drawable/new_me_shape.xml b/main/src/main/res/drawable/new_me_shape.xml
new file mode 100644
index 000000000..7cbb54a58
--- /dev/null
+++ b/main/src/main/res/drawable/new_me_shape.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main/src/main/res/drawable/new_me_shape_1.xml b/main/src/main/res/drawable/new_me_shape_1.xml
new file mode 100644
index 000000000..9990c89d7
--- /dev/null
+++ b/main/src/main/res/drawable/new_me_shape_1.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/main/src/main/res/drawable/new_me_shape_2.xml b/main/src/main/res/drawable/new_me_shape_2.xml
new file mode 100644
index 000000000..5db5dac28
--- /dev/null
+++ b/main/src/main/res/drawable/new_me_shape_2.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/main/src/main/res/drawable/new_me_shape_line.xml b/main/src/main/res/drawable/new_me_shape_line.xml
new file mode 100644
index 000000000..eaad2843a
--- /dev/null
+++ b/main/src/main/res/drawable/new_me_shape_line.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main/src/main/res/layout/view_new_main_me.xml b/main/src/main/res/layout/view_new_main_me.xml
new file mode 100644
index 000000000..955e3ecde
--- /dev/null
+++ b/main/src/main/res/layout/view_new_main_me.xml
@@ -0,0 +1,477 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/main/src/main/res/mipmap-xxhdpi/bg1.webp b/main/src/main/res/mipmap-xxhdpi/bg1.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ee21695552a891a0a3f2595da5a0bfefc87b5dcd
GIT binary patch
literal 743126
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