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 000000000..ee2169555 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/bg1.webp differ diff --git a/main/src/main/res/mipmap-xxhdpi/shezhi.webp b/main/src/main/res/mipmap-xxhdpi/shezhi.webp new file mode 100644 index 000000000..3279a22b9 Binary files /dev/null and b/main/src/main/res/mipmap-xxhdpi/shezhi.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/bg1.webp b/main/src/main/res/mipmap-xxxhdpi/bg1.webp new file mode 100644 index 000000000..a3ff572af Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/bg1.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/gui.webp b/main/src/main/res/mipmap-xxxhdpi/gui.webp new file mode 100644 index 000000000..ccfb5e01b Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/gui.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/image.webp b/main/src/main/res/mipmap-xxxhdpi/image.webp new file mode 100644 index 000000000..19b5f697b Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/image.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/image_3120.webp b/main/src/main/res/mipmap-xxxhdpi/image_3120.webp new file mode 100644 index 000000000..14092c312 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/image_3120.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/jiahao.webp b/main/src/main/res/mipmap-xxxhdpi/jiahao.webp new file mode 100644 index 000000000..b1b715791 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/jiahao.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/shezhi.webp b/main/src/main/res/mipmap-xxxhdpi/shezhi.webp new file mode 100644 index 000000000..543248618 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/shezhi.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/shouhu.webp b/main/src/main/res/mipmap-xxxhdpi/shouhu.webp new file mode 100644 index 000000000..02b0e9811 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/shouhu.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/subtract.webp b/main/src/main/res/mipmap-xxxhdpi/subtract.webp new file mode 100644 index 000000000..0a489c276 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/subtract.webp differ diff --git a/main/src/main/res/mipmap-xxxhdpi/xiugai.webp b/main/src/main/res/mipmap-xxxhdpi/xiugai.webp new file mode 100644 index 000000000..050d4f723 Binary files /dev/null and b/main/src/main/res/mipmap-xxxhdpi/xiugai.webp differ