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

修复BUG

Browse Source
This commit is contained in:
hch 2023-10-28 18:26:39 +08:00
parent 0d52db8edb
commit cdc0211999
23 changed files with 292 additions and 128 deletions
Show Stats 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);
}

1
OneToOne/src/main/res/layout/activity_auth.xml
View File

@ -126,6 +126,7 @@
android:layout_marginLeft="70dp"
android:layout_marginTop="20dp"
android:layout_marginRight="70dp"
android:layout_marginBottom="10dp"
android:background="@drawable/bg_auth_submit_1"
android:gravity="center"
android:paddingTop="10dp"

12
OneToOne/src/main/res/layout/activity_main_list.xml
View File

@ -15,6 +15,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/back"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="42dp"
android:padding="5dp"
android:src="@mipmap/icon_my_arn_back"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints" />
<com.angcyo.tablayout.DslTabLayout
android:id="@+id/dslTabLayout"
android:layout_width="150dp"

81
OneToOne/src/main/res/layout/activity_setting.xml
View File

@ -31,8 +31,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15dp"
android:paddingBottom="15dp">
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -102,8 +102,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -131,9 +131,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingTop="10dp"
android:visibility="gone"
android:paddingBottom="15dp">
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -154,14 +154,41 @@
android:layout_marginEnd="26.33dp"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:text="@string/layout_setting_tip15"
android:textColor="#1E1F20"
android:textSize="16sp" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<ImageView
android:layout_width="17dp"
android:layout_height="30dp"
android:layout_marginEnd="26.33dp"
android:src="@mipmap/icon_arrow_right" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -189,8 +216,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -217,8 +244,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -245,8 +272,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -273,8 +300,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -302,8 +329,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -333,8 +360,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -361,8 +388,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -389,8 +416,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"
@ -422,8 +449,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"
android:paddingTop="15.33dp"
android:paddingBottom="15dp">
android:paddingTop="10dp"
android:paddingBottom="10dp">
<TextView
android:layout_width="wrap_content"

40
OneToOne/src/main/res/layout/fragment_home_ranking.xml
View File

@ -2,22 +2,21 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/root_layout"
android:background="@mipmap/bg_glamour_top"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@mipmap/bg_glamour_top">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/rootView"
android:background="#00FFFFFF"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="#00FFFFFF">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:minHeight="100dp"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
app:toolbarId="@+id/toolbar">
@ -57,10 +56,10 @@
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar_1"
android:layout_width="50dp"
android:src="@drawable/m_chu_xia"
android:layout_height="50dp"
android:layout_centerInParent="true"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
@ -145,17 +144,18 @@
android:textSize="12sp" />
</LinearLayout>
<Button
android:id="@+id/btn_follow_1"
android:layout_width="54dp"
android:layout_height="23dp"
android:layout_gravity="center"
android:background="@drawable/bg_message_msg_bar_follow"
android:gravity="center"
android:text="@string/layout_home_ranking_tips1"
android:textColor="#FFFFFF"
android:layout_gravity="center"
android:gravity="center"
android:visibility="invisible"
android:textSize="10dp"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/more"
app:layout_constraintTop_toTopOf="@+id/btn_back" />
@ -284,13 +284,13 @@
android:id="@+id/btn_follow_2"
android:layout_width="54dp"
android:layout_height="23dp"
android:layout_gravity="center"
android:background="@drawable/bg_message_msg_bar_follow"
android:gravity="center"
android:text="@string/layout_home_ranking_tips1"
android:textColor="#FFFFFF"
android:layout_gravity="center"
android:gravity="center"
android:visibility="invisible"
android:textSize="10dp"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/more"
app:layout_constraintTop_toTopOf="@+id/btn_back" />
</LinearLayout>
@ -417,13 +417,13 @@
android:id="@+id/btn_follow_3"
android:layout_width="54dp"
android:layout_height="23dp"
android:layout_gravity="center"
android:background="@drawable/bg_message_msg_bar_follow"
android:gravity="center"
android:text="@string/layout_home_ranking_tips1"
android:textColor="#FFFFFF"
android:layout_gravity="center"
android:gravity="center"
android:visibility="invisible"
android:textSize="10dp"
android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/more"
app:layout_constraintTop_toTopOf="@+id/btn_back" />
</LinearLayout>
@ -436,11 +436,11 @@
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@drawable/background_white_up"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="-5dp"
android:layout_marginEnd="16dp"
android:background="@drawable/background_white_up"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -450,9 +450,9 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:itemCount="5"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:spanCount="2"
tools:itemCount="5"
tools:listitem="@layout/item_home_recommend" />
</io.rong.imkit.widget.refresh.SmartRefreshLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

137
OneToOne/src/main/res/layout/fragment_my.xml
View File

