yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页UI修改,签名包名修改

Browse Source
This commit is contained in:
huangjian
2021-01-07 18:31:04 +08:00
parent 0cea1d3b5b
commit 6811dc63ae
46 changed files with 590 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/agconnect-services.json
View File

@@ -9,7 +9,7 @@
"client_id":"355467170064368832",
"client_secret":"0EAB591E523474B7A0441DD4ED400FBE76F1730E499D028948BDA1AEA24A2232",
"app_id":"102156739",
"package_name":"com.xuanyi.accompany",
"package_name":"com.mango.yinyou",
"api_key":"CgB6e3x91yYBKcn4fsMK/oZTCZNKo5QCRqE/1K6ZvpxI6drwrIBELZbub05G5yH6UFBmlJfHDyPbZvL3gpAGAxuw"
},
"service":{

18
app/build.gradle
View File

@@ -11,7 +11,7 @@ android {
compileSdkVersion 29
defaultConfig {
applicationId "com.xuanyi.accompany"
applicationId "com.mango.yinyou"
minSdkVersion 19
targetSdkVersion 29
versionCode Integer.valueOf(version_code)
@@ -66,19 +66,19 @@ android {
signingConfigs {
v2 {
storeFile file('../66pw.jks')
storePassword "accompanyplay"
keyAlias "66accompany"
keyPassword "accompanyplay"
storeFile file('../yinyou.jks')
storePassword "yinyou2021"
keyAlias "yinyou"
keyPassword "yinyou2021"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
storeFile file('../66pw.jks')
storePassword "accompanyplay"
keyAlias "66accompany"
keyPassword "accompanyplay"
storeFile file('../yinyou.jks')
storePassword "yinyou2021"
keyAlias "yinyou"
keyPassword "yinyou2021"
v2SigningEnabled false
v1SigningEnabled true
}

9
app/src/common/res/drawable/shape_black_t50_12.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners
android:radius="@dimen/dp_12"
/>
<solid
android:color="@color/black_transparent_50"
/>
</shape>

2
app/src/main/AndroidManifest.xml
View File

@@ -464,7 +464,7 @@
<!-- tools:node="merge" />-->
<!-- 为了兼容小程序返回的问题，声明WXEntryActivity，并把之前的 WechatHandlerActivity注释 -->
<activity
android:name="com.xuanyi.accompany.wxapi.WXEntryActivity"
android:name="com.mango.yinyou.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true" />

55
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -17,10 +17,13 @@ import android.view.animation.LinearInterpolator;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.api.model.contact.ContactEventListener;
import com.netease.nim.uikit.api.model.session.SessionCustomization;
@@ -168,6 +171,7 @@ import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.user.event.ShowMeEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
@@ -180,6 +184,7 @@ import com.yizhuan.xchat_android_library.utils.pref.CommonPref;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import org.jetbrains.annotations.NotNull;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
@@ -210,6 +215,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
private LinearLayout llDragInfo;
private LivingIconView userLivingView;
private View viewClose;
private DrawerLayout drawerLayout;
private MainTabLayout mMainTabLayout;
@@ -246,11 +252,10 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
protected void onRestoreInstanceState(@NotNull Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
if (savedInstanceState != null) {
mCurrentMainPosition = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
}
mCurrentMainPosition = savedInstanceState.getInt(Constants.KEY_MAIN_POSITION);
}
@Override
@@ -293,6 +298,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
initTeamSessionCustomization();
EventBus.getDefault().register(this);
otherModelInit();
initMe();
}
private void otherModelInit() {
@@ -505,8 +511,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
userLivingView.setColor(Color.WHITE);
mMainTabLayout.setOnTabClickListener(this);
drawerLayout = findViewById(R.id.drawer_layout);
}
@@ -621,6 +626,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
@Override
public void onBackPressed() {
if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
drawerLayout.closeDrawer(GravityCompat.START);
return;
}
try {
moveTaskToBack(false);
} catch (Exception e) {
@@ -832,12 +842,19 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
switchFragment(position);
}
private void initMe() {
getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fl_container, new MeFragment())
.commitAllowingStateLoss();
}
private void switchFragment(int position) {
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Fragment squareFragment = fragmentManager.findFragmentByTag(SquareFragment.TAG);
Fragment contactFragment = fragmentManager.findFragmentByTag(ContactsListFragment.TAG);
Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG);
//Fragment meFragment = fragmentManager.findFragmentByTag(MeFragment.TAG);
Fragment homeFragment = fragmentManager.findFragmentByTag(GameHomeFragment.TAG);
if (squareFragment != null && squareFragment.isVisible()) {
@@ -846,9 +863,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
if (contactFragment != null && contactFragment.isVisible()) {
fragmentTransaction.hide(contactFragment);
}
if (meFragment != null && meFragment.isVisible()) {
/* if (meFragment != null && meFragment.isVisible()) {
fragmentTransaction.hide(meFragment);
}
}*/
if (homeFragment != null && homeFragment.isVisible()) {
fragmentTransaction.hide(homeFragment);
}
@@ -873,13 +890,13 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
fragmentTransaction.add(R.id.main_fragment, contactFragment, ContactsListFragment.TAG);
}
fragmentTransaction.show(contactFragment);
} else if (position == MainTabLayout.MAIN_TAB_POS_ME) {
} /*else if (position == MainTabLayout.MAIN_TAB_POS_ME) {
if (meFragment == null) {
meFragment = new MeFragment();
fragmentTransaction.add(R.id.main_fragment, meFragment, MeFragment.TAG);
}
fragmentTransaction.show(meFragment);
}
}*/
if (!isDestroyed()) fragmentTransaction.commitAllowingStateLoss();
mCurrentMainPosition = position;
}
@@ -920,6 +937,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
RecallDialog.start(this);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onShowMe(ShowMeEvent event) {
if (drawerLayout != null) drawerLayout.openDrawer(GravityCompat.START);
}
public boolean isShowMsgTab() {
return mCurrentMainPosition == MainTabLayout.MAIN_TAB_POS_MSG;
}
@@ -1172,4 +1194,15 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

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

@@ -51,6 +51,7 @@ public class HomeAddFriendsAdapter extends BaseQuickAdapter<HomePlayInfo, BaseVi
}
}
loadAvatar(helper.getView(R.id.iv_room_avatar), item.getAvatar());
CircleImageView userOne = helper.getView(R.id.iv_mic_user_one);
CircleImageView userTwo = helper.getView(R.id.iv_mic_user_two);
@@ -68,16 +69,6 @@ public class HomeAddFriendsAdapter extends BaseQuickAdapter<HomePlayInfo, BaseVi
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_INTO_JYKL_ROOM_CLICK, "点击交友扩列项进入房间");
AVRoomActivity.startForFromType(mContext, item.getUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);
});
View bgView = helper.getView(R.id.view_bg);
if (item.getTheme() == HomePlayTheme.THEME_3FC7FB) {
userOne.setBorderColor(HomePlayTheme.THEME_3FC7FB);
bgView.setBackgroundResource(R.drawable.shape_add_friends_e8f9ff);
} else {
userOne.setBorderColor(HomePlayTheme.THEME_7E69F3);
bgView.setBackgroundResource(R.drawable.shape_add_friends_f4f1ff);
}
}
private void loadAvatar(ImageView imageView, String url) {

19
app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
View File

@@ -1,9 +1,14 @@
package com.yizhuan.erban.home.adapter;
import android.widget.ImageView;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
@@ -12,6 +17,8 @@ import com.yizhuan.xchat_android_core.utils.TextUtils;
import org.jetbrains.annotations.NotNull;
import jp.wasabeef.glide.transformations.BlurTransformation;
/**
* create by lvzebiao @2019/11/13
*/
@@ -23,17 +30,15 @@ public class HomePlayAdapter extends BaseQuickAdapter<HomePlayInfo, BaseViewHold
@Override
protected void convert(@NotNull BaseViewHolder helper, HomePlayInfo item) {
helper.setText(R.id.tv_title, item.getTitle());
helper.setVisible(R.id.iv_tag, !TextUtils.isEmptyText(item.getTagPict()));
ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_tag), item.getTagPict());
ImageLoadUtilsV2.loadAvatar(helper.getView(R.id.iv_avatar), item.getAvatar());
ImageLoadUtils.loadRectImage(mContext,
item.getAvatar(),
helper.getView(R.id.iv_avatar),
R.drawable.default_cover,
ScreenUtil.dip2px(12));
GlideApp.with(mContext)
.load(item.getAvatar())
.transform(new BlurTransformation(20, 1), new CenterCrop())
.into((ImageView) helper.getView(R.id.iv_blur_bg));
}
}

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

