From 8fcb4ac7e261c464f8a0e691ca962645b2aef234 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 2 Nov 2022 10:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6id,=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=86=E7=A0=81=EF=BC=8C=E7=9B=B4=E6=92=AD=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/MainActivity.java | 9 ++- .../avroom/fragment/HomePartyFragment.java | 18 +++++ .../com/yizhuan/erban/base/BaseActivity.java | 5 ++ .../yizhuan/erban/home/fragment/MeFragment.kt | 34 ++++---- .../erban/ui/setting/ModifyPwdActivity.java | 62 +++++++++----- .../erban/ui/setting/SettingActivity.java | 3 +- .../erban/ui/user/UserInfoActivity.java | 19 +++-- .../ui/webview/CommonWebViewActivity.java | 2 +- .../erban/ui/widget/UserInfoDialog.java | 76 +++++++++++------- .../drawable-xhdpi/ic_room_exit_close.webp | Bin 0 -> 1040 bytes app/src/main/res/layout/activity_main.xml | 52 +++++++----- .../main/res/layout/activity_modify_pwd.xml | 2 +- app/src/main/res/values/strings.xml | 14 ++-- 13 files changed, 189 insertions(+), 107 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_room_exit_close.webp diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index f55f09b2d..4ac2a62c7 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -150,6 +150,7 @@ public class MainActivity extends BaseMvpActivity 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 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 private void initMaterialView() { avatarLayout.setVisibility(View.GONE); avatarImage.setOnClickListener(this); + viewClose.setOnClickListener(this); } @Override @@ -915,6 +917,11 @@ public class MainActivity extends BaseMvpActivity 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; } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 2dcba9a33..256b2228b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index 0714b16a2..5cffd9939 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -160,6 +160,11 @@ public abstract class BaseActivity extends RxAppCompatActivity })); registerNimBroadcastMessage(true); + setOnListener(); + } + + public void setOnListener() { + } protected void onReceiveChatRoomEvent(RoomEvent roomEvent) { diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt index c13682bf4..e57817fe8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt @@ -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 -> { + 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) - StatisticManager.Instance() - .onEvent( - StatisticsProtocol.EVENT_USERCENTER_RECHARGE_CARD_CLICK, - getString(R.string.me_personal_center_recharge_card_click) - ) } else { CommonWebViewActivity.start( context, UriProvider.getOfficialPay( diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java index bb2f5eacd..029ed8e84 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java @@ -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= 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 { + + }); break; } } @@ -199,10 +216,10 @@ public class ModifyPwdActivity extends BaseBindingActivity() { @Override @@ -228,7 +245,7 @@ public class ModifyPwdActivity extends BaseBindingActivity() { @Override public void onErrorMsg(String error) { @@ -265,9 +282,9 @@ public class ModifyPwdActivity extends BaseBindingActivity() { @Override @@ -326,4 +343,5 @@ public class ModifyPwdActivity extends BaseBindingActivity { + try { + 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; + }); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java index ddfbaf90a..7ad081c96 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/CommonWebViewActivity.java @@ -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)); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java index 7ab3b5121..efa8ce459 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java @@ -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() { @@ -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(); diff --git a/app/src/main/res/drawable-xhdpi/ic_room_exit_close.webp b/app/src/main/res/drawable-xhdpi/ic_room_exit_close.webp new file mode 100644 index 0000000000000000000000000000000000000000..ef8f4e1032c1ad0e5852adbb7926e73c68796a9c GIT binary patch literal 1040 zcmWIYbaUfiVPFV%bqWXzu!!JdU|=u+Vs$X`baoDqU;=U(m?S_X3s5RIucRo*-AN%L zGD-m?1_O!7#RV`n7MhWP;oCI^Aj!aRSr>~uAtBC`)Z%2Iq7Oh^QUtV|fq^jv$QDV5 zuq#09BnZ0)#4ZX6at5kd0Ay>VBe9c^*ySY!B|tSNKIgA?khp~qQ(3^k zz~92aur?N4@10ZpWX{)p`8(HT>zod{|J~N`*oswJfB*MOEKcqT^z!^{vwvG| zdQYI?F{8f6{f1l|iUutc9tNFacH&?=;xh#jAz&`tG~=xf+FR<*gbi9#gWkHny}Bx< zLcZ%(-bH<>)p_k3_INy7{YlF4`R{k#YwkFdt|^XuvG2vd+OMm;N|b-6zx-TNFB1D} wuWZ_;^Z%~3Z~yu%|8Lc7_IuB|_g6m6{Z~1A`MzhHw^#n>zt5k4Uzvdc0HVq+t^fc4 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index a1c554454..b5d9e2acc 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,39 +40,51 @@ - + + + - - + 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"/> - + 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"/> + + diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml index 2cb11c18d..84bf29013 100644 --- a/app/src/main/res/layout/activity_modify_pwd.xml +++ b/app/src/main/res/layout/activity_modify_pwd.xml @@ -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" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 77621d8f6..dca802ac5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -967,6 +967,7 @@ 我的房間 收益記錄 轉贈鉆石 + 我的轉贈 請聯系客服處理 @@ -2520,7 +2521,7 @@ 輸入新密碼 確認密碼 再次確認密碼 - 密碼必須使用6–16個字符內的數字和英文字母組合哦! + 6–16位數字+英文字母（無論大小寫） 設置密碼 設置密碼 輸入密碼 @@ -2543,17 +2544,17 @@ 獲取短信失敗! 密碼不能為空 密碼不能為空 - 新密碼與確認密碼不一致 + 密碼不一致 密碼長度必須為6位 請先輸入驗證碼 處理中... - 修改成功 + 設置成功 處理中... - 修改成功 + 設置成功 處理中... - 修改成功 + 設置成功 處理中... - 修改成功 + 設置成功 重置支付密碼 點擊進入通知提醒設置的次數 通知提醒設置 @@ -4925,5 +4926,6 @@ 總消耗鉆石 %s鉆 向%s轉贈 + 已複製 \ No newline at end of file