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

UI修改:1.房间设置相关 2.房间在线列表 3.房间邀请上麦

Browse Source
This commit is contained in:
huangjian
2021-03-31 15:54:54 +08:00
parent d0d8fd2cb4
commit 1d9d53e9d9
19 changed files with 238 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/common/res/drawable/bg_secondary_radius_5.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"
android:shape="rectangle">
<corners android:radius="5dp"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
</shape>

292
app/src/main/java/com/yizhuan/erban/avroom/activity/OpenRoomActivity.java
View File

@@ -1,292 +0,0 @@
package com.yizhuan.erban.avroom.activity;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import com.jph.takephoto.app.TakePhotoActivity;
import com.jph.takephoto.compress.CompressConfig;
import com.jph.takephoto.model.TResult;
import com.netease.nim.uikit.common.util.string.StringUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.permission.PermissionActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.file.FileModel;
import com.yizhuan.xchat_android_core.room.IRoomCoreClient;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_library.coremanager.CoreEvent;
import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* Created by zhouxiangfeng on 2017/6/1.
*/
@Deprecated
public class OpenRoomActivity extends TakePhotoActivity implements View.OnClickListener {
private static final String TAG = "OpenRoomActivity";
/**
* 基本权限管理
*/
private final String[] BASIC_PERMISSIONS = new String[]{
Manifest.permission.CAMERA,
Manifest.permission.RECORD_AUDIO
};
// Content View Elements
private ImageView mIv_close;
private ImageView mIv_cover;
private EditText mEt_title;
private EditText mEt_noti;
private TextView pageTitle;
private Button mBtn_open_room;
private String roomCoverUrl;
private int type;
//开启竞拍房
public static void startAuction(Context context) {
Intent intent = new Intent(context, OpenRoomActivity.class);
intent.putExtra("type", RoomInfo.ROOMTYPE_AUCTION);
context.startActivity(intent);
}
//开启轻聊房
public static void startHomeParty(Context context) {
Intent intent = new Intent(context, OpenRoomActivity.class);
intent.putExtra("type", RoomInfo.ROOMTYPE_LIGHT_CHAT);
context.startActivity(intent);
}
//开启游戏房
public static void startGame(Context context) {
Intent intent = new Intent(context, OpenRoomActivity.class);
intent.putExtra("type", RoomInfo.ROOMTYPE_HOME_PARTY);
context.startActivity(intent);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_open_room);
bindViews();
onSetListener();
init();
}
private void init() {
type = getIntent().getIntExtra("type", 0);
if (type == RoomInfo.ROOMTYPE_AUCTION) {
pageTitle.setText("竞拍房");
} else if (type == RoomInfo.ROOMTYPE_LIGHT_CHAT) {
pageTitle.setText("轻聊房");
} else if (type == RoomInfo.ROOMTYPE_HOME_PARTY) {
pageTitle.setText("轰趴房");
}
}
private void onSetListener() {
mBtn_open_room.setOnClickListener(this);
mIv_close.setOnClickListener(this);
mIv_cover.setOnClickListener(this);
}
// End Of Content View Elements
private void bindViews() {
mIv_close = (ImageView) findViewById(R.id.iv_close);
mIv_cover = (ImageView) findViewById(R.id.iv_cover);
mEt_title = (EditText) findViewById(R.id.et_title);
mEt_noti = (EditText) findViewById(R.id.et_noti);
mBtn_open_room = (Button) findViewById(R.id.btn_open_room);
pageTitle = (TextView) findViewById(R.id.title);
}
private void checkPermissionAndStartCamera() {
//低版本授权检查
checkPermission(checkPermissionListener, R.string.ask_camera, Manifest.permission.CAMERA);
// checkPermission(checkPermissionListener, R.string.ask_again, android.Manifest.permission.CAMERA);
}
PermissionActivity.CheckPermListener checkPermissionListener = new PermissionActivity.CheckPermListener() {
@Override
public void superPermission() {
takePhoto();
}
};
private void takePhoto() {
File cameraOutFile = JXFileUtils.getTempFile(this, "picture_" + System.currentTimeMillis() + ".jpg");
if (!cameraOutFile.getParentFile().exists()) {
cameraOutFile.getParentFile().mkdirs();
}
Uri uri = Uri.fromFile(cameraOutFile);
CompressConfig compressConfig = new CompressConfig.Builder().create();
getTakePhoto().onEnableCompress(compressConfig, false);
getTakePhoto().onPickFromCapture(uri);
}
/**
* 开房权限检查
*/
PermissionActivity.CheckPermListener loginCheckPermissionListener = new PermissionActivity.CheckPermListener() {
@SuppressLint("CheckResult")
@Override
public void superPermission() {
getDialogManager().showProgressDialog(OpenRoomActivity.this, "进入房间...");
AvRoomModel.get().openRoom(
AuthModel.get().getCurrentUid(), type,
mEt_title.getText().toString(), mEt_noti.getText().toString(),
roomCoverUrl, null)
.compose(bindToLifecycle())
.subscribe((roomResult, throwable) -> {
if (throwable != null) {
onOpenRoomFail(throwable.getMessage());
} else if (roomResult != null && roomResult.isSuccess()) {
onOpenRoom(roomResult.getData());
} else if (roomResult != null && !roomResult.isSuccess()) {
if (roomResult.getCode() == 1500) {
onAlreadyOpenedRoom();
} else {
onOpenRoomFail(roomResult.getError());
}
} else {
onOpenRoomFail("未知错误");
}
});
}
};
@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.btn_open_room:
checkPermission(loginCheckPermissionListener, R.string.ask_again, Manifest.permission.RECORD_AUDIO);
break;
case R.id.iv_close:
finish();
break;
case R.id.iv_cover:
ButtonItem upItem = new ButtonItem("拍照上传", new ButtonItem.OnClickListener() {
@Override
public void onClick() {
checkPermissionAndStartCamera();
}
});
ButtonItem localItem = new ButtonItem("本地相册", new ButtonItem.OnClickListener() {
@Override
public void onClick() {
CompressConfig compressConfig = new CompressConfig.Builder().create();
getTakePhoto().onEnableCompress(compressConfig, true);
getTakePhoto().onPickFromGallery();
}
});
List<ButtonItem> buttonItemList = new ArrayList<>();
buttonItemList.add(upItem);
buttonItemList.add(localItem);
getDialogManager().showCommonPopupDialog(buttonItemList, "取消", false);
break;
default:
}
}
@CoreEvent(coreClientClass = IRoomCoreClient.class)
public void onGetRoomInfo(RoomInfo roomInfo) {
getDialogManager().dismissDialog();
mEt_title.setText(roomInfo.getTitle());
mEt_noti.setText(roomInfo.getRoomDesc());
if (!StringUtil.isEmpty(roomInfo.getBackPic())) {
roomCoverUrl = roomInfo.getBackPic();
ImageLoadUtils.loadAvatar(this, roomCoverUrl, mIv_cover);
}
}
@CoreEvent(coreClientClass = IRoomCoreClient.class)
public void onGetRoomInfoFail(String error) {
getDialogManager().dismissDialog();
}
public void onOpenRoom(RoomInfo roomInfo) {
getDialogManager().dismissDialog();
AVRoomActivity.start(this, roomInfo.getUid());
finish();
}
public void onOpenRoomFail(String error) {
toast(error);
getDialogManager().dismissDialog();
}
@CoreEvent(coreClientClass = IRoomCoreClient.class)
public void onAlreadyOpenedRoom() {
getDialogManager().showOkCancelDialog("您的房间已开启，是否立即进入？", true, new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
}
@Override
public void onOk() {
long uid = AuthModel.get().getCurrentUid();
AVRoomActivity.start(OpenRoomActivity.this, uid);
finish();
}
});
}
public void onUpload(String url) {
roomCoverUrl = url;
Log.d(TAG, "onUpload: 这是开房间的上传");
// Glide.with(OpenRoomActivity.this).load(roomCoverUrl).into(mIv_cover);
ImageLoadUtils.loadImage(this, roomCoverUrl, mIv_cover, 0);
getDialogManager().dismissDialog();
}
public void onUploadFail() {
toast("上传失败");
getDialogManager().dismissDialog();
}
@SuppressLint("CheckResult")
@Override
public void takeSuccess(TResult result) {
getDialogManager().showProgressDialog(OpenRoomActivity.this, "正在上传请稍后...");
FileModel.get()
.uploadFile(result.getImage().getCompressPath())
.compose(bindToLifecycle())
.subscribe((url, throwable) -> {
if (throwable != null) {
onUploadFail();
} else {
onUpload(url);
}
});
}
@Override
public void takeFail(TResult result, String msg) {
toast(msg);
}
@Override
public void takeCancel() {
}
}