@@ -27,7 +27,6 @@ import java.util.List;
*/
public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMapInfo, BaseViewHolder> {
private int mBadgeHeight;
private Context mContext;
private boolean mIsHome;
/**
@@ -39,7 +38,6 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
addItemType(HomeTabMapInfo.TYPE_EMPTY,R.layout.item_erban_grid_empty);
this.mContext = context;
this.mIsHome = isHome;
mBadgeHeight = (int) context.getResources().getDimension(R.dimen.tag_height);
}
@@ -61,9 +59,6 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter<HomeTabMa
AVRoomActivity.startForFromType(mContext, item.getRoomUid(),AVRoomActivity.FROM_TYPE_RECOMMEND);
}
});
LivingIconView livingIconView = helper.getView(R.id.liv_living_icon);
livingIconView.setColor(Color.WHITE);
livingIconView.start();
helper.setText(R.id.tv_online_number,item.getOnlineNum()+"")
.setText(R.id.tv_title, item.getTitle());

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

@@ -40,7 +40,7 @@ public class MainMagicIndicatorAdapter extends CommonNavigatorAdapter {
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_666666));
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(mContext, R.color.color_999999));
scaleTransitionPagerTitleView.setSelectedColor(mIsShowIndicator ? ContextCompat.getColor(mContext, R.color.appColor) : ContextCompat.getColor(mContext, R.color.color_333333));
scaleTransitionPagerTitleView.setMinScale(0.8f);
scaleTransitionPagerTitleView.setTextSize(16);

16
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -32,6 +32,7 @@ import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import com.bumptech.glide.request.RequestOptions;
import com.coorchice.library.utils.LogUtils;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.ui.widget.rollviewpager.Util;
import com.yizhuan.erban.ui.widget.rollviewpager.hintview.ColorPointHintView;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
@@ -80,6 +81,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.user.event.ShowMeEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
@@ -200,6 +202,9 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
case R.id.tv_room_more:
HomeMoreRoomActivity.start(mContext);
break;
case R.id.iv_me:
EventBus.getDefault().post(new ShowMeEvent());
break;
}
}
@@ -654,7 +659,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
}
CommonNavigator commonNavigator = new CommonNavigator(getContext());
commonNavigator.setTitleWrapContent(true);
MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), mTabInfoList, true);
MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(getContext(), mTabInfoList, false);
magicIndicatorAdapter.setOnItemSelectListener(this);
commonNavigator.setAdapter(magicIndicatorAdapter);
mBinding.magicIndicator.setNavigator(commonNavigator);
@@ -700,6 +705,7 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
if (!TextUtils.isEmptyText(userInfo.getNick())) {
getRoomShortcut();
getHomeConcern();
ImageLoadUtilsV2.loadAvatar(mBinding.ivMe,userInfo.getAvatar());
}
}
@@ -863,14 +869,6 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
mBinding.tvAddFriends.setVisibility(View.VISIBLE);
mBinding.rvAddFriends.setVisibility(View.VISIBLE);
if (refresh) {
for (int i = 0; i < homePlayList.size(); i++) {
HomePlayInfo playInfo = homePlayList.get(i);
if (i % 2 == 0) {
playInfo.setTheme(HomePlayTheme.THEME_7E69F3);
} else {
playInfo.setTheme(HomePlayTheme.THEME_3FC7FB);
}
}
//两个以内直接setNewData并返回 不循环
if (homePlayList.size() <= 2) {
addFriendsAdapter.setNewData(homePlayList);

2
app/src/main/java/com/yizhuan/erban/ui/utils/ImageLoadUtils.java
View File

@@ -287,7 +287,7 @@ public class ImageLoadUtils {
GlideApp.with(context)
.load(url)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.transforms(new BlurTransformation(context, blur, scale))
.transform(new BlurTransformation(context, blur, scale))
.into(imageView);
}

14
app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java
View File

@@ -27,7 +27,7 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener
public static final int MAIN_TAB_POS_ME = 3;
public static final int MAIN_TAB_POS_HOME = 4;
private MainTab mMeTab, gameTab;
private MainTab gameTab;
private MainRedPointTab mMsgTab;
private MainRedPointTab mAttentionTab;
private int mLastPosition = -1;
@@ -69,13 +69,11 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener
mAttentionTab = findViewById(R.id.main_attention_tab);
mMsgTab = findViewById(R.id.main_msg_tab);
mMeTab = findViewById(R.id.main_me_tab);
gameTab = findViewById(R.id.main_game_tab);
gameTab.setOnClickListener(this);
mAttentionTab.setOnClickListener(this);
mMsgTab.setOnClickListener(this);
mMeTab.setOnClickListener(this);
mAttentionTab.setmListener(attentionListener);
mMsgTab.setmListener(msgListener);
@@ -99,12 +97,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_MESSAGE_TAB,
"消息tab");
break;
case R.id.main_me_tab:
select(MAIN_TAB_POS_ME);
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_HOME_MINE_TAB,
"我的tab");
break;
}
}
@@ -116,7 +108,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener
if (mLastPosition == position) return;
mAttentionTab.select(position == MAIN_TAB_POS_SQUARE);
mMsgTab.select(position == MAIN_TAB_POS_MSG);
mMeTab.select(position == MAIN_TAB_POS_ME);
gameTab.select(position == MAIN_TAB_POS_HOME);
if (mOnTabClickListener != null) {
mOnTabClickListener.onTabClick(position);
@@ -150,9 +141,6 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener
case MAIN_TAB_POS_MSG:
mMsgTab.setVisibility(visible);
break;
case MAIN_TAB_POS_ME:
mMeTab.setVisibility(visible);
break;
}
}

BIN
app/src/main/res/drawable-xhdpi/arrow_right_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 200 B

BIN
app/src/main/res/drawable-xhdpi/ic_home_online_tag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 480 B

BIN
app/src/main/res/drawable-xhdpi/ic_home_play_empty.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_home_rank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_home_search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_home_search.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 850 B

BIN
app/src/main/res/drawable-xhdpi/ic_online_user_count.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 1.1 KiB

11
app/src/main/res/drawable/bg_shape_home_top.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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:endColor="#FFB22B"
android:startColor="#FF9813" />
</shape>

8
app/src/main/res/drawable/shape_add_friends_f4f1ff.xml
View File

@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#f4f1ff" />
<corners
android:bottomLeftRadius="25dp"
android:bottomRightRadius="15dp"
android:topLeftRadius="25dp"
android:topRightRadius="15dp" />
<solid android:color="#FFEFD8" />
<corners android:radius="@dimen/dp_12"/>
</shape>

5
app/src/main/res/drawable/shape_circle_s2_white33.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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_2" android:color="@color/white_transparent_20"/>
</shape>

6
app/src/main/res/drawable/shape_circle_white.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="rectangle">
<corners android:radius="50dp"/>
<solid android:color="@color/color_33FFFFFF"/>
</shape>

5
app/src/main/res/drawable/shape_circle_white33.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="50dp"/>
<solid android:color="@color/color_33FFFFFF"/>/
android:shape="oval">
<solid android:color="@color/color_33FFFFFF"/>
</shape>

7
app/src/main/res/drawable/shape_f9f9f9_top_15dp.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_F9F9F9"/>
<corners android:topLeftRadius="@dimen/dp_15"
android:topRightRadius="@dimen/dp_15"/>
</shape>

12
app/src/main/res/drawable/shape_item_room_online_member.xml
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_66000000" />
<corners android:topLeftRadius="@dimen/dp_8"
android:topRightRadius="@dimen/dp_2"
android:bottomLeftRadius="@dimen/dp_8"
android:bottomRightRadius="@dimen/dp_8"/>
<gradient
android:angle="90"
android:endColor="@color/transparent"
android:startColor="@color/color_66000000" />
<corners
android:bottomLeftRadius="@dimen/dp_12"
android:bottomRightRadius="@dimen/dp_12" />
</shape>

217
app/src/main/res/layout/activity_main.xml
View File

@@ -1,131 +1,134 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="com.yizhuan.erban.MainActivity">
android:layout_height="match_parent">
<com.yizhuan.erban.ui.widget.MainTabLayout
android:id="@+id/main_tab_layout"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="48dp"
android:background="@color/white" />
android:layout_height="match_parent"
tools:context="com.yizhuan.erban.MainActivity">
<FrameLayout
android:id="@+id/main_fragment"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/main_tab_layout" />
<FrameLayout
android:id="@+id/main_fragment"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="9dp"
android:background="@drawable/bq_bg"
app:layout_constraintBottom_toTopOf="@+id/main_tab_layout" />
<com.yizhuan.erban.ui.widget.MainTabLayout
android:id="@+id/main_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!--<com.yizhuan.erban.common.widget.FloatingLiveMiniView-->
<!--android:id="@+id/floating_view"-->
<!--android:layout_above="@+id/main_tab_layout"-->
<!--android:layout_marginBottom="@dimen/dp_15"-->
<!--android:layout_width="172dp"-->
<!--android:layout_height="40dp" />-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/main_tab_layout"
app:layout_constraintTop_toTopOf="parent">
<FrameLayout
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/main_tab_layout"
android:layout_width="match_parent"
android:layout_height="0dp">
<com.yizhuan.erban.common.widget.DragLayout
android:id="@+id/avatar_image_layout"
android:layout_width="@dimen/dp_drag_layout_bg_width"
android:layout_height="@dimen/dp_drag_layout_bg_height"
android:background="@drawable/bg_room_main_entrance"
android:layout_gravity="bottom|end"
android:layout_marginBottom="50dp"
android:layout_marginEnd="@dimen/dp_15"
android:visibility="visible">
<com.yizhuan.erban.common.widget.DragLayout
android:id="@+id/avatar_image_layout"
android:layout_width="@dimen/dp_drag_layout_bg_width"
android:layout_height="@dimen/dp_drag_layout_bg_height"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="50dp"
android:background="@drawable/bg_room_main_entrance"
android:visibility="visible">
<FrameLayout
android:id="@+id/fl_avatar"
android:layout_width="@dimen/dp_drag_layout_avatar_size"
android:layout_height="@dimen/dp_drag_layout_avatar_size"
android:layout_centerVertical="true"
android:layout_marginStart="12.5dp"
<FrameLayout
android:id="@+id/fl_avatar"
android:layout_width="@dimen/dp_drag_layout_avatar_size"
android:layout_height="@dimen/dp_drag_layout_avatar_size"
android:layout_centerVertical="true"
android:layout_marginStart="12.5dp"
>
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar_image"
tools:src="@drawable/default_avatar"
android:layout_width="match_parent"
android:layout_height="match_parent" />
>
<com.yizhuan.erban.common.widget.CircleImageView
android:src="@color/black"
android:alpha="0.1"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:src="@drawable/default_avatar" />
<com.yizhuan.erban.ui.widget.LivingIconView
android:id="@+id/liv_user"
android:background="@color/transparent"
android:layout_gravity="center"
android:layout_width="10dp"
android:layout_height="10dp" />
</FrameLayout>
<com.yizhuan.erban.common.widget.CircleImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.1"
android:src="@color/black" />
<LinearLayout
android:id="@+id/ll_drag_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toEndOf="@id/fl_avatar"
android:layout_centerVertical="true"
android:layout_toStartOf="@id/view_close"
android:layout_marginStart="@dimen/dp_5"
>
<TextView
android:id="@+id/tv_name"
<com.yizhuan.erban.ui.widget.LivingIconView
android:id="@+id/liv_user"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="center"
android:background="@color/transparent" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_drag_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_12"
android:textColor="@color/white"
tools:text="我是一只小萌新"
android:lines="1"
android:ellipsize="end"
android:maxEms="6"
android:singleLine="true"
/>
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_5"
android:layout_toStartOf="@id/view_close"
android:layout_toEndOf="@id/fl_avatar"
android:orientation="vertical">
<TextView
android:id="@+id/tv_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="ID:666"
android:textSize="@dimen/dp_10"
android:textColor="@color/white"
android:singleLine="true"
android:ellipsize="end"
/>
</LinearLayout>
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:maxEms="6"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="@dimen/dp_12"
tools:text="我是一只小萌新" />
<TextView
android:id="@+id/tv_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="@dimen/dp_10"
tools:text="ID:666" />
</LinearLayout>
<ImageView
android:id="@+id/view_close"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_18"
android:src="@drawable/ic_room_main_entrance_close" />
<ImageView
android:id="@+id/view_close"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_18"
android:layout_centerVertical="true"
android:src="@drawable/ic_room_main_entrance_close"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22" />
</com.yizhuan.erban.common.widget.DragLayout>
</FrameLayout>
</com.yizhuan.erban.common.widget.DragLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.navigation.NavigationView
android:layout_width="260dp"
android:layout_height="match_parent"
android:layout_gravity="start"
app:insetForeground="@android:color/transparent">
<FrameLayout
android:id="@+id/fl_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.google.android.material.navigation.NavigationView>
</androidx.drawerlayout.widget.DrawerLayout>

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

@@ -22,49 +22,51 @@
android:background="@color/color_F9F9F9"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_bg_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="80dp"
android:background="@drawable/bg_shape_home_top"
android:gravity="center"
android:paddingTop="30dp"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_search_room"
android:layout_width="0dp"
android:layout_height="@dimen/dp_30"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_15"
android:layout_weight="1"
android:background="@drawable/bg_home_search"
android:drawableStart="@mipmap/ic_home_search"
android:drawablePadding="@dimen/dp_7"
android:gravity="center_vertical"
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_me"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="15dp"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_11"
android:paddingEnd="5dp"
android:text="@string/search_hint"
android:textColor="@color/white"
android:textSize="@dimen/sp_13" />
android:src="@drawable/default_avatar" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="43dp"
android:layout_weight="1"
android:gravity="center"
android:text="音游"
android:textColor="#ffffffff"
android:textSize="21sp" />
<ImageView
android:id="@+id/tv_search_room"
android:layout_width="40dp"
android:layout_height="40dp"
android:onClick="@{click}"
android:scaleType="center"
android:src="@drawable/ic_home_search" />
<ImageView
android:id="@+id/iv_ranking"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_10"
android:adjustViewBounds="true"
android:onClick="@{click}"
android:scaleType="fitXY"
android:src="@mipmap/ic_home_ranking" />
android:scaleType="center"
android:src="@drawable/ic_home_rank" />
<ImageView
android:id="@+id/iv_to_sign_in"
@@ -85,11 +87,12 @@
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="50dp">
android:layout_marginTop="80dp">
<com.scwang.smartrefresh.layout.header.ClassicsHeader
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:srlAccentColor="@color/white"/>
android:background="@drawable/bg_shape_home_top" />
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
@@ -119,16 +122,97 @@
android:id="@+id/rv_follow_room"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@drawable/bg_shape_home_top"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal"
android:paddingBottom="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room">
<View
android:id="@+id/view_bg_indicator"
android:layout_width="match_parent"
android:layout_height="15dp"
android:background="@drawable/bg_shape_home_top"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="15dp"
android:background="@drawable/shape_f9f9f9_top_15dp"
app:layout_constraintTop_toTopOf="parent" />
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="14dp"
android:paddingEnd="@dimen/dp_10"
android:paddingBottom="5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_bg_indicator" />
<TextView
android:id="@+id/tv_room_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/arrow_right_2"
android:drawablePadding="@dimen/dp_3"
android:gravity="bottom"
android:onClick="@{click}"
android:paddingTop="5dp"
android:paddingEnd="15dp"
android:text="更多房间"
android:textColor="@color/color_999999"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintTop_toTopOf="@id/magic_indicator" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.yizhuan.erban.ui.widget.ContentWrapViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add_friends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_add_friends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:paddingTop="@dimen/dp_5"
android:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_roll_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="5dp"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginBottom="5dp">
@@ -143,77 +227,6 @@
app:rollviewpager_hint_paddingBottom="8dp"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_indicator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal"
android:paddingStart="14dp"
android:paddingTop="5dp"
android:paddingEnd="15dp"
android:paddingBottom="5dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="0dp"
android:layout_height="@dimen/dp_30"
android:layout_weight="1"
android:paddingEnd="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/tv_room_more"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_room_more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/arrow_right_2"
android:drawablePadding="@dimen/dp_3"
android:gravity="bottom"
android:onClick="@{click}"
android:paddingTop="5dp"
android:text="更多房间"
android:textColor="@color/color_666666"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/magic_indicator"
app:layout_constraintTop_toTopOf="@id/magic_indicator" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.yizhuan.erban.ui.widget.ContentWrapViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add_friends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:includeFontPadding="false"
android:paddingStart="16dp"
android:paddingTop="15dp"
android:text="交友扩列"
android:textColor="@color/color_333333"
android:textSize="16sp"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_add_friends"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_F9F9F9"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_10"
android:visibility="visible" />
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>

5
app/src/main/res/layout/fragment_home_tab_map.xml
View File

@@ -14,9 +14,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingStart="12.5dp"
android:paddingTop="2dp"
android:paddingEnd="12.5dp" />
android:paddingStart="11dp"
android:paddingEnd="11dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

6
app/src/main/res/layout/item_erban_grid_empty.xml
View File

@@ -6,10 +6,8 @@
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
tools:layout_width="108dp"
android:layout_marginStart="@dimen/margin_home_tab_gride"
android:layout_marginEnd="@dimen/margin_home_tab_gride"
android:layout_marginBottom="@dimen/margin_home_tab_gride"
android:background="@drawable/bg_corner_shadow_12"
android:layout_marginStart="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_2"
android:orientation="vertical">
<com.yizhuan.erban.ui.widget.SquareLayout

163
app/src/main/res/layout/item_home_add_friends.xml
View File

@@ -4,115 +4,138 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginBottom="15dp"
android:orientation="vertical">
<View
android:id="@+id/view_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="36dp"
android:layout_marginEnd="14dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/shape_add_friends_f4f1ff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_one"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="15dp"
android:src="@drawable/default_avatar"
app:cborder_color="#7E69F3"
app:cborder_width="2dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_tag"
android:layout_width="33dp"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="12dp"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
android:adjustViewBounds="true"
android:visibility="visible"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/view_bg" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_room_avatar"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:layout_marginTop="18dp"
android:src="@drawable/default_avatar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_6"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_333333"
android:textSize="13sp"
app:layout_constraintBottom_toTopOf="@id/ll_avatar"
app:layout_constraintStart_toEndOf="@+id/iv_mic_user_one"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar"
app:layout_constraintStart_toEndOf="@id/iv_room_avatar"
app:layout_constraintTop_toTopOf="@id/iv_room_avatar"
app:layout_constraintVertical_chainStyle="packed"
tools:text="官方交友厅" />
<FrameLayout
android:id="@+id/ll_avatar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_mic_user_one"
app:layout_constraintTop_toBottomOf="@id/tv_title">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_five"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="85dp"
android:src="@drawable/default_avatar" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_four"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="60dp"
android:src="@drawable/default_avatar" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_three"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="35dp"
android:src="@drawable/default_avatar" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_two"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_marginStart="@dimen/dp_10"
android:src="@drawable/default_avatar" />
</FrameLayout>
<TextView
android:id="@+id/tv_online_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:layout_marginBottom="14dp"
android:layout_marginEnd="15dp"
android:drawableStart="@drawable/ic_online_user_count"
android:includeFontPadding="false"
android:textColor="@color/color_666666"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_13"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/view_bg"
app:layout_constraintBottom_toBottomOf="@id/iv_room_avatar"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintTop_toTopOf="@id/iv_room_avatar"
tools:text="231" />
<HorizontalScrollView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="11dp"
android:clipToPadding="false"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/view_bg"
app:layout_constraintStart_toStartOf="@id/view_bg"
app:layout_constraintTop_toBottomOf="@id/iv_room_avatar">
<LinearLayout
android:id="@+id/ll_avatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_one"
android:layout_width="65dp"
android:layout_height="65dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#FFBD2F"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_two"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#FFBD2F"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_three"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#FFBD2F"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_four"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#FFBD2F"
app:cborder_width="@dimen/dp_2" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_mic_user_five"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_home_play_empty"
app:cborder_color="#FFBD2F"
app:cborder_width="@dimen/dp_2" />
</LinearLayout>
</HorizontalScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>

65
app/src/main/res/layout/item_home_play.xml
View File

@@ -4,27 +4,59 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="3dp"
android:background="@drawable/bg_corner_shadow_12">
android:layout_marginStart="5dp"
android:layout_marginTop="7dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="7dp">
<ImageView
android:id="@+id/iv_avatar"
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_blur_bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="2dp"
android:layout_marginTop="1dp"
android:layout_marginEnd="2dp"
android:src="@drawable/default_cover"
app:layout_constraintDimensionRatio="167:173"
app:borderRadius="@dimen/dp_12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="167:180"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:type="round" />
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/shape_black_t50_12"
app:layout_constraintBottom_toBottomOf="@id/iv_blur_bg"
app:layout_constraintEnd_toEndOf="@id/iv_blur_bg"
app:layout_constraintStart_toStartOf="@id/iv_blur_bg"
app:layout_constraintTop_toTopOf="@id/iv_blur_bg" />
<View
android:layout_width="102dp"
android:layout_height="102dp"
android:background="@drawable/shape_circle_white33"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
app:layout_constraintEnd_toEndOf="@id/iv_avatar"
app:layout_constraintStart_toStartOf="@id/iv_avatar"
app:layout_constraintTop_toTopOf="@id/iv_avatar" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="97dp"
android:layout_height="97dp"
android:src="@drawable/default_cover"
app:cborder_color="@color/white_transparent_30"
app:cborder_width="3.5dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.3" />
<ImageView
android:id="@+id/iv_tag"
android:layout_width="33dp"
android:layout_width="wrap_content"
android:layout_height="15dp"
android:layout_marginStart="2dp"
android:adjustViewBounds="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -34,18 +66,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_13"
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_13"
android:layout_marginBottom="10dp"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/color_666666"
android:textSize="12sp"
android:textColor="@color/white"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_avatar"
tools:text="官官方交友厅官官官方交友厅官方交友厅官方交友厅方交友厅方交友厅官方交友厅方交友厅" />
app:layout_constraintWidth_default="wrap"
tools:text="交友厅" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -5,10 +5,8 @@
android:id="@+id/ll_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_home_tab_gride"
android:layout_marginEnd="@dimen/margin_home_tab_gride"
android:layout_marginBottom="@dimen/margin_home_tab_gride"
android:background="@drawable/bg_corner_shadow_12"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:orientation="vertical"
tools:layout_width="108dp">
@@ -24,51 +22,41 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/default_avatar"
app:riv_corner_radius="@dimen/dp_13" />
app:riv_corner_radius="@dimen/dp_12" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:layout_marginBottom="5dp"
android:background="@drawable/shape_item_room_online_member"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="7dp"
android:paddingTop="2dp"
android:paddingRight="7dp"
android:paddingBottom="2dp">
<com.yizhuan.erban.ui.widget.LivingIconView
android:id="@+id/liv_living_icon"
android:layout_width="6dp"
android:layout_height="8dp"
android:background="@color/transparent" />
android:orientation="horizontal">
<TextView
android:id="@+id/tv_online_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_gravity="bottom|end"
android:layout_marginEnd="7dp"
android:layout_marginBottom="5dp"
android:drawablePadding="3dp"
android:drawableStart="@drawable/ic_home_online_tag"
android:gravity="center"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="10sp"
tools:text="100人在线" />
</LinearLayout>
tools:text="100" />
</FrameLayout>
<ImageView
android:id="@+id/iv_tab_label"
android:layout_width="43dp"
android:layout_height="18dp"
android:src="@mipmap/ic_bg_home_room_tag"
android:scaleType="centerCrop"
tools:visibility="gone"
android:visibility="invisible"/>
android:src="@mipmap/ic_bg_home_room_tag"
android:visibility="invisible"
tools:visibility="gone" />
<TextView
android:id="@+id/tv_tag_content"
@@ -76,9 +64,9 @@
android:layout_height="18dp"
android:background="@drawable/shape_home_room_tag"
android:gravity="center"
android:includeFontPadding="false"
android:maxLength="5"
android:paddingStart="10dp"
android:includeFontPadding="false"
android:paddingEnd="10dp"
android:text="我是"
android:textColor="@color/white"
@@ -100,7 +88,7 @@
android:maxLines="1"
android:textColor="@color/color_333333"
android:textSize="12sp"
tools:text="房间名称" />
tools:text="房间名称房间名称房间名称" />
<View
android:layout_width="match_parent"

44
app/src/main/res/layout/main_tab_layout.xml
View File

@@ -3,9 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
tools:parentTag="com.yizhuan.erban.ui.widget.MainTabLayout">
tools:parentTag="LinearLayout">
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_game_tab"
@@ -16,23 +16,8 @@
android:textSize="10sp"
app:tab_icon="@mipmap/ic_main_tab_game_home"
app:tab_icon_select="@mipmap/ic_main_tab_game_pressed"
app:tab_text="首页"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_home_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="@dimen/sp_10"
android:visibility="gone"
app:tab_icon="@mipmap/ic_main_tab_home"
app:tab_icon_select="@mipmap/ic_main_tab_home_pressed"
app:tab_text=""
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
app:tab_text_color="@color/color_999999"
app:tab_text_color_select="@color/appColor" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_attention_tab"
@@ -43,10 +28,8 @@
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_find"
app:tab_icon_select="@mipmap/ic_main_tab_find_pressed"
app:tab_text="广场"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999"
/>
app:tab_text_color_select="@color/appColor" />
<com.yizhuan.erban.ui.widget.MainRedPointTab
android:id="@+id/main_msg_tab"
@@ -57,22 +40,7 @@
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_msg"
app:tab_icon_select="@mipmap/ic_main_tab_msg_pressed"
app:tab_text="消息"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999"
/>
<com.yizhuan.erban.ui.widget.MainTab
android:id="@+id/main_me_tab"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textSize="@dimen/sp_10"
app:tab_icon="@mipmap/ic_main_tab_me"
app:tab_icon_select="@mipmap/ic_main_tab_me_pressed"
app:tab_text="我的"
app:tab_text_color_select="@color/appColor"
app:tab_text_color="@color/color_999999" />
app:tab_text_color_select="@color/appColor" />
</merge>

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 808 B

After

Width:  |  Height:  |  Size: 8.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 999 B

After

Width:  |  Height:  |  Size: 8.1 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

2
app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
View File

@@ -188,7 +188,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
PublishItem item = imageShowList.get(position);
if (item.isAddItem()) {
LogUtil.print("跳转到图库");
CaptureStrategy captureStrategy = new CaptureStrategy(true, "com.xuanyi.accompany.fileprovider",
CaptureStrategy captureStrategy = new CaptureStrategy(true, "com.mango.yinyou.fileprovider",
BasicConfig.INSTANCE.getImageDir().getAbsolutePath());
int maxCanSelect = 9 - uploadList.size();
Matisse.from(PublishActivity.this)

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -11,7 +11,7 @@ public class XChatConstants {
/**
* 包名(各种缓存目录的根目录)
*/
public static final String XCHAT_DIR_NAME = "com.xuanyi.accompany";
public static final String XCHAT_DIR_NAME = "com.mango.yinyou";
/**
* sp名字

3
core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt Normal file
View File

@@ -0,0 +1,3 @@
package com.yizhuan.xchat_android_core.user.event
class ShowMeEvent

58
core/src/model_pay/java/com/mango/yinyou/wxapi/WXPayEntryActivity.java Normal file
View File

@@ -0,0 +1,58 @@
package com.mango.yinyou.wxapi;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
import com.tencent.mm.opensdk.modelbase.BaseReq;
import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.pay.PaymentActivity;
public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
private static final String TAG = "WXPayEntryActivity";
private IWXAPI api;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
api = WXAPIFactory.createWXAPI(this, XChatConstants.WX_APP_ID);
api.handleIntent(getIntent(), this);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
api.handleIntent(intent, this);
}
@Override
protected void onResume() {
super.onResume();
}
@Override
public void onReq(BaseReq req) {
}
@Override
public void onResp(BaseResp baseResp) {
Log.e(TAG, "onPayFinish, errCode = " + baseResp.errCode + ", errorStr = " + baseResp.errStr);
if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
Intent intent = new Intent(this, PaymentActivity.class);
startActivity(intent);
finish();
}
}
}

4
gradle.properties
View File

@@ -20,5 +20,5 @@ with_jenkins=false
#\u6253\u652F\u6301x86\u7684\u6A21\u62DF\u5668\u5305\u4F7F\u7528
ndk_abi_filters=arm
version_name=2.1.1
version_code=211
version_name=5.1.1
version_code=511

BIN
yinyou.jks Normal file
View File

Binary file not shown.