moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI对稿(https://docs.qq.com/sheet/DU2JLbllLZXhvWnVU?tab=BB08J2&_t=1613984699215)

Browse Source
This commit is contained in:
huangjian
2021-02-23 15:22:22 +08:00
parent af5823f927
commit cc16adf397
24 changed files with 163 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -193,7 +193,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
}
private void setRoomId(long id, int onlineNumber) {
String htmlText = "66号:" + id;
String htmlText = "音游号:" + id;
roomId.setText(htmlText);
}

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomeAddFriendsAdapter.java
View File

@@ -1,7 +1,6 @@
package com.yizhuan.erban.home.adapter;
import android.view.View;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -12,7 +11,6 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
import com.yizhuan.xchat_android_core.home.bean.HomePlayTheme;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.TextUtils;

5
app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java
View File

@@ -31,12 +31,9 @@ public class HomeConcernsAdapter extends BaseQuickAdapter<HomeConcernsInfo, Base
// helper.setVisible(R.id.tv_room_name,true);
CircleImageView circleImageView = helper.getView(R.id.civ_room_avatar);
ImageLoadUtilsV2.loadImage(circleImageView, item.getAvatar());
circleImageView.setBorderWidth(UIUtil.dip2px(mContext, 1));
helper.setText(R.id.tv_room_name, item.getFollowType() == 1 ? "" : item.getName());
helper.setGone(R.id.tv_room_name, item.getFollowType() != 1);
helper.setText(R.id.iv_living, item.getFollowType() == 1 ? "我的房间" : "直播中");
helper.setBackgroundRes(R.id.iv_living, item.getFollowType() == 1 ? R.drawable.bg_living_my_room : R.drawable.bg_common_confirm_normal);
circleImageView.setBorderColor(item.getFollowType() == 1 ? Color.parseColor("#FF6B82") : mContext.getResources().getColor(R.color.appColor));
helper.setBackgroundRes(R.id.iv_living, item.getFollowType() == 1 ? R.drawable.bg_living_my_room : R.drawable.bg_living_other_room);
}
}

4
app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
View File

@@ -171,8 +171,8 @@ public class HomeTabHomeFragment extends LazyLoadFragment {
recyclerView.setLayoutManager(gridLayoutManager);
recyclerView.setAdapter(mHomeRoomAdapter);
View emptyView = getLayoutInflater().inflate(R.layout.layout_home_empty_no_header, null);
ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
View emptyView = getLayoutInflater().inflate(R.layout.layout_home_room_empty, null);
ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
emptyView.setLayoutParams(lp);
mHomeRoomAdapter.setEmptyView(emptyView);
}

20
app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java
View File

@@ -12,6 +12,7 @@ import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.View;
@@ -25,6 +26,7 @@ import com.yizhuan.erban.databinding.FragmentMeBinding;
import com.yizhuan.erban.decoration.view.MyDecorationActivity;
import com.yizhuan.erban.home.activity.CollectionRoomActivity;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
@@ -44,6 +46,7 @@ import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RelationShipEvent;
@@ -252,7 +255,24 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
String star = StarUtils.getConstellation(new Date(mUserInfo.getBirth()));
mBinding.tvConstellation.setText(star);
setUserLevel(mUserInfo.getUserLevelVo());
}
}
private void setUserLevel(UserLevelVo userLevelVo) {
mBinding.ivUserCharm.setVisibility(View.GONE);
mBinding.ivUserLevel.setVisibility(View.GONE);
if (userLevelVo != null) {
String userLevelUrl = userLevelVo.getExperUrl();
String userCharmUrl = userLevelVo.getCharmUrl();
if (!TextUtils.isEmpty(userLevelUrl)) {
mBinding.ivUserLevel.setVisibility(View.VISIBLE);
ImageLoadUtils.loadImage(mContext, userLevelUrl, mBinding.ivUserLevel);
}
if (!TextUtils.isEmpty(userCharmUrl)) {
mBinding.ivUserCharm.setVisibility(View.VISIBLE);
ImageLoadUtils.loadImage(mContext, userCharmUrl, mBinding.ivUserCharm);
}
}
}

2
app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
View File

@@ -447,7 +447,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
// 这个方法能让图片不失真
ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
erbanId.setText("66号:" + userInfo.getErbanNo());
erbanId.setText("音游号:" + userInfo.getErbanNo());
ivGender.setImageResource(
userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);

13
app/src/main/res/drawable/bg_living_my_room.xml
View File

@@ -4,8 +4,13 @@
<gradient
android:angle="180"
android:startColor="#FF879A"
android:endColor="#FF6B82"/>
<corners android:radius="19dp"/>
android:endColor="#ffff89a6"
android:startColor="#ffff7096"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="3dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="3dp" />
</shape>

17
app/src/main/res/drawable/bg_living_other_room.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:startColor="#ff5ca9ff"
android:endColor="#ff93e1ff"
android:type="linear"
android:useLevel="true" />
<corners
android:bottomLeftRadius="3dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="3dp" />
</shape>