14
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomBlackListActivity.java
View File

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
@@ -57,7 +58,7 @@ public class RoomBlackListActivity extends BaseMvpActivity<IRoomBlackView, RoomB
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_room_black_list);
initTitleBar("黑名单");
initWhiteTitleBar("黑名单");
initView();
showLoading();
@@ -189,4 +190,15 @@ public class RoomBlackListActivity extends BaseMvpActivity<IRoomBlackView, RoomB
public void makeBlackListFail(int code, String error, boolean mark) {
// toast("操作失败，请重试");
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

20
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomInviteActivity.java
View File

@@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
@@ -55,10 +56,10 @@ public class RoomInviteActivity extends BaseMvpActivity<IRoomInviteView, RoomInv
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_room_invite);
mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
mRefreshLayout = (SmartRefreshLayout) findViewById(R.id.refresh_layout);
mRecyclerView = findViewById(R.id.recycler_view);
mRefreshLayout = findViewById(R.id.refresh_layout);
onlyManager = getIntent().getBooleanExtra("only_manager", false);
initTitleBar(onlyManager ? "在线房主/管理员" : getString(R.string.title_online));
initWhiteTitleBar(onlyManager ? "在线房主/管理员" : getString(R.string.title_online));
Intent intent = getIntent();
if (intent != null)
micPosition = intent.getIntExtra(Constants.KEY_POSITION, Integer.MIN_VALUE);
@@ -151,7 +152,7 @@ public class RoomInviteActivity extends BaseMvpActivity<IRoomInviteView, RoomInv
if (chatRoomMember == null) return;
boolean isRobot = true;
Map<String, Object> extension = (Map<String, Object>) chatRoomMember.getExtension();
Map<String, Object> extension = chatRoomMember.getExtension();
if (extension != null) {
Map<String, Object> map = (Map<String, Object>) extension.get(chatRoomMember.getAccount());
if (map != null) {
@@ -198,4 +199,15 @@ public class RoomInviteActivity extends BaseMvpActivity<IRoomInviteView, RoomInv
mRoomInviteAdapter.onRelease();
super.onDestroy();
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

14
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomManagerListActivity.java
View File

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomNormalListAdapter;
@@ -46,9 +47,8 @@ public class RoomManagerListActivity extends BaseMvpActivity<IRoomManagerView, R
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_room_manager_list);
initTitleBar("管理员");
initWhiteTitleBar("管理员");
initView();
showLoading();
loadData();
}
@@ -144,4 +144,14 @@ public class RoomManagerListActivity extends BaseMvpActivity<IRoomManagerView, R
public void markManagerListFail(int code, String error) {
// toast("操作失败，请重试");
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

27
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomOnlineUserActivity.java
View File

@@ -2,12 +2,11 @@ package com.yizhuan.erban.avroom.activity;
import android.content.Context;
import android.content.Intent;
import androidx.appcompat.app.AppCompatActivity;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.fragment.OnlineUserFragment;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.databinding.ActivityRoomOnlineUserBinding;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
@@ -25,7 +24,7 @@ public class RoomOnlineUserActivity extends BaseBindingActivity<ActivityRoomOnli
@Override
protected void init() {
initTitleBar("在线列表");
initWhiteTitleBar("在线列表");
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
AVRoomActivity.setBackBg(this, roomInfo, mBinding.svgaImageViewBg, bgPicture, mBinding.view);
getSupportFragmentManager().beginTransaction()
@@ -35,18 +34,6 @@ public class RoomOnlineUserActivity extends BaseBindingActivity<ActivityRoomOnli
.commitAllowingStateLoss();
}
public void initTitleBar(String title) {
mTitleBar = (TitleBar) findViewById(R.id.title_bar);
if (mTitleBar != null) {
mTitleBar.setTitle(title);
mTitleBar.setImmersive(false);
mTitleBar.setTitleColor(getResources().getColor(R.color.white));
mTitleBar.setLeftImageResource(R.drawable.arrow_left_white);
mTitleBar.setLeftClickListener(v -> onLeftClickListener());
mTitleBar.setCommonBackgroundColor(getResources().getColor(R.color.transparent));
}
}
@Override
protected void onDestroy() {
super.onDestroy();
@@ -54,4 +41,14 @@ public class RoomOnlineUserActivity extends BaseBindingActivity<ActivityRoomOnli
mBinding.svgaImageViewBg.clearAnimation();
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

41
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomSettingActivity.java
View File

@@ -1,5 +1,6 @@
package com.yizhuan.erban.avroom.activity;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import androidx.databinding.DataBindingUtil;
@@ -13,6 +14,7 @@ import android.widget.EditText;
import android.widget.RelativeLayout;
import com.donkingliang.labels.LabelsView;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -72,7 +74,6 @@ import io.reactivex.disposables.Disposable;
public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomSettingPresenter>
implements LabelsView.OnLabelClickListener, View.OnClickListener, IRoomSettingView {
private EditText pwdEdit;
private LabelsView labelsView;
private List<String> labels;
private String selectLabel;
@@ -93,20 +94,14 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
context.startActivity(intent);
}
@SuppressLint("CheckResult")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
binding = DataBindingUtil.setContentView(this,R.layout.activity_room_setting);
initTitleBar(getString(R.string.room_setting));
initWhiteTitleBar(getString(R.string.room_setting));
binding.setClick(this);
EventBus.getDefault().register(this);
// TitleBar titleBar = (TitleBar) findViewById(R.id.title_bar);
// titleBar.addAction(new TitleBar.TextAction(getString(R.string.save)) {
// @Override
// public void performAction(View view) {
// save(null);
// }
// });
roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo == null) {
toast("房间信息为空");
@@ -140,22 +135,10 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
EventBus.getDefault().unregister(this);
}
/**
* 隐藏虚拟键盘
*/
public void hideKeyboard(View v) {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null && imm.isActive()) {
imm.hideSoftInputFromWindow(v.getApplicationWindowToken(), 0);
}
}
private void initView() {
pwdEdit = (EditText) findViewById(R.id.pwd_edit);
managerLayout = (RelativeLayout) findViewById(R.id.manager_layout);
blackLayout = (RelativeLayout) findViewById(R.id.black_layout);
mRoomBgLayout = (RelativeLayout) findViewById(R.id.room_bg_layout);
managerLayout = findViewById(R.id.manager_layout);
blackLayout = findViewById(R.id.black_layout);
mRoomBgLayout = findViewById(R.id.room_bg_layout);
managerLayout.setOnClickListener(this);
blackLayout.setOnClickListener(this);
@@ -799,4 +782,14 @@ public class RoomSettingActivity extends BaseMvpActivity<IRoomSettingView, RoomS
default:
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

13
app/src/main/java/com/yizhuan/erban/avroom/activity/RoomTitleEditActivity.java
View File

@@ -9,6 +9,7 @@ import android.text.TextWatcher;
import android.view.View;
import android.widget.Toast;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
@@ -76,7 +77,7 @@ public class RoomTitleEditActivity extends BaseBindingActivity<ActivityRoomTitle
@Override
protected void init() {
initTitleBar(getResources().getString(R.string.title_room_title_edit));
initWhiteTitleBar(getResources().getString(R.string.title_room_title_edit));
mBinding.setClick(this);
mBinding.etTitle.addTextChangedListener(mTitleWatcher);
mBinding.etDesc.addTextChangedListener(mDescWatcher);
@@ -171,4 +172,14 @@ public class RoomTitleEditActivity extends BaseBindingActivity<ActivityRoomTitle
mDialogManager.dismissDialog();
mDisposable.clear();
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
}

11
app/src/main/java/com/yizhuan/erban/avroom/adapter/OnlineUserAdapter.java
View File

@@ -138,17 +138,6 @@ public class OnlineUserAdapter extends BaseMultiItemQuickAdapter<OnlineChatMembe
nobleAvatarView.setSize(37, 54, 0);
nobleAvatarView.setData(onlineChatMember.chatRoomMember);
View container = baseViewHolder.getView(R.id.container);
int position = baseViewHolder.getLayoutPosition();
TextView nick = baseViewHolder.getView(R.id.nick);
if (mIsHomeParty) {
nick.setTextColor(Color.WHITE);
//container.setBackgroundColor(position % 2 == 0 ? Color.parseColor("#05FFFFFF") : 0);
} else {
nick.setTextColor(ContextCompat.getColor(mContext, R.color.color_333333));
container.setBackgroundResource(R.drawable.bg_common_touch_while);
}
// 官字
baseViewHolder.getView(R.id.iv_user_official).setVisibility(onlineChatMember.isOfficial() ? View.VISIBLE : View.GONE);
//经验等级

254
app/src/main/java/com/yizhuan/erban/ui/widget/RoomTypeSelectDialog.java
View File

@@ -1,254 +0,0 @@
package com.yizhuan.erban.ui.widget;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.avroom.activity.OpenRoomActivity;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import io.reactivex.disposables.CompositeDisposable;
import static com.yizhuan.xchat_android_core.user.bean.UserInfo.USER_TYPE_OFFICIAL;
/**
* 打开房间类型dialog
*
* @author chenran
* @date 2017/8/3
*/
@Deprecated
public class RoomTypeSelectDialog extends Dialog implements View.OnClickListener {
private Context context;
private int roomType;
private CompositeDisposable disposable;
public RoomTypeSelectDialog(Context context, boolean cancelable,
OnCancelListener cancelListener) {
super(context, cancelable, cancelListener);
// TODO Auto-generated constructor stub
this.context = context;
}
public RoomTypeSelectDialog(Context context) {
super(context, R.style.BottomSelectDialogNotTransparent);
this.context = context;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.dialog_bottom_type_select);
findViewById(R.id.open_chat_light_layout).setOnClickListener(this);
findViewById(R.id.open_auction_layout).setOnClickListener(this);
findViewById(R.id.open_home_party_layout).setOnClickListener(this);
findViewById(R.id.close_image).setOnClickListener(this);
setDialogShowAttributes(getContext(), this);
}
public static void setDialogShowAttributes(Context context, Dialog dialog) {
WindowManager winManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
int mScreenWidth = winManager.getDefaultDisplay().getWidth();
Window mWindow = dialog.getWindow();
mWindow.getDecorView().setPadding(0, 0, 0, 0);
WindowManager.LayoutParams Params = mWindow.getAttributes();
Params.windowAnimations = R.style.bottom_dialog_anim_style;
Params.width = WindowManager.LayoutParams.MATCH_PARENT;
Params.height = WindowManager.LayoutParams.WRAP_CONTENT;
mWindow.setAttributes(Params);
mWindow.setGravity(Gravity.BOTTOM);
}
@Override
public void onClick(View v) {
String waitingText = context.getString(R.string.waiting_text);
switch (v.getId()) {
case R.id.open_auction_layout:
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null) {
if (userInfo.getDefUser() == USER_TYPE_OFFICIAL) {
((BaseMvpActivity) context).getDialogManager().showProgressDialog(context, waitingText);
roomType = RoomInfo.ROOMTYPE_AUCTION;
requestRoomInfo();
} else {
((BaseMvpActivity) context).toast("您暂无权限开竞拍房");
}
}
break;
case R.id.open_home_party_layout:
((BaseMvpActivity) context).getDialogManager().showProgressDialog(context, waitingText);
roomType = RoomInfo.ROOMTYPE_HOME_PARTY;
requestRoomInfo();
break;
case R.id.open_chat_light_layout:
roomType = RoomInfo.ROOMTYPE_LIGHT_CHAT;
((BaseMvpActivity) context).getDialogManager().showProgressDialog(context, waitingText);
requestRoomInfo();
break;
case R.id.close_image:
dismiss();
break;
default:
}
}
private void requestRoomInfo() {
AvRoomModel.get()
.requestRoomInfoFromService(String.valueOf(AuthModel.get().getCurrentUid()),
new CallBack<RoomInfo>() {
@Override
public void onSuccess(RoomInfo data) {
onGetRoomInfo(data);
}
@Override
public void onFail(int code, String error) {
onGetRoomInfoFail(error);
}
});
}
private void openRoom() {
if (roomType == RoomInfo.ROOMTYPE_HOME_PARTY) {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
disposable.add(AvRoomModel.get().openRoom(
userInfo.getUid(), roomType, null, null, null, null)
.subscribe((roomResult, throwable) -> {
if (throwable != null) {
onOpenRoomFail(throwable.getMessage());
} else if (roomResult != null && roomResult.isSuccess()) {
onOpenRoom(roomResult.getData());
} else if (roomResult != null && !roomResult.isSuccess()) {
if (roomResult.getCode() == 1500) {
onAlreadyOpenedRoom();
} else {
onOpenRoomFail(roomResult.getError());
}
} else {
onOpenRoomFail("未知错误");
}
})
);
} else if (roomType == RoomInfo.ROOMTYPE_AUCTION) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
OpenRoomActivity.startAuction(context);
dismiss();
} else {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
OpenRoomActivity.startHomeParty(context);
dismiss();
}
}
@Override
public void onDetachedFromWindow() {
super.onDetachedFromWindow();
context = null;
if (disposable != null && !disposable.isDisposed()) {
disposable.dispose();
}
}
private void onGetRoomInfo(RoomInfo roomInfo) {
if (roomInfo != null) {
if (roomInfo.isValid()) {
if (roomInfo.getType() != roomType) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
String roomName = "";
if (roomInfo.getType() == RoomInfo.ROOMTYPE_AUCTION) {
roomName = "竞拍房";
} else if (roomInfo.getType() == RoomInfo.ROOMTYPE_HOME_PARTY) {
roomName = "轰趴房";
} else {
roomName = "轻聊房";
}
((BaseMvpActivity) context).getDialogManager().showOkCancelDialog(
"当前正在" + roomName + "中，是否关闭当前房间？", true,
new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
}
@Override
public void onOk() {
((BaseMvpActivity) context).getDialogManager().showProgressDialog(context, "请稍后...");
quitRoomForOurService();
}
});
} else {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
AVRoomActivity.start(context, roomInfo.getUid());
dismiss();
}
} else {
openRoom();
}
} else {
openRoom();
}
}
private void quitRoomForOurService() {
AvRoomModel.get()
.quitRoomForOurService(new CallBack<String>() {
@Override
public void onSuccess(String data) {
onCloseRoomInfo();
}
@Override
public void onFail(int code, String error) {
onCloseRoomInfoFail(error);
}
});
}
private void onGetRoomInfoFail(String error) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
((BaseMvpActivity) context).toast(error);
}
private void onCloseRoomInfo() {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
openRoom();
}
private void onCloseRoomInfoFail(String error) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
((BaseMvpActivity) context).toast(error);
}
private void onOpenRoom(RoomInfo roomInfo) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
AVRoomActivity.start(context, roomInfo.getUid());
dismiss();
}
private void onOpenRoomFail(String error) {
((BaseMvpActivity) context).getDialogManager().dismissDialog();
((BaseMvpActivity) context).toast(error);
}
private void onAlreadyOpenedRoom() {
((BaseMvpActivity) context).getDialogManager().showProgressDialog(context, "请稍后...");
quitRoomForOurService();
}
}

