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

收藏房间，消息

Browse Source
This commit is contained in:
oujunhui
2020-04-18 17:27:09 +08:00
parent c671ce02b9
commit 285292a005
62 changed files with 788 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/accompany/debug/app-accompany-debug.apk
View File

Binary file not shown.

1
app/accompany/debug/output.json
View File

@@ -1 +0,0 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-accompany-debug.apk","fullName":"accompanyDebug","baseName":"accompany-debug"},"path":"app-accompany-debug.apk","properties":{}}]

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

@@ -597,6 +597,10 @@
android:name=".ui.pay.CDKEYChargeActivity"
android:label="兑换码充值"
android:screenOrientation="portrait" />
<activity
android:name=".home.activity.CollectionRoomActivity"
android:label="收藏房间"
android:screenOrientation="portrait" />
<activity
android:name=".ui.wallet.WalletActivity"
android:label="我的钱包"

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

@@ -39,6 +39,7 @@ import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.avroom.activity.RoomOnlineUserActivity;
import com.yizhuan.erban.avroom.presenter.HomePartyPresenter;
import com.yizhuan.erban.home.model.CollectionRoomModel;
import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper;
import com.yizhuan.erban.avroom.widget.GiftV2View;
import com.yizhuan.erban.avroom.widget.MessageView;
@@ -53,6 +54,7 @@ import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
import com.yizhuan.xchat_android_core.decoration.nameplate.NamePlateModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo;
@@ -120,6 +122,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
private TextView roomTitle;
private TextView roomId;
private TextView tvFollowRoom;
private AppCompatImageView mIvGoodNumber;
private ImageView roomBack;
@@ -176,7 +179,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
private void setRoomId(long id, int onlineNumber) {
String htmlText = "ID:" + id;
roomId.setText(Html.fromHtml(htmlText));
roomId.setText(htmlText);
}
@Override
@@ -212,6 +215,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
mSvgaCar = mView.findViewById(R.id.room_car_svga);
mVsGift2View = mView.findViewById(R.id.vs_gift_view);
mIvGoodNumber = mView.findViewById(R.id.iv_good_number);
tvFollowRoom = mView.findViewById(R.id.tv_follow_room);
mSVGAParser = new SVGAParser(mContext);
@@ -356,6 +360,7 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
roomMore.setOnClickListener(this);
roomId.setOnClickListener(this);
roomBack.setOnClickListener(this);
tvFollowRoom.setOnClickListener(this);
ivRoomShare.setOnClickListener(this);
gameMainBinding.roomNums.setOnClickListener(this);
}
@@ -602,10 +607,27 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
case R.id.iv_room_share:
shareRoom();
break;
case R.id.tv_follow_room:
followRoom();
break;
default:
}
}
/**
* 收藏房间
*/
private void followRoom() {
CollectionRoomModel.get().followRoom(String.valueOf(mUserInfo.getErbanNo()))
.compose(bindUntilEvent(FragmentEvent.DESTROY))
.doOnError(throwable -> {
toast(throwable.getMessage());
})
.subscribe(s -> {
});
}
public void shareRoom() {
if (shareDialog != null && shareDialog.isShowing()) {
shareDialog.dismiss();
@@ -986,6 +1008,6 @@ public class HomePartyFragment extends AbsRoomFragment implements View.OnClickLi
onlineNumber = 1;
}
}
gameMainBinding.roomNums.setText(onlineNumber + "人在线>");
gameMainBinding.roomNums.setText( "在线" + onlineNumber);
}
}

4
app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
View File