13
app/src/main/res/drawable/bg_me_sign.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:startColor="#ff5ca9ff"
android:endColor="#ff93e1ff"
android:type="linear"
android:useLevel="true" />
<corners android:radius="8dp"/>
</shape>

6
app/src/main/res/drawable/shape_circle_s3_white33.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke android:width="@dimen/dp_3" android:color="@color/white_transparent_20"/>
<solid android:color="@color/white_transparent_50"/>
</shape>

4
app/src/main/res/layout/activity_user_info.xml
View File

@@ -101,6 +101,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_3"
android:visibility="visible"
android:adjustViewBounds="true"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
@@ -109,6 +110,7 @@
android:layout_height="@dimen/dp_20"
android:layout_marginEnd="3dp"
android:visibility="visible"
android:adjustViewBounds="true"
tools:src="@drawable/ic_user_charm_level" />
@@ -154,7 +156,7 @@
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_gravity="center_vertical"
android:background="@drawable/shape_58559d"
android:background="@drawable/bg_me_sign"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingRight="6dp"

4
app/src/main/res/layout/fragment_contact_list.xml
View File

@@ -8,7 +8,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="50dp">
android:layout_marginTop="35dp">
<TextView
android:layout_width="wrap_content"
@@ -68,6 +68,6 @@
android:id="@+id/fcv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp" />
android:layout_marginTop="20dp" />
</LinearLayout>

30
app/src/main/res/layout/fragment_game_home.xml
View File

@@ -16,7 +16,7 @@
type="Boolean" />
</data>
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9"
@@ -25,10 +25,11 @@
<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:background="@drawable/bg_shape_home_top"
android:gravity="center"
android:paddingTop="30dp"
android:paddingBottom="@dimen/dp_10"
app:layout_constraintTop_toTopOf="parent">
<com.yizhuan.erban.common.widget.CircleImageView
@@ -37,7 +38,9 @@
android:layout_height="32dp"
android:layout_marginStart="15dp"
android:onClick="@{click}"
android:src="@drawable/default_avatar" />
android:src="@drawable/default_avatar"
app:cborder_color="@color/white"
app:cborder_width="1dp" />
<TextView
android:layout_width="0dp"
@@ -86,14 +89,12 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="80dp">
android:layout_height="match_parent">
<com.scwang.smartrefresh.layout.header.ClassicsHeader
android:id="@+id/refresh_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
android:layout_height="wrap_content" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
@@ -186,20 +187,23 @@
<com.yizhuan.erban.ui.widget.ContentWrapViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginBottom="10dp" />
<TextView
android:id="@+id/tv_add_friends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/color_F9F9F9"
android:includeFontPadding="false"
android:paddingStart="16dp"
android:paddingTop="5dp"
android:text="交友扩列"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:textStyle="bold" />
android:textStyle="bold"
android:visibility="gone"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_add_friends"
@@ -207,7 +211,8 @@
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:paddingTop="@dimen/dp_5"
android:visibility="visible" />
android:visibility="gone"
tools:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_roll_view"
@@ -236,6 +241,7 @@
android:id="@+id/fl_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:background="@color/color_F9F9F9"
android:paddingTop="5dp"
android:paddingBottom="5dp">
@@ -261,6 +267,6 @@
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</FrameLayout>
</LinearLayout>
</layout>

26
app/src/main/res/layout/fragment_me.xml
View File

@@ -183,7 +183,7 @@
android:textColor="@color/color_666666"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage"
tools:text="66号:123456" />
tools:text="音游号:123456" />
</LinearLayout>
@@ -216,7 +216,25 @@
android:layout_marginEnd="5dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible" />
/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_marginEnd="@dimen/dp_3"
android:visibility="visible"
android:adjustViewBounds="true"
tools:src="@mipmap/ic_user_level" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_user_charm"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_marginEnd="3dp"
android:visibility="visible"
android:adjustViewBounds="true"
tools:src="@drawable/ic_user_charm_level" />
<TextView
android:id="@+id/tv_101"
@@ -230,14 +248,14 @@
android:textSize="10sp"
android:visibility="gone"
tools:ignore="SmallSp"
tools:visibility="visible" />
/>
<TextView
android:id="@+id/tv_constellation"
android:layout_width="42dp"
android:layout_height="15dp"
android:layout_marginEnd="5dp"
android:background="@drawable/shape_58559d"
android:background="@drawable/bg_me_sign"
android:gravity="center"
android:textColor="@color/color_FFFFFF"
android:textSize="10sp"

18
app/src/main/res/layout/item_home_concerns.xml
View File

