From a6b5c102d24ca99c57cc8790200100cd9eaab570 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Wed, 10 May 2023 14:31:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=90=E9=9D=9E=E8=B4=B5?= =?UTF-8?q?=E6=97=8F=EF=BC=8C=E5=AE=88=E6=8A=A4=EF=BC=8C=E7=B2=89=E4=B8=9D?= =?UTF-8?q?=E7=89=8C=E9=80=81=E7=A4=BC=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/bean/LiveGiftBean.java | 2 +- .../com/yunbao/common/utils/AppManager.java | 2 +- .../com/yunbao/common/utils/DialogUitl.java | 11 +++-- .../com/yunbao/common/utils/VersionUtil.java | 8 ++-- common/src/main/res/values-en-rUS/string.xml | 12 ++++++ common/src/main/res/values-zh-rHK/strings.xml | 6 +++ common/src/main/res/values-zh-rTW/strings.xml | 6 +++ common/src/main/res/values-zh/strings.xml | 6 +++ common/src/main/res/values/strings.xml | 6 +++ config.gradle | 4 +- .../live/activity/LiveAudienceActivity.java | 6 ++- .../adapter/LiveUserAnchorMailBoxAdapter.java | 6 +-- .../live/dialog/LiveGiftDialogFragment.java | 42 +++++++++++++++++++ .../dialog/LiveNewGuardBuyDialogFragment.java | 4 +- .../live/dialog/LiveUserDialogFragment.java | 11 +---- .../presenter/LiveRyLinkMicPkPresenter.java | 3 +- .../live/views/LiveNewReadyRyViewHolder.java | 4 +- .../live/views/LivePlayRyViewHolder.java | 13 +----- .../live/views/LiveReadyRyViewHolder.java | 3 +- .../live/views/LiveReadyViewHolder.java | 3 +- 20 files changed, 104 insertions(+), 54 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java index 458f6a9ab..a1baad0a0 100644 --- a/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java +++ b/common/src/main/java/com/yunbao/common/bean/LiveGiftBean.java @@ -18,7 +18,7 @@ public class LiveGiftBean { // public static final int MARK_LUCK = 3; private int id; - private int type;//0 普通礼物 1是豪华礼物 + private int type;//0 普通礼物 1是贵族 2守护 3粉丝团 private int mark;// 0 普通 1热门 2守护 3幸运 private String name; private String price; diff --git a/common/src/main/java/com/yunbao/common/utils/AppManager.java b/common/src/main/java/com/yunbao/common/utils/AppManager.java index 7101d3221..5bda4db57 100644 --- a/common/src/main/java/com/yunbao/common/utils/AppManager.java +++ b/common/src/main/java/com/yunbao/common/utils/AppManager.java @@ -121,7 +121,7 @@ public class AppManager { */ public static void runDebugCode(Runnable runnable) { if (BuildConfig.DEBUG) { - // runnable.run(); + runnable.run(); } } diff --git a/common/src/main/java/com/yunbao/common/utils/DialogUitl.java b/common/src/main/java/com/yunbao/common/utils/DialogUitl.java index 0e40c91ba..347023335 100644 --- a/common/src/main/java/com/yunbao/common/utils/DialogUitl.java +++ b/common/src/main/java/com/yunbao/common/utils/DialogUitl.java @@ -8,7 +8,6 @@ import android.os.Handler; import android.os.Looper; import android.text.InputFilter; import android.text.InputType; -import android.text.Spanned; import android.text.TextUtils; import android.text.format.DateFormat; import android.util.SparseArray; @@ -331,7 +330,7 @@ public class DialogUitl { private Context mContext; private String mTitle; private String mContent; - private String mConfrimString; + private String mConfirmString; private String mCancelString; private boolean mCancelable; private boolean mBackgroundDimEnabled;//显示区域以外是否使用黑色半透明背景 @@ -371,8 +370,8 @@ public class DialogUitl { return this; } - public Builder setConfrimString(String confrimString) { - mConfrimString = confrimString; + public Builder setConfirmString(String confirmString) { + mConfirmString = confirmString; return this; } @@ -460,8 +459,8 @@ public class DialogUitl { content.setFilters(new InputFilter[]{new InputFilter.LengthFilter(mLength)}); } TextView btnConfirm = (TextView) dialog.findViewById(R.id.btn_confirm); - if (!TextUtils.isEmpty(mConfrimString)) { - btnConfirm.setText(mConfrimString); + if (!TextUtils.isEmpty(mConfirmString)) { + btnConfirm.setText(mConfirmString); } TextView btnCancel = (TextView) dialog.findViewById(R.id.btn_cancel); if (!TextUtils.isEmpty(mCancelString)) { diff --git a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java index 6527c7fc4..0bea8f7e9 100644 --- a/common/src/main/java/com/yunbao/common/utils/VersionUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/VersionUtil.java @@ -50,7 +50,7 @@ public class VersionUtil { DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(context.getString(R.string.version_update)) .setContent(configBean.getUpdateDes()) - .setConfrimString(context.getString(R.string.version_immediate_use)) + .setConfirmString(context.getString(R.string.version_immediate_use)) .setCancelString(context.getString(R.string.version_not_update)) .setCancelable(false) .setClickCallback(new DialogUitl.SimpleCallback2() { @@ -81,7 +81,7 @@ public class VersionUtil { DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(context.getString(R.string.version_update)) .setContent(configBean.getUpdateDes()) - .setConfrimString(context.getString(R.string.version_immediate_use)) + .setConfirmString(context.getString(R.string.version_immediate_use)) .setCancelString(context.getString(R.string.version_not_update)) .setCancelable(false) .setClickCallback(new DialogUitl.SimpleCallback2() { @@ -111,7 +111,7 @@ public class VersionUtil { DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(context.getString(R.string.version_update)) .setContent(configBean.getUpdateDes()) - .setConfrimString(context.getString(R.string.version_immediate_use)) + .setConfirmString(context.getString(R.string.version_immediate_use)) .setCancelString(context.getString(R.string.version_not_update)) .setCancelable(false) .setClickCallback(new DialogUitl.SimpleCallback2() { @@ -134,7 +134,7 @@ public class VersionUtil { DialogUitl.Builder builder = new DialogUitl.Builder(context); builder.setTitle(context.getString(R.string.version_update)) .setContent(configBean.getUpdateDes()) - .setConfrimString(context.getString(R.string.version_immediate_use)) + .setConfirmString(context.getString(R.string.version_immediate_use)) .setCancelString(context.getString(R.string.version_not_update)) .setCancelable(false) .setClickCallback(new DialogUitl.SimpleCallback2() { diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 240b00fa7..4c3a07c0c 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -872,6 +872,7 @@ Limited ride And limited avatar frame Activity Basic tools Effect settings + Font settings Shield gift effect Shield car effect You are in the current live room @@ -1125,6 +1126,11 @@ Limited ride And limited avatar frame Where is the host doing badly~\nBrother, are you sure you want to unfollow? follow Heat Add + LOW + DEFAULT + HIGH + Select font size + confirm Private chat prompt A private buoy on the side of the broadcast room Dynamic message @@ -1143,4 +1149,10 @@ Limited ride And limited avatar frame Do you want to delete the account After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue? Confirm deletion + This gift is exclusive to the nobility~ + "This gift is exclusive to guardianship~ " + This gift is exclusive to the fan group~ + VIP + Open Guard + Open Fan group diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index aac081a1b..0de513139 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1144,4 +1144,10 @@ 是否刪除賬號 點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？ 確認刪除 + 該禮物是貴族專屬禮物噢~ + 該禮物是守護專屬禮物噢~ + "該禮物是粉絲團專屬禮物噢~ " + 開通貴族 + 開通守護 + 開通粉絲團 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index d46e5a539..245ff9e8c 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1143,4 +1143,10 @@ 是否刪除賬號 點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？ 確認刪除 + 該禮物是貴族專屬禮物噢~ + 該禮物是守護專屬禮物噢~ + "該禮物是粉絲團專屬禮物噢~ " + 開通貴族 + 開通守護 + 開通粉絲團 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index aac081a1b..0de513139 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1144,4 +1144,10 @@ 是否刪除賬號 點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？ 確認刪除 + 該禮物是貴族專屬禮物噢~ + 該禮物是守護專屬禮物噢~ + "該禮物是粉絲團專屬禮物噢~ " + 開通貴族 + 開通守護 + 開通粉絲團 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index ea893a064..ee792f556 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1150,4 +1150,10 @@ Limited ride And limited avatar frame Do you want to delete the account After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue? Confirm deletion + This gift is exclusive to the nobility~ + This gift is exclusive to guardianship~ + This gift is exclusive to the fan group~ + VIP + Open Guard + Open Fan group diff --git a/config.gradle b/config.gradle index 2d4dd7c75..f5fc026ba 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,9 @@ ext { ] manifestPlaceholders = [ //正式、 - serverHost : "https://napi.yaoulive.com", +// serverHost : "https://napi.yaoulive.com", // 测试 -// serverHost : "https://ceshi.yaoulive.com", + serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 9e63b6738..094db35c3 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -1044,7 +1044,11 @@ public class LiveAudienceActivity extends LiveActivity { liveFansFragment.show(getSupportFragmentManager(), "LiveGuardDialogFragment"); break; case GUARD: - openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity); + if(event.getObject()==null) { + openNewGuardListWindow(mContext instanceof LiveRyAnchorActivity); + }else{ + openNewBuyGuardWindow(true); + } break; case LIVE_WKS://周星榜 String weeklyStarUrl = CommonAppConfig.HOST + "/h5/activity/weekStar/index.html?&uid=" diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java index 82aabb89c..68a9c66ff 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java +++ b/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java @@ -1,6 +1,5 @@ package com.yunbao.live.adapter; -import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Build; @@ -13,14 +12,11 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.yunbao.common.bean.BaseModel; import com.yunbao.common.bean.LiveUserMailBoxModel; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.interfaces.OnItemClickListener; import com.yunbao.common.utils.DialogUitl; -import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.dialog.LiveUserAnchorMailBoxWebInfoPopDialog; @@ -94,7 +90,7 @@ public class LiveUserAnchorMailBoxAdapter extends RecyclerView.Adapter { + LiveAudienceEvent event = new LiveAudienceEvent() + .setType(finalType); + if (finalType == LiveAudienceEvent.LiveAudienceType.GUARD) { + event = event.setObject(""); + } + Bus.get().post(event); + }).build().show(); + + AppManager.runDebugCode(() -> { + Log.i("gifBean", mLiveGiftBean.toString()); + }); } else { hideLianBtn(); ToastUtil.show(msg); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java index b84836937..5f4629551 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewGuardBuyDialogFragment.java @@ -1,6 +1,5 @@ package com.yunbao.live.dialog; -import android.annotation.SuppressLint; import android.app.Dialog; import android.os.Bundle; import android.text.Html; @@ -35,7 +34,6 @@ import com.yunbao.common.http.live.LiveNetManager; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; @@ -438,7 +436,7 @@ public class LiveNewGuardBuyDialogFragment extends AbsDialogFragment implements .setView(R.layout.dialog_live_random_pk) .setTitle(mContext.getString(R.string.dialog_tip)) .setCancelString(mContext.getString(R.string.live_use_discount_no)) - .setConfrimString(mContext.getString(R.string.live_use_discount_yes)) + .setConfirmString(mContext.getString(R.string.live_use_discount_yes)) .setClickCallback(new DialogUitl.SimpleCallback2() { @Override public void onCancelClick() { diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java index 44a868bb7..844af5d14 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java @@ -5,8 +5,6 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.core.content.ContextCompat; - import android.text.TextUtils; import android.util.Log; import android.view.Gravity; @@ -46,29 +44,22 @@ import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SVGAViewUtils; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveReportActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; -import com.yunbao.live.bean.GuardUserBean; -import com.yunbao.live.bean.ImpressBean; import com.yunbao.common.bean.LiveBean; -import com.yunbao.live.custom.MyTextView; import com.yunbao.live.event.LiveAudienceEvent; import com.yunbao.live.event.LiveRoomChangeEvent; -import com.yunbao.live.http.LiveHttpConsts; import com.yunbao.live.http.LiveHttpUtil; import com.yunbao.live.presenter.LiveRoomCheckLivePresenter; import com.yunbao.live.utils.LiveTextRender; -import com.yunbao.live.views.LiveRoomViewHolder; import org.greenrobot.eventbus.EventBus; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import io.rong.imlib.IRongCoreCallback; @@ -534,7 +525,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On if (mFollowing) { DialogUitl.Builder builder = new DialogUitl.Builder(mContext) .setContent(mContext.getString(R.string.unfollow)) - .setConfrimString(mContext.getString(R.string.unfollow_confrim)) + .setConfirmString(mContext.getString(R.string.unfollow_confrim)) .setCancelString(mContext.getString(R.string.unfollow_cancel)) .setView(R.layout.dialog_live_unfollow) .setClickCallback3(new DialogUitl.SimpleCallback3() { diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java index 61c3e5d06..409f79daa 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java @@ -54,7 +54,6 @@ import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.ScreenDimenUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; import com.yunbao.live.activity.LiveAudienceActivity; import com.yunbao.live.activity.LiveRyAnchorActivity; @@ -1242,7 +1241,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener { "有人向您发起PK请求。
" + "若拒绝PK，将会10分钟内不会再收到任何随机PK请求。" )) - .setConfrimString("接受") + .setConfirmString("接受") .setCancelString("拒絕") .setView(R.layout.dialog_live_random_pk) .setSimpleCallbackView(new DialogUitl.SimpleCallbackView() { diff --git a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java index c8ac7930a..6630f9411 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java @@ -46,7 +46,6 @@ import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.common.views.LiveClarityCustomPopup; import com.yunbao.common.views.LiveNewWishListPopup; @@ -62,7 +61,6 @@ import com.yunbao.live.dialog.LiveAnchorSayPopDialog; import com.yunbao.live.dialog.LiveFaceUnityDialogFragment; import com.yunbao.live.dialog.LiveNewRoomClassDialogFragment; import com.yunbao.live.dialog.LiveNewRoomTypeDialogFragment; -import com.yunbao.live.dialog.LiveNewWishListDialogFragment; import com.yunbao.live.dialog.LiveTimeDialogFragment; import com.yunbao.live.event.LiveAudienceEvent; import com.yunbao.live.http.LiveHttpConsts; @@ -664,7 +662,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl new DialogUitl.Builder(mContext) .setContent(mContext.getString(R.string.live_location_close_3)) .setCancelable(true) - .setConfrimString(mContext.getString(R.string.live_location_close_2)) + .setConfirmString(mContext.getString(R.string.live_location_close_2)) .setClickCallback(new DialogUitl.SimpleCallback() { @Override diff --git a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java index b55dfe006..9d6867df3 100644 --- a/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java @@ -7,25 +7,19 @@ import android.app.Dialog; import android.content.Context; import android.graphics.Color; import android.media.AudioManager; -import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.os.SystemClock; import android.text.TextUtils; import android.util.Log; import android.view.Gravity; -import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import com.google.android.exoplayer2.PlaybackException; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ui.StyledPlayerView; @@ -35,10 +29,8 @@ import com.lxj.xpopup.core.BasePopupView; import com.lxj.xpopup.interfaces.XPopupCallback; import com.lzf.easyfloat.EasyFloat; import com.lzy.okserver.OkDownload; -import com.yunbao.common.Constants; import com.yunbao.common.bean.EnterRoomNewModel; import com.yunbao.common.dialog.LiveFontSizeSettingDialog; -import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpClient; import com.yunbao.common.interfaces.OnItemClickListener; @@ -50,14 +42,11 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.MicStatusManager; import com.yunbao.common.utils.ScreenDimenUtil; import com.yunbao.common.utils.SpUtil; -import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.LiveClarityCustomPopup; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; import com.yunbao.live.activity.LiveAudienceActivity; -import com.yunbao.live.dialog.LiveUserDialogFragment; import com.yunbao.live.event.LiveAudienceEvent; import com.yunbao.live.utils.LiveExoPlayerManager; @@ -700,7 +689,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder { DialogUitl.Builder builder = new DialogUitl.Builder(mContext) .setContent("邀請您進行語音連麥") .setTitle(mLiveBean.getUserNiceName()) - .setConfrimString("接受") + .setConfirmString("接受") .setCancelString("拒絕") .setView(R.layout.dialog_live_mic_invite) .setClickCallback(new DialogUitl.SimpleCallback() { diff --git a/live/src/main/java/com/yunbao/live/views/LiveReadyRyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveReadyRyViewHolder.java index 24ad829a7..99eff8d70 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveReadyRyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveReadyRyViewHolder.java @@ -29,7 +29,6 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -231,7 +230,7 @@ public class LiveReadyRyViewHolder extends AbsViewHolder implements View.OnClick new DialogUitl.Builder(mContext) .setContent(mContext.getString(R.string.live_location_close_3)) .setCancelable(true) - .setConfrimString(mContext.getString(R.string.live_location_close_2)) + .setConfirmString(mContext.getString(R.string.live_location_close_2)) .setClickCallback(new DialogUitl.SimpleCallback() { @Override diff --git a/live/src/main/java/com/yunbao/live/views/LiveReadyViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveReadyViewHolder.java index 3d965ee08..4b157a36f 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveReadyViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveReadyViewHolder.java @@ -41,7 +41,6 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; -import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.AbsViewHolder; import com.yunbao.live.R; import com.yunbao.live.activity.LiveActivity; @@ -255,7 +254,7 @@ public class LiveReadyViewHolder extends AbsViewHolder implements View.OnClickLi new DialogUitl.Builder(mContext) .setContent(mContext.getString(R.string.live_location_close_3)) .setCancelable(true) - .setConfrimString(mContext.getString(R.string.live_location_close_2)) + .setConfirmString(mContext.getString(R.string.live_location_close_2)) .setClickCallback(new DialogUitl.SimpleCallback() { @Override