16
app/src/main/res/layout/activity_room_black_list.xml
View File

@@ -2,13 +2,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" />
<TextView
@@ -16,17 +17,16 @@
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_centerVertical="true"
android:background="@color/color_F5F5F5"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:visibility="gone"
android:textColor="@color/text_color_secondary"
android:textSize="14dp" />
android:textColor="@color/text_secondary_4f516a"
android:textSize="14dp"
android:visibility="gone" />
<com.yizhuan.erban.common.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"

12
app/src/main/res/layout/activity_room_invite.xml
View File

@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/common_toolbar_height" />
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" />
<com.yizhuan.erban.common.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="54dp">
>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
@@ -32,4 +32,4 @@
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</com.yizhuan.erban.common.widget.StatusLayout>
</merge>
</LinearLayout>

7
app/src/main/res/layout/activity_room_manager_list.xml
View File

@@ -2,11 +2,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="@dimen/dp_25"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -18,9 +19,9 @@
android:layout_height="44dp"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:background="@color/color_F5F5F5"
android:background="@color/bg_secondary_2a2a39"
android:paddingLeft="15dp"
android:textColor="@color/text_color_secondary"
android:textColor="@color/text_secondary_4f516a"
android:textSize="14dp" />
<com.yizhuan.erban.common.widget.StatusLayout