@@ -9,19 +9,23 @@
<FrameLayout
android:id="@+id/fl_room_history_avatar_container"
android:layout_width="55dp"
android:layout_height="55dp"
android:layout_width="51dp"
android:layout_height="51dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:layout_width="51dp"
android:layout_height="51dp"
android:background="@drawable/shape_circle_s3_white33" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_room_avatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
app:cborder_color="@color/appColor"
app:cborder_width="2dp"
android:layout_marginTop="3dp"
tools:src="@drawable/default_avatar" />
<TextView
@@ -29,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:background="@drawable/bg_common_confirm_normal"
android:background="@drawable/bg_living_other_room"
android:gravity="center"
android:includeFontPadding="false"
android:lines="1"

11
app/src/main/res/layout/item_home_tab_map.xml
View File

@@ -79,19 +79,14 @@
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_3"
android:layout_height="25dp"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_6"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="@color/color_333333"
android:textSize="12sp"
tools:text="房间名称房间名称房间名称" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_5" />
</LinearLayout>

25
app/src/main/res/layout/layout_home_room_empty.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal|top"
android:orientation="vertical">
<ImageView
android:layout_marginTop="60dp"
android:id="@+id/no_data_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_common_failure" />
<TextView
android:id="@+id/no_data_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="暂无房间"
android:textColor="@color/color_999999"
android:layout_marginTop="@dimen/dp_17"
android:textSize="13sp" />
</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/icon_invite.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_union.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

6
app/src/main/res/values/strings.xml
View File

@@ -148,12 +148,12 @@
<!--我的页面-->
<string name="me_user_id">66号:%d</string>
<string name="me_user_id">音游号:%d</string>
<string name="my_attention">我的关注</string>
<string name="my_fan">我的粉丝</string>
<string name="no_attention_text">你还没有关注任何音游好友哦! \n快去添加关注吧!</string>
<string name="search_hint">搜索昵称/66号/房间名</string>
<string name="search_hint">搜索昵称/音游号/房间名</string>
<string name="online">在线中…</string>
<string name="me_customer_server">客服</string>
@@ -357,7 +357,7 @@
<string name="text_check_damage">查看伤害排行榜</string>
<string name="title_monster_hunting_reward">获得奖励(%s)</string>
<string name="currency_unit">钻石</string>
<string name="text_user_id">66号:%s</string>
<string name="text_user_id">音游号:%s</string>
<string name="format_monster_hunting_impact">伤害 %s 点/次</string>
<string name="format_monster_hunting_magic_value">(%s钻石)</string>
<string name="exchange_gold_tips">钻石可以兑换钻石，兑换比率：1钻石=%s钻石；\n</string>

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
View File

@@ -224,7 +224,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
clHall.setOnClickListener(v -> UserInfoActivity.Companion.start(context, hallInfo.getOwnerUid()));
bgUrl = hallInfo.getOwnerAvatar();
tvHallId.setText("公会ID:" + hallInfo.getHallId() + "");
tvOwnerUid.setText("66号:" + hallInfo.getOwnerErbanNo());
tvOwnerUid.setText("音游号:" + hallInfo.getOwnerErbanNo());
tvOwnerName.setText(hallInfo.getOwnerNick());
tvTitle.setText(hallInfo.getHallName());
GlideApp.with(ivAvatar.getContext())
@@ -240,7 +240,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
clClan.setOnClickListener(v -> UserInfoActivity.Companion.start(context, clanInfo.getElderUid()));
bgUrl = clanInfo.getAvatar();
tvClanId.setText("家族ID:" + clanInfo.getId());
tvClanOwnerUid.setText("66号:" + clanInfo.getElderErbanNo());
tvClanOwnerUid.setText("音游号:" + clanInfo.getElderErbanNo());
tvClanOwnerName.setText(clanInfo.getElderName());
tvTitle.setText(clanInfo.getName());
GlideApp.with(ivClanAvatar.getContext())

2
app/src/module_labour_union/res/layout/activity_add_member.xml
View File

@@ -36,7 +36,7 @@
<EditText
android:id="@+id/et_search"
android:hint="搜索用户昵称/66号"
android:hint="搜索用户昵称/音游号"
android:textSize="@dimen/sp_13"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_999999"

4
app/src/module_labour_union/res/layout/activity_module_hall.xml
View File

@@ -119,7 +119,7 @@
android:layout_marginTop="@dimen/dp_6"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
tools:text="66号:3979655" />
tools:text="音游号:3979655" />
<TextView
android:id="@+id/tv_clan_id"
@@ -210,7 +210,7 @@
android:layout_marginTop="@dimen/dp_6"
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
tools:text="66号:3979655" />
tools:text="音游号:3979655" />
<TextView
android:id="@+id/tv_hall_id"

2
app/src/module_labour_union/res/layout/activity_remove_member.xml
View File

@@ -36,7 +36,7 @@
<EditText
android:id="@+id/et_search"
android:hint="搜索用户昵称/66号"
android:hint="搜索用户昵称/音游号"
android:textSize="@dimen/sp_13"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_999999"