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

复制id,重置密码，直播悬浮按钮开发

Browse Source
This commit is contained in:
wushaocheng
2022-11-02 10:40:46 +08:00
parent f9ecb05d4c
commit 8fcb4ac7e2
13 changed files with 189 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
private LivingIconView userLivingView;
private MainTabLayout mMainTabLayout;
private AnchorCardView anchorCardView;
private View viewClose;
private int mCurrentTabType = MainTabType.TAB_TYPE_HOME;
/**
* 房间最小化动画，换成属性动画，原先的补间动画影响了activity的生命周期
@@ -382,7 +383,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
private void initView() {
mMainTabLayout = findViewById(R.id.main_tab_layout);
avatarLayout = findViewById(R.id.avatar_image_layout);
viewClose = findViewById(R.id.view_close);
avatarImage = findViewById(R.id.avatar_image);
userLivingView = findViewById(R.id.liv_user);
userLivingView.setColor(Color.WHITE);
@@ -428,6 +429,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
private void initMaterialView() {
avatarLayout.setVisibility(View.GONE);
avatarImage.setOnClickListener(this);
viewClose.setOnClickListener(this);
}
@Override
@@ -915,6 +917,11 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
toast(getString(R.string.room_information_is_empty));
}
break;
case R.id.view_close:
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MINIMIZE_CLOSED,
getString(R.string.room_minimization_close_button));
MainActivity.this.getMvpPresenter().exitRoom();
break;
}
}

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

@@ -1,6 +1,9 @@
package com.yizhuan.erban.avroom.fragment;
import android.annotation.SuppressLint;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.Gravity;
@@ -33,6 +36,7 @@ import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.home.helper.OpenRoomHelper;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.widget.ShareDialog;
import com.yizhuan.erban.utils.ClipboardUtils;
import com.yizhuan.erban.utils.RegexUtil;
@@ -65,6 +69,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -144,6 +149,19 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
private void setRoomId(long id, int onlineNumber) {
String htmlText = "ID:" + id;
roomId.setText(htmlText);
roomId.setOnLongClickListener(view -> {
try {
if(id >0L) {
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("text", String.valueOf(id)));
toast(getString(R.string.have_copy));
}
} catch (Exception e) {
Logger.info("copyText", e.toString());
toast(e.toString());
}
return true;
});
}
@Override

5
app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
View File

@@ -160,6 +160,11 @@ public abstract class BaseActivity extends RxAppCompatActivity
}));
registerNimBroadcastMessage(true);
setOnListener();
}
public void setOnListener() {
}
protected void onReceiveChatRoomEvent(RoomEvent roomEvent) {

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

@@ -94,18 +94,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
override fun onSetListener() {
mBinding = DataBindingUtil.bind(mView)!!
mBinding.click = this
mBinding.tvUserId.setOnLongClickListener(OnLongClickListener {
try {
val cm = context?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
cm.setPrimaryClip(ClipData.newPlainText("text", mBinding.tvUserId.text.toString()))
toast("已複製")
} catch (e: Exception) {
Logger.info("copyText", e.toString())
toast(e.toString())
}
return@OnLongClickListener true
})
}
override fun onDestroy() {
@@ -229,6 +217,18 @@ class MeFragment : BaseFragment(), View.OnClickListener {
Locale.getDefault(),
getString(R.string.text_user_id), it.erbanNo.toString()
)
mBinding.tvUserId.setOnLongClickListener(OnLongClickListener { view ->
try {
val cm =
context?.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
cm.setPrimaryClip(ClipData.newPlainText("text", it.erbanNo.toString()))
toast(getString(R.string.have_copy))
} catch (e: Exception) {
Logger.info("copyText", e.toString())
toast(e.toString())
}
return@OnLongClickListener true
})
val star = StarUtils.getConstellation(Date(it.birth))
mBinding.tvConstellation.text = star
setUserLevel(it.userLevelVo)
@@ -385,14 +385,14 @@ class MeFragment : BaseFragment(), View.OnClickListener {
)
)
R.id.me_item_wallet -> {
val channel = AppMetaDataUtil.getChannelID()
if (channel.equals("google")) {
ChargeActivity.start(mContext)
StatisticManager.Instance()
.onEvent(
StatisticsProtocol.EVENT_USERCENTER_RECHARGE_CARD_CLICK,
getString(R.string.me_personal_center_recharge_card_click)
)
val channel = AppMetaDataUtil.getChannelID()
if (channel.equals("google")) {
ChargeActivity.start(mContext)
} else {
CommonWebViewActivity.start(
context, UriProvider.getOfficialPay(

44
app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java
View File

@@ -3,13 +3,13 @@ package com.yizhuan.erban.ui.setting;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.text.Editable;
import android.text.InputFilter;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import com.coorchice.library.utils.LogUtils;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityModifyPwdBinding;
@@ -17,12 +17,11 @@ import com.yizhuan.erban.ui.login.CodeDownTimer;
import com.yizhuan.erban.ui.login.PasswordValidator;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -31,7 +30,6 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.Objects;
import io.reactivex.SingleObserver;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@ActLayoutRes(R.layout.activity_modify_pwd)
@@ -50,8 +48,6 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
*/
private boolean isFirstSetPayPwd = false;
private CodeDownTimer timer;
public static void start(Context context, int type) {
Intent intent = new Intent(context, ModifyPwdActivity.class);
intent.putExtra("type", type);
@@ -89,11 +85,34 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
setEditStyle();
}
mBinding.setClick(this);
setPsdEnable();
}
private void setPsdEnable() {
mBinding.edCurrentPwd.getEditText().addTextChangedListener(textWatcher);
mBinding.edPwd.getEditText().addTextChangedListener(textWatcher);
mBinding.edSurePwd.getEditText().addTextChangedListener(textWatcher);
}
private final TextWatcher textWatcher = new TextWatcherWrapper() {
@Override
public void afterTextChanged(Editable s) {
checkInput();
}
};
private void checkInput() {
String edCurrentPwd = mBinding.edCurrentPwd.getText();
String edPwd = mBinding.edPwd.getText();
String edSurePwd = mBinding.edSurePwd.getText();
if (mBinding.edCurrentPwd.getVisibility() == View.GONE) {
mBinding.btnCommit.setEnabled(!TextUtils.isEmpty(edPwd) && edPwd.length() >= 6 && !TextUtils.isEmpty(edSurePwd) && edSurePwd.length() >= 6);
} else
mBinding.btnCommit.setEnabled(!TextUtils.isEmpty(edCurrentPwd) && edCurrentPwd.length() >= 6 && !TextUtils.isEmpty(edPwd) && edPwd.length() >= 6 && !TextUtils.isEmpty(edSurePwd) && edSurePwd.length() >= 6);
}
private void setModifyPwdUI() {
initWhiteTitleBar(ResUtil.getString(R.string.ui_setting_modifypwdactivity_04));
mBinding.btnForget.setVisibility(View.GONE);
mBinding.edCurrentPwd.setTitleHint(ResUtil.getString(R.string.ui_setting_modifypwdactivity_05));
mBinding.edCurrentPwd.setEditHint(ResUtil.getString(R.string.ui_setting_modifypwdactivity_06));
mBinding.edPwd.setTitleHint(ResUtil.getString(R.string.ui_setting_modifypwdactivity_07));
@@ -160,11 +179,9 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
commit();
break;
case R.id.btn_forget:
if (type == PAY_PWD) {
VerifyPhoneActivity.startForResult(this, true);
} else {
ResetPasswordActivity.start(context, ResetPasswordActivity.FROM_LOGIN);
}
getDialogManager().showOkCancelWithTitleDialog(getString(R.string.login_contact_service), "LINE：pekoyuyin", getString(R.string.button_ok), "", true, () -> {
});
break;
}
}
@@ -326,4 +343,5 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