1
app/src/main/res/layout/activity_room_online_user.xml
View File

@@ -27,6 +27,7 @@
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="@dimen/dp_25"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout

114
app/src/main/res/layout/activity_room_setting.xml
View File

@@ -10,22 +10,22 @@
type="android.view.View.OnClickListener" />
</data>
<RelativeLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/bg_normal_1c1b22">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/block_color"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white" />
android:layout_marginTop="@dimen/dp_25" />
<ScrollView
android:layout_width="match_parent"
@@ -34,14 +34,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/layout_room_name_edit"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white"
android:onClick="@{click}">
<TextView
@@ -51,7 +49,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间名"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<TextView
@@ -60,13 +58,13 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:drawableEnd="@drawable/icon_room_set_arrow"
android:drawableEnd="@drawable/arrow_right_white"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="250dp"
android:maxLines="1"
android:textColor="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_13"
tools:text="官方房官方房官方房官方房官方房官方房官方房官方房官方" />
@@ -75,16 +73,14 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/rl_pwd"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white">
android:layout_height="44dp">
<TextView
android:id="@+id/pwd_text"
@@ -93,7 +89,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间上锁"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -118,8 +114,8 @@
android:inputType="number"
android:maxLength="8"
android:singleLine="true"
android:textColor="@color/text_color_primary"
android:textColorHint="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14dp"
android:visibility="gone" />
@@ -136,18 +132,18 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<TextView
android:id="@+id/tv_password"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:drawableEnd="@drawable/icon_room_set_arrow"
android:drawableEnd="@drawable/arrow_right_white"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15"
tools:text="123456" />
@@ -156,13 +152,12 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/block_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/layout_label"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white"
android:onClick="@{click}">
<TextView
@@ -171,7 +166,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间标签"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<TextView
@@ -180,13 +175,13 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:drawableEnd="@drawable/icon_room_set_arrow"
android:drawableEnd="@drawable/arrow_right_white"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxWidth="250dp"
android:maxLines="1"
android:textColor="@color/appColor"
android:textColor="@color/app_248cfe"
android:textSize="@dimen/sp_13"
tools:text="聊天" />
@@ -195,13 +190,12 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10"
android:background="@color/block_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/manager_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:background="@color/white">
android:layout_height="@dimen/dp_45">
<TextView
android:layout_width="wrap_content"
@@ -209,7 +203,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="管理员"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -218,7 +212,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/icon_room_set_arrow" />
android:src="@drawable/arrow_right_white" />
</RelativeLayout>
<View
@@ -226,14 +220,13 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/black_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginTop="1dp"
android:background="@color/white">
android:layout_marginTop="1dp">
<TextView
android:layout_width="wrap_content"
@@ -241,7 +234,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="黑名单"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -250,7 +243,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/icon_room_set_arrow" />
android:src="@drawable/arrow_right_white" />
</RelativeLayout>
<View
@@ -258,13 +251,12 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/room_bg_layout"
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/white"
android:visibility="gone">
<TextView
@@ -273,7 +265,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="@string/room_bg_text"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -282,14 +274,13 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/icon_room_set_arrow" />
android:src="@drawable/arrow_right_white" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/audio_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:background="@color/white"
android:visibility="gone">
<TextView
@@ -298,7 +289,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="高品质音效"
android:textColor="@color/text_color_primary" />
android:textColor="@color/text_title_white" />
<Switch
android:id="@+id/switch_audio"
@@ -315,13 +306,12 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/gift_layout"
android:layout_width="match_parent"
android:layout_height="55dp"
android:background="@color/white">
android:layout_height="55dp">
<TextView
android:layout_width="wrap_content"
@@ -329,7 +319,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="房间礼物特效"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -348,13 +338,12 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/screen_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:background="@color/white">
android:layout_height="@dimen/dp_45">
<TextView
android:layout_width="wrap_content"
@@ -362,7 +351,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="房间公屏"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -381,13 +370,12 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<RelativeLayout
android:id="@+id/queuing_micro_mode_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:background="@color/white">
android:layout_height="@dimen/dp_45">
<TextView
android:layout_width="wrap_content"
@@ -395,7 +383,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_room_queuing_micro_mode"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<ImageView
@@ -414,14 +402,13 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color"
android:background="@color/line_353548"
android:visibility="gone" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/room_pure_mode_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/dp_45"
android:visibility="gone">
@@ -433,7 +420,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/text_room_pure_mode"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -446,7 +433,7 @@
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_12"
android:text="@string/tips_open_room_pure_mode"
android:textColor="@color/color_999999"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@@ -481,12 +468,11 @@
android:layout_height="1px"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_color" />
android:background="@color/line_353548" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:minHeight="@dimen/dp_45">
<TextView
@@ -497,7 +483,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"
android:text="@string/text_leave_mode"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_15"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -510,7 +496,7 @@
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_12"
android:text="@string/tips_leave_mode"
android:textColor="@color/color_999999"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_12"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@@ -531,10 +517,16 @@
android:src="@drawable/icon_room_set_lock_false"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/bg_secondary_2a2a39" />
</LinearLayout>
</ScrollView>
</LinearLayout>
@@ -544,5 +536,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/include_layout_room_lable" />
</RelativeLayout>
</FrameLayout>
</layout>