@@ -6,6 +6,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
@@ -21,7 +22,6 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
}
@Override
protected void convert(BaseViewHolder helper, NamePlateInfo.NameplateListBean item) {
helper.addOnClickListener(R.id.tv_used);
@@ -29,7 +29,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter<NamePlateInfo.Nameplate
helper.setText(R.id.tv_nameplate_name,item.getNameplateName());
//铭牌图标
ImageView ivCover = helper.getView(R.id.iv_nameplate_cover);
NobleUtil.loadHeadWear(item.getNameplateImage(),ivCover);
GlideApp.with(mContext).load(item.getNameplateImage()).into(ivCover);
//使用按钮

11
app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java
View File

@@ -77,7 +77,12 @@ public class MyNamePlateFragment extends BaseFragment {
}
private boolean isLoading = false;
private void loadData() {
if (isLoading) {
return;
}
isLoading = true;
NamePlateModel.get().getNamePlateList(AuthModel.get().getCurrentUid())
.subscribe((serviceResult, throwable) -> {
if (throwable != null) {
@@ -91,14 +96,14 @@ public class MyNamePlateFragment extends BaseFragment {
mNamePlateAdapter.setNewData(info);
mNamePlateAdapter.notifyDataSetChanged();
swipeRefresh.setRefreshing(false);
isLoading = false;
}
});
}
private void initRecyclerView() {
LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
recyclerView.setLayoutManager(layoutManager);
recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
mNamePlateAdapter = new MyNamePlateAdapter();
mNamePlateAdapter.setOnItemChildClickListener((adapter, view, position) -> {

6
app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java
View File

@@ -63,9 +63,9 @@ public class CarMagicIndicator extends CommonNavigatorAdapter {
public IPagerIndicator getIndicator(Context context) {
LinePagerIndicator indicator = new LinePagerIndicator(context);
indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
indicator.setLineHeight(UIUtil.dip2px(mContext, 2.5));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 1.25));
indicator.setLineWidth(UIUtil.dip2px(mContext, 16));
indicator.setLineHeight(UIUtil.dip2px(mContext, 5));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 3));
indicator.setLineWidth(UIUtil.dip2px(mContext, 9));
indicator.setColors(context.getResources().getColor(R.color.appColor));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
lp.bottomMargin = mBottomMargin;

90
app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java Normal file
View File

@@ -0,0 +1,90 @@
package com.yizhuan.erban.home.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.home.adapter.CollectionRoomAdapter;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.home.model.CollectionRoomModel;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_library.utils.ListUtils;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
public class CollectionRoomActivity extends BaseActivity {
@BindView(R.id.recycler_view)
RecyclerView recyclerView;
@BindView(R.id.swipe_refresh)
SwipeRefreshLayout swipeRefresh;
private CollectionRoomAdapter roomAdapter;
private int pageSize = Constants.PAGE_SIZE;
private int page = 1;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_collection_room);
ButterKnife.bind(this);
initTitleBar("我收藏的房间");
initRecyclerView();
initSwipRefresh();
loadData();
}
public static void start(Context context) {
Intent intent = new Intent(context, CollectionRoomActivity.class);
context.startActivity(intent);
}
private void initRecyclerView() {
recyclerView.setLayoutManager(new LinearLayoutManager(this));
roomAdapter = new CollectionRoomAdapter();
recyclerView.setAdapter(roomAdapter);
}
private void initSwipRefresh() {
swipeRefresh.setOnRefreshListener(() -> loadData());
}
private boolean isLoading = false;
private void loadData() {
if (isLoading) {
return;
}
isLoading = true;
CollectionRoomModel.get().getCollectionRoomList(AuthModel.get().getCurrentUid(),page,pageSize)
.subscribe((serviceResult, throwable) -> {
if (throwable != null) {
} else {
List<CollectionRoomInfo.FansRoomListBean> info = serviceResult.getFansRoomList();
if (ListUtils.isListEmpty(info)) {
showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有收藏哦!");
return;
}
roomAdapter.setNewData(info);
roomAdapter.notifyDataSetChanged();
swipeRefresh.setRefreshing(false);
isLoading = false;
}
});
}
}

32
app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java Normal file
View File

@@ -0,0 +1,32 @@
package com.yizhuan.erban.home.adapter;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
/**
* Created by yudi
* on 2018/3/2.
*/
public class CollectionRoomAdapter extends BaseQuickAdapter<CollectionRoomInfo.FansRoomListBean, BaseViewHolder> {
public CollectionRoomAdapter() {
super(R.layout.item_room_collection);
}
@Override
protected void convert(BaseViewHolder helper, CollectionRoomInfo.FansRoomListBean item) {
helper.setText(R.id.tv_room_name,item.getRoomName())
.setText(R.id.room_id,"ID:"+item.getId())
.setText(R.id.tv_room_online_num,item.getRoomOnlineNum());
ImageView imageView = helper.getView(R.id.rriv_room_img);
ImageLoadUtilsV2.loadImage(imageView, item.getRoomAvatar());
}
}

96
app/src/main/java/com/yizhuan/erban/home/bean/CollectionRoomInfo.java Normal file
View File

@@ -0,0 +1,96 @@
package com.yizhuan.erban.home.bean;
import java.util.List;
public class CollectionRoomInfo {
/**
* totalPage : 1
* fansRoomList : [{"id":1,"roomId":170395761,"uid":934999,"roomAvatar":"https://img.erbanyy.com/qingxun_default_avatar.png","roomName":"辅导的房间","roomOnlineNum":1},{"id":2,"roomId":170408178,"uid":934999,"roomAvatar":"https://img.erbanyy.com/qingxun_default_avatar.png","roomName":"我是一只小萌新辅导辅导辅导辅导的房间","roomOnlineNum":1}]
*/
private int totalPage;
private List<FansRoomListBean> fansRoomList;
public int getTotalPage() {
return totalPage;
}
public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}
public List<FansRoomListBean> getFansRoomList() {
return fansRoomList;
}
public void setFansRoomList(List<FansRoomListBean> fansRoomList) {
this.fansRoomList = fansRoomList;
}
public static class FansRoomListBean {
/**
* id : 1
* roomId : 170395761
* uid : 934999
* roomAvatar : https://img.erbanyy.com/qingxun_default_avatar.png
* roomName : 辅导的房间
* roomOnlineNum : 1
*/
private int id;
private int roomId;
private int uid;
private String roomAvatar;
private String roomName;
private int roomOnlineNum;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getRoomId() {
return roomId;
}
public void setRoomId(int roomId) {
this.roomId = roomId;
}
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getRoomAvatar() {
return roomAvatar;
}
public void setRoomAvatar(String roomAvatar) {
this.roomAvatar = roomAvatar;
}
public String getRoomName() {
return roomName;
}
public void setRoomName(String roomName) {
this.roomName = roomName;
}
public int getRoomOnlineNum() {
return roomOnlineNum;
}
public void setRoomOnlineNum(int roomOnlineNum) {
this.roomOnlineNum = roomOnlineNum;
}
}
}

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