3
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.java
View File

@@ -161,8 +161,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
UserInfo cacheLoginUserInfo = UserModel.get().getCacheLoginUserInfo();
if (cacheLoginUserInfo == null) return;
if (cacheLoginUserInfo.isBindPasswd()) {
settingBinding.rlyLoginPwd.setVisibility(View.GONE);
settingBinding.viewSetPassword.setVisibility(View.GONE);
settingBinding.tvLoginPwd.setText(ResUtil.getString(R.string.text_reset_password));
} else {
settingBinding.tvLoginPwd.setText(ResUtil.getString(R.string.ui_setting_settingactivity_016));
}

9
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
View File

@@ -331,14 +331,17 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
mBinding.tvErbanId.setOnLongClickListener(view -> {
try {
ClipboardManager cm = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("text", mBinding.tvErbanId.getText().toString()));
toast("已複製");
ClipboardManager cm = (ClipboardManager) UserInfoActivity.this.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("text", String.valueOf(userInfo.getErbanNo())));
toast(getString(R.string.have_copy));
} catch (Exception e) {
Logger.info("copyText", e.toString());
toast(e.toString());
}
return true;
});
}
}

2
app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java
View File

@@ -496,7 +496,7 @@ public class CommonWebViewActivity extends BaseActivity implements ShareDialog.O
try {
ClipboardManager cm = (ClipboardManager) this.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("text", mWebJsBeanInfo.getData().getLink()));
toast("已複製");
toast(getString(R.string.have_copy));
} catch (Exception e) {
Logger.i("copyText", String.valueOf(e));
toast(String.valueOf(e));

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

@@ -3,8 +3,11 @@ package com.yizhuan.erban.ui.widget;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR;
import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL;
import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL;
import static com.yizhuan.xchat_android_library.utils.ResUtil.getString;
import android.annotation.SuppressLint;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.os.Bundle;
import android.text.TextUtils;
@@ -79,6 +82,7 @@ import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.BaseInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
@@ -282,7 +286,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
private void initAttentData() {
if (isMySelf) {
tvFamilyNameLabel.setText(tvFamilyNameLabel.getText().toString().replace("TA", ResUtil.getString(R.string.ui_widget_userinfodialog_01)));
tvFamilyNameLabel.setText(tvFamilyNameLabel.getText().toString().replace("TA", getString(R.string.ui_widget_userinfodialog_01)));
} else {
Disposable disposable = PraiseModel.get().isPraised(myUid, uid).subscribe(aBoolean -> {
isAttention = aBoolean;
@@ -314,7 +318,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
tvSelectHim.setOnClickListener(v -> {
int micPosition = AvRoomDataManager.get().getMicPosition(uid);
if (micPosition == Integer.MIN_VALUE) {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_02));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_02));
} else {
new DatingSelectDialog(micPosition, uid, myUid, roomInfo.getUid()).show(context);
}
@@ -346,7 +350,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
private void updateAttentView() {
TextView textView = attentView.findViewById(R.id.text);
textView.setText(isAttention ? ResUtil.getString(R.string.ui_widget_userinfodialog_03) : ResUtil.getString(R.string.ui_widget_userinfodialog_04));
textView.setText(isAttention ? getString(R.string.ui_widget_userinfodialog_03) : getString(R.string.ui_widget_userinfodialog_04));
ImageView imageView = attentView.findViewById(R.id.image);
imageView.setImageResource(
isAttention ? R.drawable.icon_dialog_cancel_attent : R.drawable.icon_dialog_attent);
@@ -393,7 +397,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
new RoomAtEvent(String.valueOf(userInfo.getUid()), userInfo.getNick())
);
} else {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_05));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_05));
}
});
flexbox.addView(item);
@@ -532,12 +536,26 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
// 这个方法能让图片不失真
ImageLoadUtils.laodUsrInfoAvatar(context, userInfo.getAvatar(), avatar);
nick.setText(RegexUtil.getPrintableString(userInfo.getNick()));
erbanId.setText(ResUtil.getString(R.string.ui_widget_userinfodialog_06) + userInfo.getErbanNo());
erbanId.setText(getString(R.string.ui_widget_userinfodialog_06) + userInfo.getErbanNo());
erbanId.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
try {
ClipboardManager cm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setPrimaryClip(ClipData.newPlainText("text", String.valueOf(userInfo.getErbanNo())));
SingleToastUtil.showToast(getString(R.string.have_copy));
} catch (Exception e) {
Logger.info("copyText", e.toString());
SingleToastUtil.showToast(e.toString());
}
return true;
}
});
ivGender.setImageResource(
userInfo.getGender() == 1 ? R.drawable.ic_gender_male : R.drawable.ic_gender_female);
VipHelper.loadVipIcon(ivVipIcon, userInfo.getUserVipInfoVO());
// 设置粉丝数量
fansNumber.setText(userInfo.getFansNum() + ResUtil.getString(R.string.ui_widget_userinfodialog_07));
fansNumber.setText(userInfo.getFansNum() + getString(R.string.ui_widget_userinfodialog_07));
//设置家族
if (FamilyInfo.NO_FAMILY_ID.equals(userInfo.getFamilyId())
@@ -625,7 +643,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
@Override
public void onError(Throwable e) {
// Toast.makeText(context, ResUtil.getString(R.string.ui_widget_userinfodialog_08), Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort(ResUtil.getString(R.string.ui_widget_userinfodialog_09));
SingleToastUtil.showToastShort(getString(R.string.ui_widget_userinfodialog_09));
}
});
}
@@ -761,14 +779,14 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
dismiss();
break;
case R.id.tv_report:
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_report_click, ResUtil.getString(R.string.ui_widget_userinfodialog_010));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_report_click, getString(R.string.ui_widget_userinfodialog_010));
UIHelper.showReportPage(context, uid, XChatConstants.REPORT_TYPE_USERCARD);
dismiss();
break;
case R.id.fl_avatar_layout:
case R.id.user_info_page_btn:
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_homepage_click, ResUtil.getString(R.string.ui_widget_userinfodialog_011));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_homepage_click, getString(R.string.ui_widget_userinfodialog_011));
UserInfoActivity.Companion.start(context, uid);
dismiss();
break;
@@ -781,7 +799,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
*/
private void toAttent() {
if (userInfo == null) return;
StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_follow_click, ResUtil.getString(R.string.ui_widget_userinfodialog_012));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_card_follow_click, getString(R.string.ui_widget_userinfodialog_012));
//资料卡片不允许取消关注
if (isAttention) {
@@ -1056,7 +1074,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createClearGiftValueItem() {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_013));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_013));
textView.setOnClickListener(v -> {
GiftValueModel.get().clearSingleMicValue(uid).subscribe(new DontWarnObserver<RoomGiftValue>() {
@@ -1070,14 +1088,14 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
SingleToastUtil.showToast(error);
return;
}
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_014));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_014));
GiftValueMrg.get().updateRoomGiftValue(roomGiftValue, true);
//通知房间其他用户更新
GiftValueMrg.get().sendRoomGiftValueMsg(roomGiftValue);
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_DATA_CARD_CLEAN_GIFTVALUE,
ResUtil.getString(R.string.ui_widget_userinfodialog_015));
getString(R.string.ui_widget_userinfodialog_015));
}
});
dismiss();
@@ -1086,7 +1104,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createDownMicItem() {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_016));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_016));
textView.setOnClickListener(v -> {
showDownMicDialog();
dismiss();
@@ -1103,11 +1121,11 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
if (AvRoomDataManager.get().isSelfGamePlaying()) {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_017));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_017));
return;
}
if (AvRoomDataManager.get().haveStartDragon) {
new DialogManager(context).showOkCancelDialog(ResUtil.getString(R.string.ui_widget_userinfodialog_018), false, new DialogManager.OkCancelDialogListener() {
new DialogManager(context).showOkCancelDialog(getString(R.string.ui_widget_userinfodialog_018), false, new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
}
@@ -1191,9 +1209,9 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createBanMicItem(int micPosition) {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_019));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_019));
textView.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_close_mic_click, ResUtil.getString(R.string.ui_widget_userinfodialog_020));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_close_mic_click, getString(R.string.ui_widget_userinfodialog_020));
final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo == null) {
@@ -1208,7 +1226,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createOpenMicItem(int micPosition) {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_021));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_021));
textView.setOnClickListener(v -> {
final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
@@ -1223,16 +1241,16 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createLockMicItem(int micPosition) {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_022));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_022));
textView.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_lock_mic_click, ResUtil.getString(R.string.ui_widget_userinfodialog_023));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_lock_mic_click, getString(R.string.ui_widget_userinfodialog_023));
final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo == null) {
return;
}
if (AvRoomDataManager.get().isQueuingMicro()) {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_024));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_024));
return;
}
mSuperAdminModel.roomOperate(SuperAdminModel.LOCK_MIC).subscribe();
@@ -1245,18 +1263,18 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createUnLockMicItem(int micPosition) {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_025));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_025));
textView.setOnClickListener(v -> {
final RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (roomInfo == null) {
return;
}
if (AvRoomDataManager.get().isQueuingMicro()) {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_026));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_026));
return;
}
if (AvRoomDataManager.get().isOpenPKMode()) {
SingleToastUtil.showToast(ResUtil.getString(R.string.ui_widget_userinfodialog_027));
SingleToastUtil.showToast(getString(R.string.ui_widget_userinfodialog_027));
return;
}
homePartyModel.unLockMicroPhone(micPosition, roomInfo.getUid() + "",
@@ -1267,7 +1285,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
}
private TextView createInviteMicItem() {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_028));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_028));
textView.setOnClickListener(v -> {
if (AvRoomDataManager.get().getChatRoomMember(String.valueOf(uid)) == null) {
SingleToastUtil.showToast(context.getString(R.string.tips_member_not_in_room));
@@ -1335,9 +1353,9 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
@SuppressLint("CheckResult")
private TextView createKickMicItem() {
TextView textView = getTextView(ResUtil.getString(R.string.ui_widget_userinfodialog_029));
TextView textView = getTextView(getString(R.string.ui_widget_userinfodialog_029));
textView.setOnClickListener(v -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_takeOut_mic_click, ResUtil.getString(R.string.ui_widget_userinfodialog_030));
StatisticManager.Instance().onEvent(StatisticsProtocol.data_dard_takeOut_mic_click, getString(R.string.ui_widget_userinfodialog_030));
if (SuperAdminUtil.isSuperAdmin()) {
mSuperAdminModel.roomOperate(SuperAdminModel.TAKE_OUT_MIC, uid).subscribe();
kickDownMicCode();
@@ -1346,7 +1364,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
if (AvRoomDataManager.get().isOnMic(uid)) {
if (AvRoomDataManager.get().isGamePlaying(uid)) {
new DialogManager(context).showOkCancelWithTitleDialog(ResUtil.getString(R.string.ui_widget_userinfodialog_031),
new DialogManager(context).showOkCancelWithTitleDialog(getString(R.string.ui_widget_userinfodialog_031),
(DialogManager.LambdaOkDialogListener) () -> {
kickDownMicCode();
dismiss();

BIN
app/src/main/res/drawable-xhdpi/ic_room_exit_close.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

@@ -40,39 +40,51 @@
<com.yizhuan.erban.common.widget.DragLayout
android:id="@+id/avatar_image_layout"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginEnd="7dp"
android:layout_marginBottom="108dp"
android:background="@drawable/bg_ffffff_r360"
android:visibility="visible">
<FrameLayout
android:id="@+id/fl_avatar"
android:layout_width="58dp"
android:layout_height="58dp"
android:layout_centerVertical="true">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/view_close"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:layout_alignParentEnd="true"
android:src="@drawable/ic_room_exit_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/avatar_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:src="@drawable/default_avatar" />
<com.yizhuan.erban.common.widget.CircleImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:alpha="0.1"
android:src="@color/black" />
android:layout_width="60dp"
android:layout_height="60dp"
tools:src="@drawable/default_avatar"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginEnd="6dp"
app:civ_border_width="2dp"
app:cborder_color="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<com.yizhuan.erban.ui.widget.LivingIconView
android:id="@+id/liv_user"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="center"
android:background="@color/transparent" />
</FrameLayout>
android:background="@color/transparent"
app:layout_constraintStart_toStartOf="@+id/avatar_image"
app:layout_constraintEnd_toEndOf="@+id/avatar_image"
app:layout_constraintTop_toTopOf="@+id/avatar_image"
app:layout_constraintBottom_toBottomOf="@+id/avatar_image"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.yizhuan.erban.common.widget.DragLayout>

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

@@ -95,7 +95,7 @@
android:layout_marginStart="32dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="32dp"
android:enabled="true"
android:enabled="false"
android:background="@drawable/selector_common_button"
android:onClick="@{click}"
android:text="@string/layout_activity_modify_pwd_07"

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

@@ -967,6 +967,7 @@
<string name="me_my_room">我的房間</string>
<string name="me_gain_recording">收益記錄</string>
<string name="me_clean_diamond">轉贈鉆石</string>
<string name="me_donation">我的轉贈</string>
<!--登錄-->
<string name="login_contact_service">請聯系客服處理</string>
@@ -2520,7 +2521,7 @@
<string name="ui_setting_modifypwdactivity_08">輸入新密碼</string>
<string name="ui_setting_modifypwdactivity_09">確認密碼</string>
<string name="ui_setting_modifypwdactivity_010">再次確認密碼</string>
<string name="ui_setting_modifypwdactivity_011">密碼必須使用6–16個字符內的數字和英文字母組合哦!</string>
<string name="ui_setting_modifypwdactivity_011">6–16位數字+英文字母（無論大小寫）</string>
<string name="ui_setting_modifypwdactivity_012">設置密碼</string>
<string name="ui_setting_modifypwdactivity_013">設置密碼</string>
<string name="ui_setting_modifypwdactivity_014">輸入密碼</string>
@@ -2543,17 +2544,17 @@
<string name="ui_setting_modifypwdactivity_031">獲取短信失敗!</string>
<string name="ui_setting_modifypwdactivity_032">密碼不能為空</string>
<string name="ui_setting_modifypwdactivity_033">密碼不能為空</string>
<string name="ui_setting_modifypwdactivity_034">新密碼與確認密碼不一致</string>
<string name="ui_setting_modifypwdactivity_034">密碼不一致</string>
<string name="ui_setting_modifypwdactivity_035">密碼長度必須為6位</string>
<string name="ui_setting_modifypwdactivity_036">請先輸入驗證碼</string>
<string name="ui_setting_modifypwdactivity_037">處理中...</string>
<string name="ui_setting_modifypwdactivity_038">修改成功</string>
<string name="ui_setting_modifypwdactivity_038">設置成功</string>
<string name="ui_setting_modifypwdactivity_039">處理中...</string>
<string name="ui_setting_modifypwdactivity_040">修改成功</string>
<string name="ui_setting_modifypwdactivity_040">設置成功</string>
<string name="ui_setting_modifypwdactivity_041">處理中...</string>
<string name="ui_setting_modifypwdactivity_042">修改成功</string>
<string name="ui_setting_modifypwdactivity_042">設置成功</string>
<string name="ui_setting_modifypwdactivity_043">處理中...</string>
<string name="ui_setting_modifypwdactivity_044">修改成功</string>
<string name="ui_setting_modifypwdactivity_044">設置成功</string>
<string name="ui_setting_modifypwdactivity_045">重置支付密碼</string>
<string name="ui_setting_noticesettingactivity_01">點擊進入通知提醒設置的次數</string>
<string name="ui_setting_noticesettingactivity_02">通知提醒設置</string>
@@ -4925,5 +4926,6 @@
<string name="consume_diamond">總消耗鉆石</string>
<string name="consume_diamond_num">%s鉆</string>
<string name="give_gold_to_user">向%s轉贈</string>
<string name="have_copy">已複製</string>
</resources>