73
app/src/main/res/layout/activity_room_title_edit.xml
View File

@@ -11,13 +11,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25">
</com.yizhuan.erban.base.TitleBar>
@@ -27,74 +28,76 @@
<EditText
android:id="@+id/et_title"
android:layout_marginEnd="15dp"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_secondary_radius_5"
android:hint="@string/label_hint_room_title"
android:textColorHint="@color/color_999999"
android:maxLength="15"
android:maxLines="1"
android:paddingStart="13dp"
android:paddingEnd="13dp"
android:textSize="13sp"
android:singleLine="true"
android:maxLines="1"
android:maxLength="15"
android:background="@drawable/bg_room_title_edit" />
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="13sp" />
<TextView
android:layout_below="@id/et_title"
android:id="@+id/tv_title_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/et_title"
android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp"
android:layout_marginTop="6dp"
android:textColor="@color/color_999999"
android:textSize="10dp"
android:text="0/15" />
android:layout_marginEnd="15dp"
android:text="0/15"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10dp" />
<EditText
android:layout_marginTop="15dp"
android:layout_marginEnd="17dp"
android:layout_marginStart="15dp"
android:layout_below="@id/tv_title_count"
android:id="@+id/et_desc"
android:layout_width="match_parent"
android:layout_height="210dp"
android:padding="13dp"
android:background="@drawable/bg_room_title_edit"
android:layout_below="@id/tv_title_count"
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="17dp"
android:background="@drawable/bg_secondary_radius_5"
android:gravity="top"
android:hint="@string/label_hint_room_desc"
android:textSize="13sp"
android:textColorHint="@color/color_999999"
android:maxLength="300"
android:gravity="top" />
android:padding="13dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="13sp" />
<TextView
android:layout_below="@id/et_desc"
android:id="@+id/tv_desc_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/et_desc"
android:layout_alignParentEnd="true"
android:layout_marginEnd="15dp"
android:layout_marginTop="6dp"
android:textSize="10dp"
android:textColor="@color/color_999999"
android:text="0/300" />
android:layout_marginEnd="15dp"
android:text="0/300"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10dp" />
<TextView
android:id="@+id/tv_confirm"
android:layout_width="match_parent"
android:layout_height="38dp"
android:gravity="center"
android:textSize="15dp"
android:textColor="@color/white"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="20dp"
android:text="@string/text_ok"
android:background="@drawable/bg_common_confirm"
android:layout_alignParentBottom="true" />
android:gravity="center"
android:text="@string/text_ok"
android:textColor="@color/text_title_white"
android:textSize="15dp" />
</RelativeLayout>

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

