yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_6.5.5_语聊' into dev_6.5.5_语聊

Browse Source
This commit is contained in:
zlzw
2023-10-28 18:29:39 +08:00
parent f5849a3ca2 cdc0211999
commit 79e772ce4b
23 changed files with 292 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OneToOne/src/main/java/com/shayu/onetoone/activity/HomepageRankingActivity.java
View File

@@ -81,6 +81,13 @@ public class HomepageRankingActivity extends AbsOTOActivity {
fragments.get(viewPager.getCurrentItem()).setDate(HomeRankFragment.DATE_WEEK);
});
viewPager.registerOnPageChangeCallback(viewPagerChangeCallback);
findViewById(R.id.back).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
}
@Override
@@ -100,7 +107,7 @@ public class HomepageRankingActivity extends AbsOTOActivity {
@Override
public void onPageSelected(int position) {
super.onPageSelected(position);
fragments.get(position).setDate(mDay.isChecked()?HomeRankFragment.DATE_DAY:HomeRankFragment.DATE_WEEK);
fragments.get(position).setDate(mDay.isChecked() ? HomeRankFragment.DATE_DAY : HomeRankFragment.DATE_WEEK);
}
}
}

113
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
View File

@@ -34,6 +34,7 @@ import com.shayu.onetoone.R;
import com.shayu.onetoone.activity.MyFriendListActivity;
import com.shayu.onetoone.activity.setting.SettingActivity;
import com.shayu.onetoone.adapter.MainMeAdapter;
import com.shayu.onetoone.bean.AuthBean;
import com.shayu.onetoone.bean.PeopleNum;
import com.shayu.onetoone.bean.SlideBean;
import com.shayu.onetoone.bean.UserItemBean;
@@ -73,24 +74,16 @@ import java.util.Locale;
public class MyFragment extends BaseFragment implements OnItemClickListener<UserItemBean>, View.OnClickListener {
private ImageView mAvatar;
private TextView mName, tv_level;
private ImageView mSex;
private ImageView mLevelAnchor;
private ImageView mLevel, img_setting;
private TextView mName;
private ImageView 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 LinearLayout lt_noble;
// private LinearLayout btnUserNoble;
private ImageView user_noble_ico, good_nub_ico, img_lv_pic;
private ImageView user_noble_ico, good_nub_ico;
private TextView user_noble_text, user_noble_time, tv_setting;
private UserItemBean beanStetting = null, beanKefu = null;
private boolean firstInto = true;
@@ -101,6 +94,12 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
private TextView followNum, fansNum, friendNum;
private View followLayout, fansLayout, friendLayout;
private ImageView sex;
private ImageView authStatus;
private TextView yanLevel; //颜 等级
private TextView wealthLevel;// 财富 等级
private TextView idLevel;//用户 等级
private ImageView iconLevel; //等級图标
@Override
public View createView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -109,7 +108,12 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
@Override
public void initView(View itemView) {
yanLevel = findViewById(R.id.yanLevel);
wealthLevel = findViewById(R.id.wealthLevel);
idLevel = findViewById(R.id.idLevel);
iconLevel = findViewById(R.id.iconLevel);
authStatus = itemView.findViewById(R.id.authStatus);
mAvatar = (ImageView) itemView.findViewById(R.id.avatar);
redPoint = itemView.findViewById(R.id.red_point);
ViewClicksAntiShake.clicksAntiShake(mAvatar, new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -120,7 +124,6 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
});
mName = (TextView) itemView.findViewById(R.id.name);
gift_svga = (SVGAImageView) itemView.findViewById(R.id.gift_svga);
ViewClicksAntiShake.clicksAntiShake(gift_svga, new ViewClicksAntiShake.ViewClicksCallBack() {
@@ -154,11 +157,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
RouteManager.forwardActivity(RouteManager.ACTIVITY_MY_FRIEND_LIST, bundle);
});
user_noble_ico = (ImageView) itemView.findViewById(R.id.user_noble_ico);
mLevelAnchor = (ImageView) itemView.findViewById(R.id.level_anchor);
mLevel = (ImageView) itemView.findViewById(R.id.level);
tv_level = (TextView) itemView.findViewById(R.id.tv_level);
good_nub_ico = (ImageView) itemView.findViewById(R.id.good_nub_ico);
mID = (TextView) itemView.findViewById(R.id.id_val);
signature = (TextView) itemView.findViewById(R.id.signature);
@@ -168,12 +167,9 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
btnCopy = (TextView) itemView.findViewById(R.id.btn_copy);
user_noble_text = (TextView) itemView.findViewById(R.id.user_noble_text);
img_setting = (ImageView) itemView.findViewById(R.id.img_setting);
v_noble = (View) itemView.findViewById(R.id.v_noble);
lt_noble = (LinearLayout) itemView.findViewById(R.id.lt_noble);
user_noble_time = (TextView) itemView.findViewById(R.id.user_noble_time);
banner_me = (Banner) itemView.findViewById(R.id.banner_me);
lt_advertisement = (LinearLayout) itemView.findViewById(R.id.lt_advertisement);
img_lv_pic = (ImageView) itemView.findViewById(R.id.img_lv_pic);
tv_setting = (TextView) itemView.findViewById(R.id.tv_setting);
itemView.findViewById(R.id.lt_star_coin).setOnClickListener(this);
itemView.findViewById(R.id.btn_coin).setOnClickListener(this);
@@ -211,12 +207,22 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
});
//loadData();
//initPeopleNum();
OTONetManager.getInstance(mContext).getMenu(new com.yunbao.common.http.base.HttpCallback<List<UserItemBean>>() {
@Override
public void onSuccess(List<UserItemBean> data) {
initMenu(data);
}
@Override
public void onError(String error) {
}
});
}
@Override
public void onPause() {
super.onPause();
mPaused = true;
}
@Override
@@ -224,7 +230,6 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
super.onResume();
loadData();
initPeopleNum();
mPaused = false;
}
@Override
@@ -237,10 +242,10 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
public void loadData() {
MainHttpUtil.getGoogle(mCallback1);
MainHttpUtil.getBaseInfo(mCallback);
OTONetManager.getInstance(mContext).getMenu(new com.yunbao.common.http.base.HttpCallback<List<UserItemBean>>() {
OTONetManager.getInstance(mContext).getAuthInfo(new com.yunbao.common.http.base.HttpCallback<AuthBean>() {
@Override
public void onSuccess(List<UserItemBean> data) {
initMenu(data);
public void onSuccess(AuthBean data) {
initAuth(data);
}
@Override
@@ -270,10 +275,12 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} else {
coin.setText(coins);
}
if (yuanbaos.length() > 8) {
star_coin.setText(yuanbaos.substring(0, yuanbaos.length() - 6) + "M");
if (yuanbaos.length() > 11) {
star_coin.setText(yuanbaos.substring(0, yuanbaos.length() - 9) + "M");
} else if (yuanbaos.length() > 9) {
star_coin.setText(yuanbaos.substring(0, yuanbaos.length() - 6) + "K");
} else if (yuanbaos.length() > 6) {
star_coin.setText(yuanbaos.substring(0, yuanbaos.length() - 3) + "K");
star_coin.setText(yuanbaos.substring(0, yuanbaos.length() - 3));
} else {
star_coin.setText(yuanbaos);
}
@@ -282,7 +289,40 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
}
}
});
OTONetManager.getInstance(mContext).getTargetUserInfo(Integer.parseInt(CommonAppConfig.getInstance().getUid()), new com.yunbao.common.http.base.HttpCallback<com.shayu.onetoone.bean.UserBean>() {
@Override
public void onSuccess(com.shayu.onetoone.bean.UserBean data) {
initLevel(data);
}
@Override
public void onError(String error) {
}
});
}
/**
* 加载等级
*/
@SuppressLint("SetTextI18n")
private void initLevel(com.shayu.onetoone.bean.UserBean data) {
com.shayu.onetoone.bean.UserBean.UserLevel level = data.getLevel();
yanLevel.setText("v." + level.getCharm_level());
wealthLevel.setText(String.valueOf(level.getWealth_level()));
idLevel.setText("Lv." + level.getLevel());
}
/**
* 加载认证状态
*
* @param data
*/
private void initAuth(AuthBean data) {
if (data.getName_auth() == 2) {
authStatus.setVisibility(View.VISIBLE);
} else {
authStatus.setVisibility(View.GONE);
}
}
/**
@@ -356,6 +396,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} else {
sex.setImageResource(R.mipmap.ic_message_tab_woman);
}
showBanner();
ImgLoader.displayAvatar(mContext, u.getAvatar(), mAvatar);
mName.setText(u.getUserNiceName());
@@ -403,38 +444,38 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
} else {
user_noble_ico.setImageResource(R.mipmap.icon_vip_gold);
}
if ("C".equals(u.getUsers_type())) {
/*if ("C".equals(u.getUsers_type())) {
Constants.isAnchor = true;
good_nub_ico.setImageResource(R.mipmap.usercard_good_nub);
if (anchorLevelBean != null) {
ImgLoader.display(mContext, CommonAppConfig.getInstance().HOST + anchorLevelBean.getThumb(), mLevel);
ImgLoader.display(mContext, CommonAppConfig.getInstance().HOST + anchorLevelBean.getThumb(), iconLevel);
// ImgLoader.display(mContext, R.mipmap.icon_zhubolv, img_lv_pic);
//主播等级
tv_level.setOnClickListener(new View.OnClickListener() {
idLevel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String url = CommonAppConfig.HOST + "/h5/Grade/index.html?" + "token=" + CommonAppConfig.getInstance().getToken() + "&uid=" + CommonAppConfig.getInstance().getUid() + "&for";
// ZhuangBanActivity.forward(mContext, url);
//ZhuangBanActivity.forward(mContext, url);
}
});
tv_level.setText(anchorLevelBean.getLevel() + "");
idLevel.setText(anchorLevelBean.getLevel() + "");
}
} else {
Constants.isAnchor = false;
LevelBean levelBean = appConfig.getLevel(u.getLevel());
if (levelBean != null) {
ImgLoader.display(mContext, levelBean.getThumb(), mLevel);
ImgLoader.display(mContext, levelBean.getThumb(), iconLevel);
//用户等级
tv_level.setOnClickListener(new View.OnClickListener() {
idLevel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
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(levelBean.getLevel() + "");
idLevel.setText(levelBean.getLevel() + "");
}
}
}*/
//修改靓号图标 个人中心
if (u.getGoodnum() != null && !u.getGoodnum().equals("")) {
good_nub_ico.setVisibility(View.VISIBLE);

9
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
View File

@@ -132,10 +132,17 @@ public class AuthActivity extends AbsActivity {
submit.setEnabled(false);
image1.setEnabled(false);
image2.setEnabled(false);
} else {
} else if(data.getName_auth() == 4){
ImgLoader.display(mContext, data.getAuth_front(), image1);
ImgLoader.display(mContext, data.getAuth_back(), image2);
image11.setVisibility(View.GONE);
image22.setVisibility(View.GONE);
submit.setText(WordUtil.getNewString(R.string.resubmit));
submit.setEnabled(true);
}else{
ImgLoader.display(mContext, data.getAuth_front(), image1);
ImgLoader.display(mContext, data.getAuth_back(), image2);
submit.setText(WordUtil.getNewString(R.string.layout_auth_tips5));
remake.setText(data.getAuth_remark());
submit.setEnabled(true);
}