@ -133,6 +133,81 @@
android:textSize="19sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/authStatus"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginLeft="5dp"
android:src="@mipmap/auth_status" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginLeft="5dp">
<LinearLayout
android:layout_width="48dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:background="@mipmap/icon_yan_bg">
</LinearLayout>
<ImageView
android:id="@id/yan"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:src="@mipmap/icon_yan" />
<TextView
android:id="@+id/yanLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:layout_toRightOf="@+id/yan"
android:text="v.0"
android:textColor="@color/white"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginLeft="5dp">
<LinearLayout
android:layout_width="40dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:background="@mipmap/wealth_bg">
</LinearLayout>
<ImageView
android:id="@id/wealth"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:src="@mipmap/icon_wealth" />
<TextView
android:id="@+id/wealthLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/wealth"
android:text="0"
android:textColor="@color/white" />
</RelativeLayout>
</LinearLayout>
<TextView
@ -190,50 +265,38 @@
android:textSize="10sp"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:gravity="center|left">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="25dp"
android:layout_marginLeft="5dp">
<LinearLayout
android:layout_width="58dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:background="@mipmap/level_bg">
</LinearLayout>
<ImageView
android:id="@+id/img_lv_pic"
android:layout_width="30dp"
android:layout_height="15dp"
android:src="@mipmap/icon_userlv" />
<ImageView
android:id="@+id/level_anchor"
android:layout_width="30dp"
android:layout_height="15dp"
android:id="@+id/iconLevel"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:visibility="gone" />
<ImageView
android:id="@+id/level"
android:layout_width="33dp"
android:layout_height="15dp"
android:layout_marginLeft="5dp"
android:visibility="gone" />
android:src="@mipmap/icon_level" />
<TextView
android:id="@+id/tv_level"
android:id="@+id/idLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center|left"
android:text=""
android:textColor="@color/gray_B1B1B1"
android:textSize="13sp" />
<ImageView
android:layout_width="11dp"
android:layout_height="11dp"
android:layout_marginLeft="3dp"
android:background="@mipmap/icon_arrow_right"
android:visibility="visible" />
</LinearLayout>
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/iconLevel"
android:text="Lv.0"
android:textColor="@color/white" />
</RelativeLayout>
</LinearLayout>
@ -525,7 +588,7 @@
android:id="@+id/tv_star_coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/charge"
android:text="@string/withdrawal"
android:textColor="@color/gray_B1B1B1"
android:textSize="12sp" />

6
OneToOne/src/main/res/layout/item_home_hot.xml
View File

@ -6,7 +6,6 @@
android:layout_height="167dp"
android:layout_marginTop="16dp">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="match_parent"
@ -44,7 +43,7 @@
android:layout_width="60dp"
android:layout_height="27dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:layout_marginBottom="13dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@mipmap/ic_home_hot_chat" />
@ -56,9 +55,9 @@
android:layout_marginStart="11dp"
android:layout_marginBottom="8dp"
android:ellipsize="end"
android:maxEms="5"
android:singleLine="true"
android:textColor="#FFFFFF"
android:maxEms="5"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/btn_chat"
@ -70,7 +69,6 @@
android:id="@+id/linearLayout3"
android:layout_width="48dp"
android:layout_height="15dp"
android:layout_marginBottom="5dp"
android:background="@mipmap/bg_home_hot_live"
android:gravity="center"
android:orientation="horizontal"

BIN
OneToOne/src/main/res/mipmap-xxhdpi/icon_level.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
OneToOne/src/main/res/mipmap-xxhdpi/icon_wealth.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
OneToOne/src/main/res/mipmap-xxhdpi/icon_yan.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
OneToOne/src/main/res/mipmap-xxhdpi/icon_yan_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
OneToOne/src/main/res/mipmap-xxhdpi/level_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
OneToOne/src/main/res/mipmap-xxhdpi/wealth_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

3
OneToOne/src/main/res/values-zh-rHK/strings.xml
View File

@ -130,7 +130,7 @@
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完后真人認證 </string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完成真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
@ -204,6 +204,7 @@
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_setting_tip14">用戶協議</string>
<string name="layout_setting_tip15">消息通知</string>
<string name="layout_choose_label_adapter_tip1">我的標籤</string>

3
OneToOne/src/main/res/values-zh-rTW/strings.xml
View File

@ -130,7 +130,7 @@
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完后真人認證 </string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完成真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
@ -204,6 +204,7 @@
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_setting_tip14">用戶協議</string>
<string name="layout_setting_tip15">消息通知</string>
<string name="layout_choose_label_adapter_tip1">我的標籤</string>

1
OneToOne/src/main/res/values/strings.xml
View File

@ -206,6 +206,7 @@
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_setting_tip14">用戶協議</string>
<string name="layout_setting_tip15">消息通知</string>
<string name="layout_choose_label_adapter_tip1">我的標籤</string>

1
common/src/main/res/values-en-rUS/string.xml
View File

@ -716,6 +716,7 @@
<string name="wallet_tip_5">Payment method not selected</string>
<string name="wallet_coin_name">My%1$s</string>
<string name="charge">Recharge</string>
<string name="withdrawal">Withdrawal</string>
<string name="receive">Receive</string>
<string name="mesg">News Center</string>
<string name="versions">Version</string>

1
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -698,6 +698,7 @@
<string name="wallet_tip_5">未選中支付方式</string>
<string name="wallet_coin_name">我的%1$s</string>
<string name="charge">充值</string>
<string name="withdrawal">提現</string>
<string name="receive">领取</string>
<string name="mesg">消息中心</string>
<string name="owning_guild">所屬公會</string>

1
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -698,6 +698,7 @@
<string name="wallet_tip_5">未選中支付方式</string>
<string name="wallet_coin_name">我的%1$s</string>
<string name="charge">充值</string>
<string name="withdrawal">提現</string>
<string name="receive">领取</string>
<string name="mesg">消息中心</string>
<string name="owning_guild">所屬公會</string>

1
common/src/main/res/values-zh/strings.xml
View File

@ -698,6 +698,7 @@
<string name="wallet_tip_5">未選中支付方式</string>
<string name="wallet_coin_name">我的%1$s</string>
<string name="charge">充值</string>
<string name="withdrawal">提現</string>
<string name="receive">領取</string>
<string name="mesg">消息中心</string>
<string name="owning_guild">所屬公會</string>

1
common/src/main/res/values/strings.xml
View File

@ -716,6 +716,7 @@
<string name="wallet_tip_5">Payment method not selected</string>
<string name="wallet_coin_name">My%1$s</string>
<string name="charge">Recharge</string>
<string name="withdrawal">Withdrawal</string>
<string name="receive">Receive</string>
<string name="mesg">News Center</string>
<string name="versions">Version</string>