@@ -19,6 +19,7 @@ import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.FragmentMeBinding;
import com.yizhuan.erban.decoration.view.MyDecorationActivity;
import com.yizhuan.erban.home.activity.CollectionRoomActivity;
import com.yizhuan.erban.home.dialog.CreateRoomDialog;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
@@ -330,7 +331,7 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
openRoom();
break;
case R.id.ll_collect_room:
toast("收藏房间");
CollectionRoomActivity.start(mContext);
break;
case R.id.me_item_radish:
@@ -357,6 +358,12 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
startActivity(new Intent(getActivity(), PatriarchModeActivity.class));
break;
case R.id.me_item_certification:
// 跳去实名认证页面
CommonWebViewActivity.start(mContext,
UriProvider.getTutuRealNamePage());
break;
case R.id.me_item_setting:
UIHelper.showSettingAct(mContext);
break;
@@ -460,7 +467,7 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
default:
case CER_TYPE_NONE:
// do nothing
openCreateRoomTypeDialog();
openNormalRoom();
break;
case CER_TYPE_FORCE:
@@ -482,7 +489,7 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
openCreateRoomTypeDialog();
openNormalRoom();
}
@Override
@@ -495,7 +502,7 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
break;
}
} else {
openCreateRoomTypeDialog();
openNormalRoom();
}
}
@@ -515,12 +522,12 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
}
}
//选择创建房间类型
private void openCreateRoomTypeDialog() {
new CreateRoomDialog(getActivity(), new CreateRoomDialog.OpenRoomListener() {
@Override
public void onNormalRoom() {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.game_homepage_createroom_ordinary_click, "创建普通房");
getRoomInfo(RoomInfo.ROOMTYPE_HOME_PARTY);
openNormalRoom();
}
@Override
@@ -531,6 +538,12 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
}).openDialog();
}
//创建普通房间
private void openNormalRoom(){
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.game_homepage_createroom_ordinary_click, "创建普通房");
getRoomInfo(RoomInfo.ROOMTYPE_HOME_PARTY);
}
private void getRoomInfo(int roomType) {
AvRoomModel.get().requestRoomInfoFromService(String.valueOf(AuthModel.get().getCurrentUid()),
new CallBack<RoomInfo>() {

95
app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java Normal file
View File

@@ -0,0 +1,95 @@
package com.yizhuan.erban.home.model;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.ui.praise.Utils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.base.BaseModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.Single;
import io.reactivex.SingleSource;
import io.reactivex.functions.Function;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Query;
public class CollectionRoomModel extends BaseModel {
private volatile static CollectionRoomModel model;
private Api api;
public static CollectionRoomModel get() {
if (model == null) {
synchronized (CollectionRoomModel.class) {
if (model == null) {
model = new CollectionRoomModel();
}
}
}
return model;
}
private CollectionRoomModel() {
api = RxNet.create(Api.class);
}
/**
* 获取收藏房间列表
*
* @return
*/
public Single<CollectionRoomInfo> getCollectionRoomList(long uid,int page,int pageSize) {
return api.getCollectionRoomList(String.valueOf(uid), String.valueOf(page), String.valueOf(pageSize))
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers());
}
/**
* 收藏房间
*
* @return
*/
public Single<String> followRoom(String roomId){
long uid = AuthModel.get().getCurrentUid();
String ticket = AuthModel.get().getTicket();
return api.followRoom(String.valueOf(uid),roomId,ticket)
.flatMap(new Function<ServiceResult<String>, SingleSource<String>>() {
@Override
public SingleSource<String> apply(ServiceResult<String> stringServiceResult) throws Exception {
if (stringServiceResult.isSuccess()) {
return Single.just("收藏成功");
}else {
return Single.error(new Throwable(stringServiceResult.getMessage()));
}
}
})
.doOnSuccess(s -> {
SingleToastUtil.showToast("收藏成功");
})
.compose(RxHelper.handleSchedulers());
}
private interface Api {
/**
* 获取铭牌列表
* @param uid
* @param page
* @param pageSize
* @return
*/
@GET("fans/fansRoomList")
Single<ServiceResult<CollectionRoomInfo>> getCollectionRoomList(@Query("uid") String uid,
@Query("page") String page,
@Query("pageSize") String pageSize);
@POST("fans/fansRoom")
Single<ServiceResult<String>> followRoom(@Query("uid") String uid,
@Query("roomId") String roomId,
@Query("ticket") String ticket);
}
}

23
app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java
View File

@@ -461,7 +461,7 @@ public class RecentListFragment extends BaseFragment {
AttentionModel.get().getAttentionList(
AuthModel.get().getCurrentUid(),
1,
100)
200)
.flatMap(attentionInfos -> {
if (attentionInfos != null) {
Iterator<AttentionInfo> iterator = attentionInfos.iterator();
@@ -482,23 +482,24 @@ public class RecentListFragment extends BaseFragment {
List<AttentionItem> attentionItems = new ArrayList<>();
AttentionItem attentionItem = new AttentionItem(AttentionItem.TYPE_PLAY_TOGETHER, null);
attentionItems.add(attentionItem);
//一起玩
// attentionItems.add(attentionItem);
int count = 0;
// int count = 0;
for (AttentionInfo attentionInfo : attentionInfos) {
if (count >= 20) { // 最多展示20个
break;
}
// if (count >= 20) { // 最多展示20个
// break;
// }
attentionItem = new AttentionItem(AttentionItem.TYPE_ATTENTION, attentionInfo);
attentionItems.add(attentionItem);
count++;
// count++;
}
// 超过20，提供进入关注列表页入口
if (attentionInfos.size() > 20) {
attentionItem = new AttentionItem(AttentionItem.TYPE_ATTENTION_MORE, null);
attentionItems.add(attentionItem);
}
// if (attentionInfos.size() > 20) {
// attentionItem = new AttentionItem(AttentionItem.TYPE_ATTENTION_MORE, null);
// attentionItems.add(attentionItem);
// }
if (rvAttentionOnline != null) {
rvAttentionOnline.setVisibility(View.VISIBLE);

7
app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java
View File

@@ -16,6 +16,7 @@ import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
@@ -90,13 +91,17 @@ public class LoginCodeActivity extends BaseLoginAct {
onFindViews();
initData();
onSetListener();
// getSmsCode();
getSmsCode();
}
@SuppressLint("SetTextI18n")
private void initData() {
mPhone = getIntent().getStringExtra("phone");
tvDesc.setText(getString(R.string.str_send_code_success)+mPhone);
codeEt.setFocusable(true);
codeEt.setFocusableInTouchMode(true);
codeEt.requestFocus();
this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
}

7
app/src/main/java/com/yizhuan/erban/ui/login/LoginPhoneActivity.java
View File

@@ -9,6 +9,7 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
import android.widget.EditText;
@@ -59,6 +60,11 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
initTitleBar("",true);
onFindViews();
onSetListener();
accountEt.setFocusable(true);
accountEt.setFocusableInTouchMode(true);
accountEt.requestFocus();
this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
// permission();
// showLoginTip();
// AuthModel.get().isFromLogin = true;
@@ -78,7 +84,6 @@ public class LoginPhoneActivity extends BaseActivity implements View.OnClickList
btnNext.setOnClickListener(this);
btnNext.setEnabled(false);
accountEt.addTextChangedListener(textWatcher);
}
private void checkInput() {

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 468 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 782 B

6
app/src/main/res/drawable/bg_common_cancel.xml
View File

@@ -2,12 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<solid android:color="#EAE5FC" />
<corners android:radius="19dp" />
<stroke
android:width="2dp"
android:color="@color/color_B3B3B3" />
</shape>

16
app/src/main/res/drawable/bg_common_confirm.xml
View File

@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/appColor" />
<corners android:radius="19dp"/>
<stroke
android:width="2dp"
android:color="@color/color_333333" />
</shape>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_common_confirm_normal" android:state_enabled="false" />
<item android:drawable="@drawable/bg_common_confirm_press" android:state_enabled="true" />
</selector>

11
app/src/main/res/drawable/bg_common_confirm_normal.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:startColor="#735FFE"
android:endColor="#8776FF"/>
<corners android:radius="19dp"/>
</shape>

13
app/src/main/res/drawable/bg_common_confirm_press.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="#6755E4"
android:endColor="#796AE5"/>
<corners android:radius="19dp"/>
</shape>

2
app/src/main/res/drawable/bg_common_touch_while.xml
View File

@@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/item_hover" android:state_pressed="true" />
<item android:drawable="@color/item_hover" android:state_focused="true" />
<item android:drawable="@color/color_FAFAFA" />
<item android:drawable="@color/color_white" />
</selector>

11
app/src/main/res/drawable/bg_room_follow_room.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:startColor="#735FFE"
android:endColor="#8776FF"/>
<corners android:radius="12dp"/>
</shape>

31
app/src/main/res/layout/activity_collection_room.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<com.yizhuan.erban.common.widget.StatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/status_layout"
android:background="@color/white"
>
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/title_bar"
>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</com.yizhuan.erban.common.widget.StatusLayout>

10
app/src/main/res/layout/attention_item_new.xml
View File

@@ -67,7 +67,7 @@
android:id="@+id/iv_noble_level"
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_marginEnd="2dp"
android:layout_marginEnd="4dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level_king"
tools:visibility="visible"
@@ -76,8 +76,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:visibility="gone"
@@ -88,8 +88,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:visibility="gone"

2
app/src/main/res/layout/dialog_buy_decoration.xml
View File

@@ -27,7 +27,7 @@
android:layout_width="140dp"
android:layout_height="38dp"
android:text="@string/label_common_close"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:textSize="15sp"
android:background="@drawable/bg_common_cancel"
android:gravity="center"

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

@@ -59,7 +59,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:background="@drawable/bg_common_cancel"
android:textSize="15sp"
android:layout_marginEnd="2.5dp"
@@ -72,7 +72,7 @@
android:layout_weight="1"
android:gravity="center"
android:text="@string/text_ok"
android:textColor="@color/color_333333"
android:textColor="@color/white"
android:background="@drawable/bg_common_confirm"
android:textSize="15sp"
android:layout_marginEnd="5dp"

2
app/src/main/res/layout/dialog_pub_room_shutup.xml
View File

@@ -116,7 +116,7 @@
android:background="@drawable/bg_common_cancel"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:textSize="15sp" />
<TextView

2
app/src/main/res/layout/dialog_task.xml
View File

@@ -32,7 +32,7 @@
android:text="@string/close"
android:layout_marginTop="13dp"
android:layout_marginBottom="17dp"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:layout_gravity="center_horizontal"
android:background="@drawable/bg_common_cancel"
android:textSize="15sp" />

8
app/src/main/res/layout/fans_list_item_new.xml
View File

@@ -76,8 +76,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:visibility="gone"
@@ -88,8 +88,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="38dp"
android:layout_height="@dimen/dp_15"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:visibility="gone"

47
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -37,7 +37,7 @@
android:id="@+id/ll_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_toEndOf="@id/room_back"
android:gravity="center_vertical">
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_title"
android:layout_centerHorizontal="true"
android:layout_toEndOf="@id/room_back"
android:orientation="horizontal">
<android.support.v7.widget.AppCompatImageView
@@ -97,24 +97,45 @@
android:visibility="gone"
tools:visibility="visible" />
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="12sp"
tools:text="8888" />
<TextView
android:id="@+id/room_nums"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="12sp"
android:textSize="@dimen/sp_9"
tools:text="8888"
android:layout_marginLeft="5dp" />
/>
<com.yizhuan.erban.avroom.widget.FixRoomTitleTextView
android:id="@+id/room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white_transparent_50"
android:textSize="9sp"
android:layout_marginStart="5dp"
tools:text="8888" />
</LinearLayout>
<TextView
android:id="@+id/tv_follow_room"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_23"
android:text="@string/collect"
android:textStyle="bold"
android:textSize="@dimen/sp_13"
android:textColor="@color/white"
android:layout_toEndOf="@+id/ll_title"
android:layout_marginStart="@dimen/dp_9"
android:gravity="center"
android:layout_marginTop="@dimen/dp_5"
android:background="@drawable/bg_room_follow_room"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
/>
<ImageView
android:id="@+id/room_more"
@@ -143,7 +164,7 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:scaleType="center"
android:src="@drawable/icon_room_share" />
android:src="@drawable/ic_share_white" />
<FrameLayout
android:id="@+id/container"

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

@@ -10,12 +10,12 @@
android:layout_height="40dp"
android:paddingStart="23dp"
android:paddingEnd="23dp"
android:background="@color/color_FAFAFA"/>
android:background="@color/white"/>
<android.support.v4.view.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FAFAFA" />
android:background="@color/white" />
</LinearLayout>

2
app/src/main/res/layout/fragment_dialog_room_title.xml
View File

@@ -41,7 +41,7 @@
android:id="@+id/tv_close"
android:layout_width="140dp"
android:layout_height="38dp"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/close"

2
app/src/main/res/layout/fragment_fans_list.xml
View File

@@ -2,7 +2,7 @@
<com.yizhuan.erban.common.widget.StatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_FAFAFA">
android:background="@color/white">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"

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

@@ -212,32 +212,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_user_name">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_user_official"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:scaleType="center"
android:src="@mipmap/ic_user_official_13dp"
android:visibility="@{userInfo.isOfficial ? View.VISIBLE : View.GONE}" />
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_user_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:scaleType="center"
android:src="@mipmap/ic_user_new_13dp"
android:visibility="@{userInfo.newUser ? View.VISIBLE : View.GONE}" />
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_good_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:scaleType="center"
android:src="@mipmap/ic_pretty_account_13dp"
android:visibility="@{userInfo.hasPrettyErbanNo ? View.VISIBLE : View.GONE}" />
<TextView
android:id="@+id/tv_user_id"
@@ -439,12 +414,39 @@
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/me_item_decoration_store"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
android:paddingEnd="15dp"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@mipmap/icon_decoration"
android:text="@string/menu_my_decoration"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:drawablePadding="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:drawableEnd="@drawable/arrow_right"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/me_item_wallet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:onClick="@{click}"
android:visibility="gone"
android:orientation="horizontal"
android:paddingEnd="15dp"
tools:ignore="UseCompoundDrawables">
@@ -513,31 +515,7 @@
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/me_item_decoration_store"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
android:paddingEnd="15dp"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@mipmap/icon_decoration"
android:text="@string/menu_my_decoration"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:drawablePadding="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:drawableEnd="@drawable/arrow_right"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
@@ -613,6 +591,39 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:layout_marginEnd="@dimen/dp_me_text_padding_to_icon"
android:background="#F5F5F5" />
<LinearLayout
android:id="@+id/me_item_certification"
android:layout_width="match_parent"
android:layout_height="55dp"
android:gravity="center_vertical"
android:onClick="@{click}"
android:orientation="horizontal"
android:paddingEnd="15dp"
tools:ignore="UseCompoundDrawables">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@mipmap/icon_certification"
android:text="@string/menu_certification"
android:layout_marginStart="@dimen/dp_me_text_padding_to_icon"
android:drawablePadding="@dimen/dp_me_text_padding_to_icon"
android:gravity="center_vertical"
android:drawableEnd="@drawable/arrow_right"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:textColor="@color/color_333333"
android:textSize="13sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"

2
app/src/main/res/layout/fragment_recent_contacts.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@android:color/transparent" />
android:cacheColorHint="@android:color/white" />
<LinearLayout
android:id="@+id/emptyBg"

2
app/src/main/res/layout/fragment_recent_list.xml
View File

@@ -15,7 +15,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_grab_apprentices"
android:background="@color/color_F6F7F9"
android:background="@color/white"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

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

@@ -11,7 +11,7 @@
android:layout_height="38dp"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:layout_marginEnd="@dimen/dp_18"
android:background="@drawable/bg_common_cancel"
android:textSize="15sp" />
@@ -22,7 +22,7 @@
android:layout_height="38dp"
android:gravity="center"
android:text="@string/text_ok"
android:textColor="@color/color_333333"
android:textColor="@color/white"
android:background="@drawable/bg_common_confirm"
android:textSize="15sp" />
</LinearLayout>

27
app/src/main/res/layout/item_attention_in_room.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/ll_attention_in_room"
android:layout_width="78dp"
android:layout_height="wrap_content"
@@ -12,8 +13,22 @@
android:layout_marginTop="14dp"
android:layout_width="50dp"
android:layout_height="50dp"
app:civ_border_color="@color/appColor"
app:civ_border_width="5dp"
tools:src="@drawable/default_avatar"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_11"
android:layout_marginTop="-9dp"
android:textColor="@color/white"
android:background="@drawable/bg_common_confirm_normal"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_5"
android:text="嗨聊中"/>
<TextView
android:id="@+id/tv_name_attention_in_room"
android:layout_width="wrap_content"
@@ -21,16 +36,10 @@
android:maxLength="3"
android:ellipsize="end"
android:layout_marginTop="3.5dp"
android:textColor="@color/color_333333"
android:textSize="11.82sp"
android:textColor="@color/color_666666"
android:textSize="@dimen/dp_11"
tools:text="喵买袄喵买袄"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="10.93sp"
android:layout_marginTop="3.5dp"
android:textColor="@color/color_b3b3b3"
android:text="嗨聊中"/>
</LinearLayout>

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

@@ -18,8 +18,9 @@
<TextView
android:id="@+id/tv_title"
tools:visibility="visible"
android:textSize="@dimen/sp_18"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_333333"
android:textStyle="bold"
tools:text="提示"
android:layout_gravity="center_horizontal"
android:singleLine="true"
@@ -37,7 +38,7 @@
android:layout_marginStart="39dp"
android:layout_marginEnd="39dp"
android:textColor="@color/color_333333"
android:textSize="15sp"
android:textSize="13sp"
android:layout_marginBottom="@dimen/dp_32"
android:gravity="center_horizontal"
tools:text="购买成功，是否立即驾驶sd水电费水电费？sfasdfasdfasdfasdfasdf" />

2
app/src/main/res/layout/layout_official_mask.xml
View File

@@ -27,7 +27,7 @@
android:layout_marginEnd="5.5dp"
android:gravity="center"
android:textColor="@color/white"
android:textSize="9.5dp"
android:textSize="8dp"
tools:text="金牌主持"
app:layout_constraintEnd_toEndOf="@id/iv_official_mask"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/layout_ok_cancel_dialog.xml
View File

@@ -37,7 +37,7 @@
android:layout_height="38dp"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bg_common_cancel"
android:textSize="15sp" />

2
app/src/main/res/layout/layout_pic_login_dialog.xml
View File

@@ -98,7 +98,7 @@
android:layout_height="38dp"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_333333"
android:textColor="@color/color_7154EE"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bg_common_cancel"
android:textSize="15sp" />

8
app/src/main/res/layout/list_item_friend_new.xml
View File

@@ -72,8 +72,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_user_level"
android:layout_width="34dp"
android:layout_height="14dp"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
app:layout_flexShrink="0"
@@ -83,8 +83,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="34dp"
android:layout_height="14dp"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="2dp"
android:scaleType="fitCenter"
android:visibility="gone"

38
app/src/main/res/layout/nim_recent_contact_list_item_new.xml
View File

@@ -79,8 +79,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_noble_level"
android:layout_width="38dp"
android:layout_height="15dp"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="5dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
@@ -88,8 +88,8 @@
<android.support.v7.widget.AppCompatImageView
android:id="@+id/iv_charm_level"
android:layout_width="38dp"
android:layout_height="15dp"
android:layout_width="@dimen/dp_19"
android:layout_height="@dimen/dp_19"
android:layout_marginEnd="5dp"
android:visibility="gone"
tools:src="@mipmap/ic_user_level"
@@ -112,7 +112,7 @@
android:gravity="center_vertical"
android:lines="1"
android:text=""
android:textColor="@color/color_B3B3B3"
android:textColor="@color/color_999999"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="我是内容" />
@@ -138,7 +138,7 @@
android:lines="1"
android:scrollHorizontally="true"
android:text=""
android:textColor="@color/color_B3B3B3"
android:textColor="@color/color_999999"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -147,30 +147,22 @@
</LinearLayout>
<LinearLayout
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:layout_marginEnd="15dp"
android:gravity="end"
android:orientation="vertical">
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_B3B3B3"
android:textSize="11dp"
tools:text="just now" />
<com.netease.nim.uikit.common.ui.draggablebubbles.BubbleView
android:id="@+id/unread_number_tip"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_18"
android:layout_marginTop="6dp"
android:singleLine="true"
android:visibility="gone"
tools:text="123"
android:layout_gravity="right"
tools:visibility="visible" />
<ImageView
@@ -182,6 +174,16 @@
tools:ignore="ContentDescription"
tools:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_B3B3B3"
android:layout_marginTop="2dp"
android:layout_gravity="center_vertical|right"
android:textSize="11dp"
tools:text="just now" />
</FrameLayout>
</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/icon_certification.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@@ -97,6 +97,7 @@
<string name="menu_my_gold_charge">金币/充值</string>
<string name="menu_my_auction">竞拍记录</string>
<string name="menu_setting">设置</string>
<string name="menu_certification">实名认证</string>
<string name="room_offline">房主已下线</string>
<string name="root_offline_notice">更多好玩的房间在66星球等您哟！去看看！</string>
@@ -872,6 +873,7 @@
<string name="str_nick_title">昵称：</string>
<string name="recommend_topic">推荐话题</string>
<string name="join_topic">参与话题</string>
<string name="collect">收藏</string>
</resources>

1
app/src/model_customer_server/res/layout/activity_login_code.xml
View File

@@ -54,6 +54,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_desc"
android:layout_marginTop="30dp"
android:focusable="true"
app:strokeHeight="@dimen/dp_45"
app:strokeLength="5"
app:strokePadding="@dimen/dp_10"

1
app/src/model_customer_server/res/layout/activity_login_phone.xml
View File

@@ -62,6 +62,7 @@
android:paddingTop="@dimen/dp_15"
android:textColor="@color/white"
android:background="@null"
android:focusable="true"
android:textSize="@dimen/dp_15"
android:text=""
tools:ignore="SpUsage" />

8
app/src/module_bank_card/res/layout/item_nameplate_normal.xml
View File

@@ -18,7 +18,9 @@
<ImageView
android:id="@+id/iv_nameplate_cover"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:scaleType="centerInside"
/>
<ImageView
android:id="@+id/iv_tag"
@@ -62,9 +64,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@id/ll_nameplate_cover"
android:layout_alignBottom="@+id/ll_nameplate_cover"
android:layout_marginStart="10dp"
android:layout_marginTop="24dp"
android:layout_marginTop="10dp"
android:layout_below="@id/tv_nameplate_name"
android:drawableStart="@drawable/ic_time_left"
android:gravity="center"
android:maxLines="1"

96
app/src/module_bank_card/res/layout/item_room_collection.xml Normal file
View File

@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white">
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/rriv_room_img"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:layout_marginStart="15dp"
tools:src="@drawable/default_avatar"
app:type="round"
app:borderRadius="12dp"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<LinearLayout
android:id="@+id/ll_room_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/rriv_room_img"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_13"
>
<TextView
android:id="@+id/tv_room_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_15"
android:textColor="@color/color_333333"
tools:text="Sh.一笑倾城大熊熊"
/>
<TextView
android:id="@+id/tv_room_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_13"
tools:text="ID:8695"
android:layout_marginTop="@dimen/dp_4"
/>
</LinearLayout>
<TextView
android:id="@+id/tv_room_online_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="75"
android:textColor="@color/appColor"
android:textSize="@dimen/sp_15"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/tv_play"
app:layout_constraintTop_toTopOf="@id/tv_play"
app:layout_constraintBottom_toBottomOf="@id/tv_play"
android:layout_marginEnd="@dimen/dp_5"
/>
<TextView
android:id="@+id/tv_play"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="人在玩"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_12"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="@id/ll_room_info"
android:layout_marginEnd="@dimen/dp_15"
/>
<View
android:layout_width="wrap_content"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
android:layout_marginTop="@dimen/dp_11"
app:layout_constraintTop_toBottomOf="@id/rriv_room_img"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/ll_room_info"
android:layout_marginEnd="@dimen/dp_15"
/>
</android.support.constraint.ConstraintLayout>

28
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -338,7 +338,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
}
private View inOfficialMask;
private void initHeaderView() {
mHeaderView = LayoutInflater.from(this).inflate(R.layout.head_dynamic_detail, null);
@@ -362,29 +361,9 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
tvMiniWorldName = mHeaderView.findViewById(R.id.tv_mini_world_name);
viewLineDetailHeader.setVisibility(View.VISIBLE);
inOfficialMask = mHeaderView.findViewById(R.id.in_official_mask);
}
private void setOfficialMask(String name, String icon) {
if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(icon)) {
inOfficialMask.setVisibility(View.VISIBLE);
TextView tvOfficialMask;
tvOfficialMask = inOfficialMask.findViewById(R.id.tv_official_mask);
if (tvOfficialMask != null) {
tvOfficialMask.setText(name);
}
ImageView ivOfficialMask;
ivOfficialMask = inOfficialMask.findViewById(R.id.iv_official_mask);
if (ivOfficialMask != null) {
NobleUtil.loadResource(icon, ivOfficialMask);
}
} else {
inOfficialMask.setVisibility(View.GONE);
}
}
private void resetTvCommentCountTop(int topDp) {
if (tvCommentCount == null) {
@@ -756,11 +735,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
});
UserInfo.NamePlate namePlate = info.getNameplate();
if (namePlate != null) {
setOfficialMask(namePlate.getFixedWord(), namePlate.getIconPic());
} else {
setOfficialMask(null, null);
}
tvTime.setText(TimeUiUtils.getDynamicUi(bean.getPublishTime()));
etvContent.setVisibility(View.GONE);
@@ -813,7 +787,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
tvFlagMiniWorld.setVisibility(bean.isInWorld() ? View.GONE : View.GONE);
layoutRootMiniWorld.setOnClickListener(v -> {
tvMiniWorldName.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_VIEW_WORLD_PAGE,
"进入小世界客态页:动态详情");
TopicMainActivity.start(context, String.valueOf(bean.getWorldId()));

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

@@ -259,6 +259,9 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
public void afterTextChanged(Editable s) {
tvInputLimit.setText(s.length() + "/500");
updatePublishStatus();
String inputText = s.toString().trim();
tvPublish.setTextColor(!TextUtils.isEmpty(inputText) ? getResources().getColor(R.color.color_7154EE):getResources().getColor(R.color.color_999999));
tvPublish.setEnabled(!TextUtils.isEmpty(inputText));
}
});
}
@@ -440,7 +443,7 @@ public class PublishActivity extends BaseMvpActivity<IPublishView, PublishPresen
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_GIVE_UP,
"已编辑内容中途返回");
getDialogManager().showOkCancelWithTitleDialog("提示", "还没发布诶~确定要返回吗?",
"手滑了", "忍痛取消", new DialogManager.OkCancelDialogListener() {
"手滑了", "确认返回", new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {

20
app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
View File

@@ -123,6 +123,15 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
return fragment;
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
mView = inflater.inflate(R.layout.fragment_square_dynamic, container, false);
unbinder = ButterKnife.bind(this, mView);
EventBus.getDefault().register(this);
return mView;
}
@Override
public void onFindViews() {
@@ -211,7 +220,7 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
"分享动态-区分-动态广场");
new ShareDynamicHelper(getActivity()).share(bean);
} else if (view.getId() == R.id.iv_in_room){
openRoom(bean.getInRoomId());
openRoom(bean.getUid());
}
});
@@ -475,14 +484,7 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
mView = inflater.inflate(R.layout.fragment_square_dynamic, container, false);
unbinder = ButterKnife.bind(this, mView);
EventBus.getDefault().register(this);
return mView;
}
@Override
public int getRootLayoutId() {

2
app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java
View File

@@ -203,7 +203,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
//小世界
helper.setGone(R.id.layout_root_mini_world, item.getWorldId() > 0);
helper.setText(R.id.tv_mini_world_name,"#" + item.getWorldName());
helper.getView(R.id.layout_root_mini_world).setOnClickListener(new View.OnClickListener() {
helper.getView(R.id.ll_miniworld).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_VIEW_WORLD_PAGE,

3
app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
View File

@@ -100,7 +100,8 @@ public class DynamicNickDetailWidget extends ShapeConstrainLayout {
ImageView ivOfficialMask = inOfficialMask.findViewById(R.id.iv_official_mask);
if (ivOfficialMask != null) {
NobleUtil.loadResource(info.getNameplatePic(), ivOfficialMask);
// NobleUtil.loadResource(info.getNameplatePic(), ivOfficialMask);
GlideApp.with(context).load(info.getNameplatePic()).into(ivOfficialMask);
}
} else {
inOfficialMask.setVisibility(View.GONE);

3
app/src/module_community/res/layout/activity_publish.xml
View File

@@ -24,9 +24,8 @@
android:gravity="center"
android:maxLength="500"
android:text="@string/dy_publish"
android:textColor="@color/color_7154EE"
android:textColor="@color/color_999999"
android:textSize="@dimen/sp_13"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/title_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/title_bar" />

23
app/src/module_community/res/layout/head_dynamic_detail.xml
View File

@@ -36,33 +36,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
app:layout_constraintBottom_toTopOf="@+id/container_mask_time"
app:layout_constraintStart_toEndOf="@id/iv_head_wear"
app:layout_constraintTop_toTopOf="@id/iv_head_wear"
app:layout_constraintVertical_chainStyle="packed" />
<LinearLayout
android:id="@+id/container_mask_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/iv_head_wear"
app:layout_constraintStart_toStartOf="@id/widget_nick_detail"
app:layout_constraintTop_toBottomOf="@id/widget_nick_detail" >
<include
android:id="@+id/in_official_mask"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_15"
android:layout_marginEnd="6.5dp"
android:visibility="gone"
tools:visibility="visible"
layout="@layout/layout_official_mask" />
</LinearLayout>
<!--<TextView-->
<!--android:id="@+id/tv_time"-->
<!--android:layout_width="wrap_content"-->

41
app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
View File

@@ -79,7 +79,7 @@
android:gravity="center_vertical"
android:lines="1"
android:text=""
android:textColor="@color/color_B3B3B3"
android:textColor="@color/color_999999"
android:textSize="12dp"
tools:ignore="SpUsage"
tools:text="我是内容" />
@@ -109,24 +109,14 @@
tools:ignore="SpUsage" />
</LinearLayout>
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="15dp"
android:layout_marginTop="16dip"
android:textColor="@color/color_B3B3B3"
tools:text=" 晚上 06:00"
android:textSize="11dp" />
<TextView
android:id="@+id/tv_nickname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/center_view"
android:layout_toLeftOf="@+id/tv_date_time"
android:layout_toStartOf="@+id/tv_date_time"
android:layout_toEndOf="@id/rl_user_avatar"
android:layout_marginStart="10dp"
android:ellipsize="end"
@@ -147,9 +137,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/tv_nickname"
android:layout_alignParentTop="true"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:layout_marginTop="16dip"
android:gravity="center"
android:singleLine="true"
android:textColor="@android:color/white"
@@ -159,6 +149,18 @@
tools:text="123"
/>
<TextView
android:id="@+id/tv_date_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/tv_nickname"
android:layout_marginEnd="15dp"
android:layout_marginTop="10dp"
android:textColor="@color/color_999999"
tools:text=" 晚上 06:00"
android:textSize="12dp" />
<ImageView
android:layout_toEndOf="@+id/unread_number_tip"
@@ -182,4 +184,13 @@
android:layout_marginEnd="15dp"
android:gravity="center"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/color_F4F4F4"
android:layout_alignParentBottom="true"
android:layout_alignStart="@+id/content_layout"
android:layout_alignEnd="@+id/tv_date_time"
/>
</RelativeLayout>

3
app/src/module_quick_pass/java/com/yizhuan/erban/quick_pass/QuickPassLoginAct.java
View File

@@ -169,7 +169,8 @@ public class QuickPassLoginAct extends BaseLoginAct implements View.OnClickListe
toast("一键登录失败，请使用其他方式登录");
LogUtil.e("QuickPassLogin", msg);
getDialogManager().dismissDialog();
LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
//跳转到手机登录页
// LoginPhoneActivity.startForResult(QuickPassLoginAct.this, quickPassRequestCode);
}
});
}

7
core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java
View File

@@ -1,24 +1,17 @@
package com.yizhuan.xchat_android_core.decoration.nameplate;
import android.util.Log;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.base.BaseModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel;
import com.yizhuan.xchat_android_core.decoration.headwear.IHeadwearModel;
import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import java.util.List;
import io.reactivex.Single;
import io.reactivex.SingleSource;
import io.reactivex.functions.Function;
import retrofit2.http.GET;
import retrofit2.http.POST;
import retrofit2.http.Query;

2
nim_uikit/res/layout/nim_recent_contacts.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@android:color/transparent"
android:cacheColorHint="@android:color/white"
/>
<RelativeLayout