@@ -52,11 +52,11 @@
android:layout_width="120dp"
android:layout_height="38dp"
android:layout_marginStart="@dimen/dp_19"
android:background="@drawable/shape_fef5ed_19"
android:background="@drawable/bg_common_cancel"
android:gravity="center"
android:text="取消"
android:layout_marginEnd="@dimen/dp_5"
android:textColor="@color/appColor"
android:textColor="@color/color_4C5AF1"
android:textSize="@dimen/sp_15" />
<TextView
@@ -66,8 +66,8 @@
android:layout_marginStart="12dp"
android:layout_width="120dp"
android:layout_height="38dp"
android:background="@drawable/shape_appcolor_corner"
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="确定"
android:textColor="@color/white" />
android:textColor="@color/text_title_white" />
</RelativeLayout>

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

@@ -1,68 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="65dp"
android:background="@color/white"
>
android:orientation="horizontal"
tools:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_marginStart="20dp"
android:layout_centerVertical="true"
/>
android:layout_marginStart="20dp" />
<LinearLayout
android:layout_toEndOf="@id/avatar"
android:layout_width="wrap_content"
android:orientation="vertical"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
>
android:layout_toEndOf="@id/avatar"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_333333"
android:text="昵称:"
android:maxWidth="250dp"
android:textSize="@dimen/sp_15"
android:singleLine="true"
/>
android:text="昵称:"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_15" />
<TextView
android:id="@+id/erban_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ID:111111"
android:textColor="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12dp"
android:visibility="gone"
/>
android:visibility="gone" />
</LinearLayout>
<TextView
android:id="@+id/remove_opration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_4"
android:padding="@dimen/dp_10"
android:text="移除"
android:textSize="@dimen/sp_13"
android:textColor="@color/appColor"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
/>
android:textColor="@color/app_248cfe"
android:textSize="@dimen/sp_13" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignParentBottom="true"
android:background="@color/line_color"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="1px" />
android:background="@color/line_353548" />
</RelativeLayout>

21
app/src/main/res/layout/room_invite_list_item_layout.xml
View File

@@ -2,15 +2,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@drawable/bg_common_touch_while"
android:orientation="vertical">
android:layout_height="65dp"
android:orientation="vertical"
tools:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_avatar"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
tools:src="@drawable/default_user_head" />
@@ -19,8 +19,8 @@
android:id="@+id/sex"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_alignBottom="@+id/iv_avatar"
android:layout_alignRight="@+id/iv_avatar"
android:layout_alignBottom="@+id/iv_avatar"
android:src="@drawable/icon_mic_female" />
<TextView
@@ -31,15 +31,16 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="10dp"
android:layout_toRightOf="@+id/iv_avatar"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<View
android:background="@color/common_divider_color"
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_alignLeft="@+id/tv_member_name"
android:layout_alignParentBottom="true" />
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@color/line_353548" />
</RelativeLayout>