From 86c7bd56d15bfb4828efc09e6350b455aef1b073 Mon Sep 17 00:00:00 2001 From: Martin <13046765170@163.com> Date: Fri, 16 Aug 2024 13:36:58 +0800 Subject: [PATCH] =?UTF-8?q?add[=E7=9B=B4=E6=92=AD=E6=95=B0=E6=8D=AE-?= =?UTF-8?q?=E5=BD=93=E5=9C=BA=E6=95=B0=E6=8D=AE=E3=80=81PK=E5=BC=B9?= =?UTF-8?q?=E7=AA=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/LiveDataInfoRecyclerAdapter.java | 18 ++-- .../common/bean/LiveDataInfoNowModel.java | 46 ++++++++ .../common/fragment/LiveDataNowFragment.java | 91 ++++++++++++++++ common/src/main/res/layout/item_live_data.xml | 31 ++++++ .../res/layout/live_data_now_fragment.xml | 61 +++++++++++ common/src/main/res/values-en-rUS/strings.xml | 4 + common/src/main/res/values-zh/strings.xml | 3 + common/src/main/res/values/strings.xml | 3 + .../live/activity/LiveSwAnchorActivity.java | 11 +- .../live/dialog/LiveDataInfoDialog.java | 59 ++-------- .../yunbao/live/dialog/LivePkTypeDialog.java | 83 ++++++++++++++ .../live/views/LiveRyAnchorViewHolder.java | 2 +- .../src/main/res/drawable/bg_live_pk_type.xml | 9 ++ live/src/main/res/layout/dialog_live_data.xml | 91 +++++++--------- live/src/main/res/layout/dialog_pk_type.xml | 101 ++++++++++++++++++ live/src/main/res/layout/item_live_data.xml | 44 -------- .../src/main/res/mipmap-xhdpi/live_pk_1v1.png | Bin 0 -> 11460 bytes live/src/main/res/mipmap-xhdpi/live_pk_dr.png | Bin 0 -> 12997 bytes live/src/main/res/mipmap-xhdpi/live_pk_sj.png | Bin 0 -> 14981 bytes live/src/main/res/values-zh/strings.xml | 2 + live/src/main/res/values/strings.xml | 2 + 21 files changed, 493 insertions(+), 168 deletions(-) rename {live/src/main/java/com/yunbao/live => common/src/main/java/com/yunbao/common}/adapter/LiveDataInfoRecyclerAdapter.java (74%) create mode 100644 common/src/main/java/com/yunbao/common/bean/LiveDataInfoNowModel.java create mode 100644 common/src/main/java/com/yunbao/common/fragment/LiveDataNowFragment.java create mode 100644 common/src/main/res/layout/item_live_data.xml create mode 100644 common/src/main/res/layout/live_data_now_fragment.xml create mode 100644 live/src/main/java/com/yunbao/live/dialog/LivePkTypeDialog.java create mode 100644 live/src/main/res/drawable/bg_live_pk_type.xml create mode 100644 live/src/main/res/layout/dialog_pk_type.xml delete mode 100644 live/src/main/res/layout/item_live_data.xml create mode 100644 live/src/main/res/mipmap-xhdpi/live_pk_1v1.png create mode 100644 live/src/main/res/mipmap-xhdpi/live_pk_dr.png create mode 100644 live/src/main/res/mipmap-xhdpi/live_pk_sj.png diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveDataInfoRecyclerAdapter.java b/common/src/main/java/com/yunbao/common/adapter/LiveDataInfoRecyclerAdapter.java similarity index 74% rename from live/src/main/java/com/yunbao/live/adapter/LiveDataInfoRecyclerAdapter.java rename to common/src/main/java/com/yunbao/common/adapter/LiveDataInfoRecyclerAdapter.java index 5bf22b60a..f41511957 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveDataInfoRecyclerAdapter.java +++ b/common/src/main/java/com/yunbao/common/adapter/LiveDataInfoRecyclerAdapter.java @@ -1,4 +1,4 @@ -package com.yunbao.live.adapter; +package com.yunbao.common.adapter; import android.content.Context; import android.text.Html; @@ -10,21 +10,21 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import com.yunbao.live.R; -import com.yunbao.live.bean.LiveDataInfoModel; +import com.yunbao.common.R; +import com.yunbao.common.bean.LiveDataInfoNowModel; import java.util.ArrayList; import java.util.List; public class LiveDataInfoRecyclerAdapter extends RecyclerView.Adapter { private Context mContext; - private List list=new ArrayList<>(); + private List list=new ArrayList<>(); public LiveDataInfoRecyclerAdapter(Context mContext) { this.mContext = mContext; } - public void setList(List list) { + public void setList(List list) { this.list = list; notifyDataSetChanged(); } @@ -54,12 +54,8 @@ public class LiveDataInfoRecyclerAdapter extends RecyclerView.Adapter" + model.getData() + "")); - } else { - data.setText(model.getData()); - } + public void setData(LiveDataInfoNowModel model) { + data.setText(model.getData()); title.setText(model.getTitle()); } diff --git a/common/src/main/java/com/yunbao/common/bean/LiveDataInfoNowModel.java b/common/src/main/java/com/yunbao/common/bean/LiveDataInfoNowModel.java new file mode 100644 index 000000000..13a6c7281 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/bean/LiveDataInfoNowModel.java @@ -0,0 +1,46 @@ +package com.yunbao.common.bean; + + +public class LiveDataInfoNowModel extends BaseModel { + private String color; + private String title; + private String data; + + public LiveDataInfoNowModel(String color, String title, String data) { + this.color = color; + this.title = title; + this.data = data; + } + + public LiveDataInfoNowModel(String title, String data) { + this.title = title; + this.data = data; + } + + public LiveDataInfoNowModel() { + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } +} diff --git a/common/src/main/java/com/yunbao/common/fragment/LiveDataNowFragment.java b/common/src/main/java/com/yunbao/common/fragment/LiveDataNowFragment.java new file mode 100644 index 000000000..42d5788e2 --- /dev/null +++ b/common/src/main/java/com/yunbao/common/fragment/LiveDataNowFragment.java @@ -0,0 +1,91 @@ +package com.yunbao.common.fragment; + +import static com.umeng.commonsdk.stateless.UMSLEnvelopeBuild.mContext; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; +import com.yunbao.common.R; +import com.yunbao.common.adapter.LiveDataInfoRecyclerAdapter; +import com.yunbao.common.bean.LiveDataInfoModel; +import com.yunbao.common.bean.LiveDataInfoNowModel; +import com.yunbao.common.http.base.HttpCallback; +import com.yunbao.common.http.live.LiveNetManager; +import com.yunbao.common.utils.ToastUtil; + +import java.util.ArrayList; +import java.util.List; + +public class LiveDataNowFragment extends Fragment { + + private RecyclerView recyclerView; + private LiveDataInfoRecyclerAdapter adapter; + private List list; + private String mLiveUid; + private onDataResult onDataResult; + + public LiveDataNowFragment(Context context, String liveUid,LiveDataNowFragment.onDataResult onDataResult) { + this.mLiveUid = liveUid; + this.onDataResult = onDataResult; + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.live_data_now_fragment, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + recyclerView = view.findViewById(R.id.live_data_list); + adapter = new LiveDataInfoRecyclerAdapter(getContext()); + recyclerView.setAdapter(adapter); + initData(); + } + + private void initData() { + list = new ArrayList<>(); + list.add(new LiveDataInfoNowModel("#00FFFF", getContext().getString(R.string.live_data_coin), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel("#FFF69F", getContext().getString(R.string.live_data_gold), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_accept), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_enter), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_attention), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_attention_rate), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group), getContext().getString(R.string.live_data_loading))); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group_rate), getContext().getString(R.string.live_data_loading))); + adapter.setList(list); + LiveNetManager.get(getContext()) + .getLiveData(mLiveUid, new HttpCallback() { + @Override + public void onSuccess(com.yunbao.common.bean.LiveDataInfoModel data) { + list.clear(); + list.add(new LiveDataInfoNowModel("#00FFFF", getContext().getString(R.string.live_data_coin), data.getTotalCoin() + "")); + list.add(new LiveDataInfoNowModel("#FFF69F", getContext().getString(R.string.live_data_gold), data.getTotalGold() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_accept), data.getAcceptNum() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_enter), data.getEnterNum() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_attention), data.getAttentionNum() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_attention_rate), data.getAttentionNumRate() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group), data.getFanGroupNum() + "")); + list.add(new LiveDataInfoNowModel(getContext().getString(R.string.live_data_fan_group_rate), data.getFanGroupNumRate() + "")); + adapter.setList(list); + } + + @Override + public void onError(String error) { + ToastUtil.show(mContext.getString(com.yunbao.common.R.string.net_error)); + } + }); + } + + public interface onDataResult{ + void Result(String countZs,String countPerson); + } +} diff --git a/common/src/main/res/layout/item_live_data.xml b/common/src/main/res/layout/item_live_data.xml new file mode 100644 index 000000000..7dc0ceb40 --- /dev/null +++ b/common/src/main/res/layout/item_live_data.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/common/src/main/res/layout/live_data_now_fragment.xml b/common/src/main/res/layout/live_data_now_fragment.xml new file mode 100644 index 000000000..70f8e083a --- /dev/null +++ b/common/src/main/res/layout/live_data_now_fragment.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index 1156e0526..98fc5640c 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -1485,4 +1485,8 @@ Limited ride And limited avatar frame type name gain + + * Non-real-time calculation of data + Historical data can be viewed in the anchor center + This live data statistics diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index aaf3c96c1..c9650bf66 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1615,5 +1615,8 @@ 分類 名稱 收益 + * 人數及新增相關數據非实时计算 + 歷史數據可在主播中心查看 + 本場直播數據統計 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 84d1e4fab..95f5af5b2 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1424,4 +1424,7 @@ Limited ride And limited avatar frame name gain + * Non-real-time calculation of data + Historical data can be viewed in the anchor center + This live data statistics diff --git a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java index 790d26124..ce2b88438 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java @@ -96,6 +96,7 @@ import com.yunbao.live.dialog.FreePkDialogFragment; import com.yunbao.live.dialog.LiveInputDialogFragment; import com.yunbao.live.dialog.LiveInteractionDialogFragment; import com.yunbao.live.dialog.LiveNewFunctionDialogFragment; +import com.yunbao.live.dialog.LivePkTypeDialog; import com.yunbao.live.dialog.LivePrankDialogFragment; import com.yunbao.live.dialog.LiveTaskDialog; import com.yunbao.live.dialog.LiveWishListDialogFragment4Audience; @@ -1428,13 +1429,9 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl * 发起主播连麦pk */ public void applyLinkMicPk() { - String pkUid = null; - if (mLiveLinkMicAnchorPresenter != null) { - pkUid = mLiveLinkMicAnchorPresenter.getPkUid(); - } - if (!TextUtils.isEmpty(pkUid) && mLiveSwLinkMicPkPresenter != null) { - mLiveSwLinkMicPkPresenter.applyLinkMicPk(pkUid, mStream); - } + LivePkTypeDialog livePkTypeDialog = new LivePkTypeDialog(mContext); + livePkTypeDialog.setFunctionClickListener(this); + livePkTypeDialog.showDialog(); } /** diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveDataInfoDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveDataInfoDialog.java index 80b8b91f0..e26e08176 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveDataInfoDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveDataInfoDialog.java @@ -7,24 +7,17 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; import com.lxj.xpopup.XPopup; import com.yunbao.common.dialog.AbsDialogPopupWindow; import com.yunbao.common.fragment.LiveDataHistoryFragment; -import com.yunbao.common.http.base.HttpCallback; -import com.yunbao.common.http.live.LiveNetManager; -import com.yunbao.common.utils.AppManager; +import com.yunbao.common.fragment.LiveDataNowFragment; import com.yunbao.common.utils.DpUtil; -import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ViewPageIndicatorUtils; import com.yunbao.common.utils.WordUtil; import com.yunbao.live.R; -import com.yunbao.live.adapter.LiveDataInfoRecyclerAdapter; -import com.yunbao.live.bean.LiveDataInfoModel; - import net.lucode.hackware.magicindicator.MagicIndicator; import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator; @@ -39,9 +32,6 @@ import java.util.ArrayList; import java.util.List; public class LiveDataInfoDialog extends AbsDialogPopupWindow { - private RecyclerView recyclerView; - private LiveDataInfoRecyclerAdapter adapter; - private List list; private String mStream; private String mLiveUid; @@ -72,7 +62,12 @@ public class LiveDataInfoDialog extends AbsDialogPopupWindow { protected void onCreate() { super.onCreate(); final String[] titles = new String[]{WordUtil.getNewString(R.string.live_data_now_data), WordUtil.getNewString(R.string.live_data_gift_history)}; - fragmentList.add(new LiveDataHistoryFragment( mContext,mStream)); + fragmentList.add(new LiveDataNowFragment(mContext, mLiveUid, new LiveDataNowFragment.onDataResult() { + @Override + public void Result(String countZs, String countPerson) { + + } + })); fragmentList.add(new LiveDataHistoryFragment( mContext,mStream)); mIndicator = findViewById(R.id.indicator); @@ -96,11 +91,6 @@ public class LiveDataInfoDialog extends AbsDialogPopupWindow { CommonNavigator commonNavigator = getCommonNavigator(titles); mIndicator.setNavigator(commonNavigator); ViewPageIndicatorUtils.bind(mIndicator, viewPager, null); - - recyclerView = findViewById(R.id.live_data_list); - adapter = new LiveDataInfoRecyclerAdapter(getContext()); - recyclerView.setAdapter(adapter); - initData(); } private @NonNull CommonNavigator getCommonNavigator(String[] titles) { @@ -145,39 +135,4 @@ public class LiveDataInfoDialog extends AbsDialogPopupWindow { }); return commonNavigator; } - - private void initData() { - list = new ArrayList<>(); - list.add(new LiveDataInfoModel("#00FFFF", getContext().getString(R.string.live_data_coin), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel("#FFF69F", getContext().getString(R.string.live_data_gold), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_accept), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_enter), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_attention), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_attention_rate), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_fan_group), getContext().getString(R.string.live_data_loading))); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_fan_group_rate), getContext().getString(R.string.live_data_loading))); - adapter.setList(list); - LiveNetManager.get(getContext()) - .getLiveData(mLiveUid, new HttpCallback() { - @Override - public void onSuccess(com.yunbao.common.bean.LiveDataInfoModel data) { - list.clear(); - list.add(new LiveDataInfoModel("#00FFFF", getContext().getString(R.string.live_data_coin), data.getTotalCoin() + "")); - list.add(new LiveDataInfoModel("#FFF69F", getContext().getString(R.string.live_data_gold), data.getTotalGold() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_accept), data.getAcceptNum() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_enter), data.getEnterNum() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_attention), data.getAttentionNum() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_attention_rate), data.getAttentionNumRate() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_fan_group), data.getFanGroupNum() + "")); - list.add(new LiveDataInfoModel(getContext().getString(R.string.live_data_fan_group_rate), data.getFanGroupNumRate() + "")); - adapter.setList(list); - } - - @Override - public void onError(String error) { - ToastUtil.show(mContext.getString(com.yunbao.common.R.string.net_error)); - } - }); - - } } diff --git a/live/src/main/java/com/yunbao/live/dialog/LivePkTypeDialog.java b/live/src/main/java/com/yunbao/live/dialog/LivePkTypeDialog.java new file mode 100644 index 000000000..c4117f2f7 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/LivePkTypeDialog.java @@ -0,0 +1,83 @@ +package com.yunbao.live.dialog; + +import static com.yunbao.common.Constants.LIVE_FUNC_DR; +import static com.yunbao.common.Constants.LIVE_FUNC_LINK_MIC; +import static com.yunbao.common.Constants.LIVE_FUNC_RANDOM_PK; + +import android.content.Context; +import android.graphics.Color; +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.viewpager2.adapter.FragmentStateAdapter; +import androidx.viewpager2.widget.ViewPager2; + +import com.lxj.xpopup.XPopup; +import com.yunbao.common.dialog.AbsDialogPopupWindow; +import com.yunbao.common.fragment.LiveDataHistoryFragment; +import com.yunbao.common.fragment.LiveDataNowFragment; +import com.yunbao.common.utils.DpUtil; +import com.yunbao.common.utils.ViewPageIndicatorUtils; +import com.yunbao.common.utils.WordUtil; +import com.yunbao.live.R; +import com.yunbao.live.interfaces.LiveFunctionClickListener; + +import net.lucode.hackware.magicindicator.MagicIndicator; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.CommonNavigator; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView; +import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; + +import java.util.ArrayList; +import java.util.List; + +public class LivePkTypeDialog extends AbsDialogPopupWindow { + + private LiveFunctionClickListener mFunctionClickListener; + + public void setFunctionClickListener(LiveFunctionClickListener functionClickListener) { + mFunctionClickListener = functionClickListener; + } + + public LivePkTypeDialog(@NonNull Context context) { + super(context); + } + + @Override + public void buildDialog(XPopup.Builder builder) { + } + + @Override + public int bindLayoutId() { + return R.layout.dialog_pk_type; + } + + @Override + protected void onCreate() { + super.onCreate(); + findViewById(R.id.type_pk_1v1).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + mFunctionClickListener.onClick(LIVE_FUNC_LINK_MIC); + } + }); + findViewById(R.id.type_pk_dr).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + mFunctionClickListener.onClick(LIVE_FUNC_DR); + } + }); + findViewById(R.id.type_pk_random).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + mFunctionClickListener.onClick(LIVE_FUNC_RANDOM_PK); + } + }); + } +} diff --git a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java index 406a43b20..9a991c022 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java @@ -229,7 +229,7 @@ public class LiveRyAnchorViewHolder extends AbsLiveViewHolder { findViewById(R.id.btn_task).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ((LiveSwAnchorActivity) mContext).showTaskDialog(); + ((LiveSwAnchorActivity) mContext).showFunctionDialog(); } }); findViewById(R.id.btn_fz).setOnClickListener(new View.OnClickListener() { diff --git a/live/src/main/res/drawable/bg_live_pk_type.xml b/live/src/main/res/drawable/bg_live_pk_type.xml new file mode 100644 index 000000000..bc6bc886b --- /dev/null +++ b/live/src/main/res/drawable/bg_live_pk_type.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_live_data.xml b/live/src/main/res/layout/dialog_live_data.xml index df9cf5228..6b4458f29 100644 --- a/live/src/main/res/layout/dialog_live_data.xml +++ b/live/src/main/res/layout/dialog_live_data.xml @@ -1,9 +1,8 @@ + android:layout_height="30dp"> + android:text="@string/live_data_now_bottom_zs" /> - + android:textColor="#FFFFFF" + android:textSize="14sp" + android:text="0" /> - + - - + - - - + android:layout_width="match_parent" + android:textSize="11sp" + android:textColor="#92949A" + android:layout_height="wrap_content" + android:text="@string/live_data_tip" /> + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_pk_type.xml b/live/src/main/res/layout/dialog_pk_type.xml new file mode 100644 index 000000000..e937e852a --- /dev/null +++ b/live/src/main/res/layout/dialog_pk_type.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/item_live_data.xml b/live/src/main/res/layout/item_live_data.xml deleted file mode 100644 index f46e318f4..000000000 --- a/live/src/main/res/layout/item_live_data.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/live/src/main/res/mipmap-xhdpi/live_pk_1v1.png b/live/src/main/res/mipmap-xhdpi/live_pk_1v1.png new file mode 100644 index 0000000000000000000000000000000000000000..39059ccf5f532ef1a08fa910478e7b524f94e28d GIT binary patch literal 11460 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 Hu0mjf$(Ix1 literal 0 HcmV?d00001 diff --git a/live/src/main/res/mipmap-xhdpi/live_pk_sj.png b/live/src/main/res/mipmap-xhdpi/live_pk_sj.png new file mode 100644 index 0000000000000000000000000000000000000000..016c25285ec36d840d4dcb1b102ead798dc4a48a GIT binary patch literal 14981 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

;!8zn1VY8xfycq+`R`L0RZJ2uR`<5 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 P00000NkvXXu0mjfdRf)0 literal 0 HcmV?d00001 diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml index ae96e27f1..c26a62ac1 100644 --- a/live/src/main/res/values-zh/strings.xml +++ b/live/src/main/res/values-zh/strings.xml @@ -160,5 +160,7 @@ 我的等级 共 分鐘 + 本場總計鑽石: + 打賞人數: diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml index b84745648..c8ec86bf1 100644 --- a/live/src/main/res/values/strings.xml +++ b/live/src/main/res/values/strings.xml @@ -163,4 +163,6 @@ My level total minute + Get diamonds: + Gift givers: \ No newline at end of file