From f4d23c57dfc1442c867971d3cde279979f05da52 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Thu, 23 Mar 2023 14:26:52 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A5=B3=E7=A5=9E?= =?UTF-8?q?=E8=AF=B4=E7=9B=B8=E5=85=B3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/background_e6000.xml | 9 ++ .../adapter/LiveAnchorSayItemsAdapter.java | 76 +++++++++ .../live/dialog/LiveAnchorSayPopDialog.java | 126 +++++++++++++++ .../yunbao/live/views/LiveRoomViewHolder.java | 91 ++++++++++- .../res/anim/view_live_anchor_say_text_in.xml | 12 ++ .../anim/view_live_anchor_say_text_out.xml | 12 ++ live/src/main/res/drawable/bg_anchor_say.xml | 9 ++ .../res/drawable/bg_anchor_say_select.xml | 10 ++ .../src/main/res/layout/dialog_anchor_say.xml | 148 ++++++++++++++++++ live/src/main/res/layout/item_anchor_say.xml | 20 +++ .../res/layout/sim_live_room_anchor_say.xml | 35 +++++ live/src/main/res/layout/view_live_room.xml | 17 +- .../yunbao/main/views/MainHomeViewHolder.java | 6 + 13 files changed, 567 insertions(+), 4 deletions(-) create mode 100644 common/src/main/res/drawable/background_e6000.xml create mode 100644 live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java create mode 100644 live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java create mode 100644 live/src/main/res/anim/view_live_anchor_say_text_in.xml create mode 100644 live/src/main/res/anim/view_live_anchor_say_text_out.xml create mode 100644 live/src/main/res/drawable/bg_anchor_say.xml create mode 100644 live/src/main/res/drawable/bg_anchor_say_select.xml create mode 100644 live/src/main/res/layout/dialog_anchor_say.xml create mode 100644 live/src/main/res/layout/item_anchor_say.xml create mode 100644 live/src/main/res/layout/sim_live_room_anchor_say.xml diff --git a/common/src/main/res/drawable/background_e6000.xml b/common/src/main/res/drawable/background_e6000.xml new file mode 100644 index 000000000..564f3e6fc --- /dev/null +++ b/common/src/main/res/drawable/background_e6000.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java new file mode 100644 index 000000000..c24849ea0 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorSayItemsAdapter.java @@ -0,0 +1,76 @@ +package com.yunbao.live.adapter; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.adapter.OnItemClickListener; +import com.yunbao.live.R; + +import java.util.List; + +public class LiveAnchorSayItemsAdapter extends RecyclerView.Adapter { + private Context mContext; + private List list; + private int click = -1; + private OnItemClickListener onItemClickListener; + + public LiveAnchorSayItemsAdapter(Context mContext) { + this.mContext = mContext; + } + + public void setList(List list) { + this.list = list; + notifyDataSetChanged(); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.onItemClickListener = onItemClickListener; + } + + @NonNull + @Override + public ItemsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + return new ItemsViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_anchor_say, parent, false)); + } + + @Override + public void onBindViewHolder(@NonNull ItemsViewHolder holder, int position) { + holder.setData(list.get(position), position); + } + + @Override + public int getItemCount() { + return list.size(); + } + + public class ItemsViewHolder extends RecyclerView.ViewHolder { + private TextView textView; + + public ItemsViewHolder(@NonNull View itemView) { + super(itemView); + textView = itemView.findViewById(R.id.anchor_say_text); + itemView.setOnClickListener(v -> { + click = getAbsoluteAdapterPosition(); + if (onItemClickListener != null) { + onItemClickListener.onItemClick(click); + } + notifyDataSetChanged(); + }); + } + + public void setData(String text, int position) { + textView.setText(text); + if (position == click) { + itemView.setBackgroundResource(R.drawable.bg_anchor_say_select); + } else { + itemView.setBackgroundResource(R.drawable.bg_anchor_say); + } + } + } +} diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java new file mode 100644 index 000000000..8bb57df18 --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorSayPopDialog.java @@ -0,0 +1,126 @@ +package com.yunbao.live.dialog; + +import android.content.Context; +import android.text.Editable; +import android.text.TextWatcher; +import android.util.Log; +import android.view.KeyEvent; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.XPopup; +import com.yunbao.common.adapter.OnItemClickListener; +import com.yunbao.common.dialog.AbsDialogPopupWindow; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.live.R; +import com.yunbao.live.adapter.LiveAnchorSayItemsAdapter; + +import java.util.ArrayList; +import java.util.List; + +public class LiveAnchorSayPopDialog extends AbsDialogPopupWindow { + RecyclerView list; + View anchorDemo; + LiveAnchorSayItemsAdapter adapter; + ImageView saySwitch; + TextView sayText; + EditText sayEdit; + + public LiveAnchorSayPopDialog(@NonNull Context context) { + super(context); + } + + @Override + public void buildDialog(XPopup.Builder builder) { + builder.autoFocusEditText(false); + builder.enableDrag(false); + builder.borderRadius(50); + } + + @Override + public int bindLayoutId() { + return R.layout.dialog_anchor_say; + } + + @Override + protected void onCreate() { + super.onCreate(); + adapter = new LiveAnchorSayItemsAdapter(getContext()); + anchorDemo = findViewById(R.id.anchor_say); + sayText = anchorDemo.findViewById(R.id.anchor_say_text); + list = findViewById(R.id.anchor_say_list); + saySwitch = findViewById(R.id.say_switch); + sayEdit = findViewById(R.id.anchor_say_edit); + list.setLayoutManager(new GridLayoutManager(getContext(), 3)); + list.setAdapter(adapter); + adapter.setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(int position) { + + + } + }); + initData(); + + saySwitch.setOnClickListener(v -> { + if (saySwitch.getTag() == null) { + saySwitch.setTag(""); + saySwitch.setImageResource(R.mipmap.special_icon_on); + anchorDemo.setVisibility(VISIBLE); + } else { + saySwitch.setTag(null); + saySwitch.setImageResource(R.mipmap.special_icon_off); + anchorDemo.setVisibility(INVISIBLE); + + } + }); + + sayEdit.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + StringBuilder sb = new StringBuilder(); + int n = (s.length() + 3) / 4; + for (int i = 0; i < n; i++) { + if (i < (n - 1)) { + sb.append(s.toString().substring(i * 4, (i + 1) * 4)).append("\n"); + } else { + sb.append(s.toString().substring(i * 4)); + } + } + if(sb.length()==0){ + sb.append("默认字符\n默认字符\n默认字符"); + } + sayText.setText(sb.toString()); + } + + @Override + public void afterTextChanged(Editable s) { + + } + + }); + + } + + private void initData() { + List data = new ArrayList<>(); + for (int i = 0; i < 20; i++) { + data.add("data " + i); + + } + adapter.setList(data); + } +} diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 604304be3..a8f23ad72 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -37,6 +37,7 @@ import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SimpleItemAnimator; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -334,6 +335,11 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis //全服通知 private ImageView customFullServiceNotify; + //----主播说组件---// + private View mAnchorSay; + private ImageView mAnchorSayImage; + private TextView mAnchorSayText; + //----!主播说组件---// public LiveRoomViewHolder(boolean isRys, int forActivity, Context context, ViewGroup parentView, GifImageView gifImageView, SVGAImageView svgaImageView, ViewGroup liveGiftPrizePoolContainer, WindowManager windowManager) { super(context, parentView); @@ -676,6 +682,89 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void init() { EventBus.getDefault().register(this); + mAnchorSay = findViewById(R.id.anchor_say_layout); + mAnchorSayImage = (ImageView) findViewById(R.id.anchor_say_icon); + mAnchorSayText = (TextView) findViewById(R.id.anchor_say_text); + mAnchorSayImage.setOnClickListener(v -> { + Animation animation; + if (mAnchorSayText.getVisibility() == View.VISIBLE) { + animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_out); + } else { + animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_in); + } + animation.setAnimationListener(new Animation.AnimationListener() { + boolean isShow = false; + + @Override + public void onAnimationStart(Animation animation) { + if (mAnchorSayText.getVisibility() == View.GONE) { + mAnchorSayText.setVisibility(View.VISIBLE); + isShow = true; + } + } + + @Override + public void onAnimationEnd(Animation animation) { + if (mAnchorSayText.getVisibility() == View.VISIBLE && !isShow) { + mAnchorSayText.setVisibility(View.GONE); + } + } + + @Override + public void onAnimationRepeat(Animation animation) { + + } + }); + mAnchorSayText.startAnimation(animation); + }); + + mAnchorSayImage.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + Animation animation; + if (mAnchorSay.getVisibility() == View.VISIBLE) { + animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_out); + } else { + animation = AnimationUtils.loadAnimation(mContext, R.anim.view_live_anchor_say_text_in); + if(v==null){ + mAnchorSayText.setVisibility(View.VISIBLE); + } + } + animation.setAnimationListener(new Animation.AnimationListener() { + boolean isShow = false; + + @Override + public void onAnimationStart(Animation animation) { + if (mAnchorSay.getVisibility() == View.GONE) { + mAnchorSay.setVisibility(View.VISIBLE); + isShow = true; + } + } + + @Override + public void onAnimationEnd(Animation animation) { + if (mAnchorSay.getVisibility() == View.VISIBLE && !isShow) { + mAnchorSay.setVisibility(View.GONE); + } + if(v!=null) { + new Handler(Looper.getMainLooper()).postDelayed(() -> { + onLongClick(null); + + }, 2000); + }else{ + mAnchorSayText.setVisibility(View.VISIBLE); + } + } + + @Override + public void onAnimationRepeat(Animation animation) { + + } + }); + mAnchorSay.startAnimation(animation); + return false; + } + }); btnEvent = findViewById(R.id.btn_event); fullScreen = (FullServiceNotificationView) findViewById(R.id.full_screen); noble = (NobleNoticeView) findViewById(R.id.noble); @@ -1825,7 +1914,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis @Override public void onError(String error) { - ToastUtil.show( R.string.net_error); + ToastUtil.show(R.string.net_error); } }); diff --git a/live/src/main/res/anim/view_live_anchor_say_text_in.xml b/live/src/main/res/anim/view_live_anchor_say_text_in.xml new file mode 100644 index 000000000..b31b61750 --- /dev/null +++ b/live/src/main/res/anim/view_live_anchor_say_text_in.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/live/src/main/res/anim/view_live_anchor_say_text_out.xml b/live/src/main/res/anim/view_live_anchor_say_text_out.xml new file mode 100644 index 000000000..4e314cec9 --- /dev/null +++ b/live/src/main/res/anim/view_live_anchor_say_text_out.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_anchor_say.xml b/live/src/main/res/drawable/bg_anchor_say.xml new file mode 100644 index 000000000..e698c0765 --- /dev/null +++ b/live/src/main/res/drawable/bg_anchor_say.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/drawable/bg_anchor_say_select.xml b/live/src/main/res/drawable/bg_anchor_say_select.xml new file mode 100644 index 000000000..607704adc --- /dev/null +++ b/live/src/main/res/drawable/bg_anchor_say_select.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_anchor_say.xml b/live/src/main/res/layout/dialog_anchor_say.xml new file mode 100644 index 000000000..d36bfaa68 --- /dev/null +++ b/live/src/main/res/layout/dialog_anchor_say.xml @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/item_anchor_say.xml b/live/src/main/res/layout/item_anchor_say.xml new file mode 100644 index 000000000..f1fc38fff --- /dev/null +++ b/live/src/main/res/layout/item_anchor_say.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/sim_live_room_anchor_say.xml b/live/src/main/res/layout/sim_live_room_anchor_say.xml new file mode 100644 index 000000000..44c17dda3 --- /dev/null +++ b/live/src/main/res/layout/sim_live_room_anchor_say.xml @@ -0,0 +1,35 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 063e7d89a..ce2dd81d1 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/live/src/main/res/layout/view_live_room.xml @@ -1258,6 +1258,17 @@ + + + + android:visibility="visible" /> + android:layout_marginTop="60dp" + android:visibility="gone" /> \ No newline at end of file diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java index 6fb5f18d4..a41f106e5 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java @@ -9,6 +9,7 @@ import android.widget.ImageView; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.utils.WordUtil; +import com.yunbao.live.dialog.LiveAnchorSayPopDialog; import com.yunbao.live.dialog.LiveRobotSettingDialogFragment; import com.yunbao.main.R; import com.yunbao.main.activity.MainActivity; @@ -43,6 +44,11 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder { ImgLoader.display(mContext, "https://downs.yaoulive.com/gif_trophy.gif", img_trophy); + img_trophy.setOnLongClickListener(v -> { + new LiveAnchorSayPopDialog(mContext).showDialog(); + return false; + }); + } From 0c6eac2936301bcf5aa736f55d1db16e361c88e2 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 24 Mar 2023 10:52:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E7=9B=B8=E5=85=B3UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shayu/phonelive/NeverCrashUtils.java | 5 +- .../layout/live_anchor_call_me_edit_title.xml | 55 ++++ .../adapter/LiveAnchorEditCallMeAdapter.java | 262 ++++++++++++++++++ .../com/yunbao/live/dialog/GiftPopDialog.java | 129 +++++---- .../dialog/LiveAnchorEditCallMeDialog.java | 73 +++++ .../LiveAnchorEditCallMeEditAppDialog.java | 107 +++++++ .../live/dialog/LivePrankDialogFragment.java | 4 +- .../main/res/drawable/background_33ffffff.xml | 0 .../main/res/drawable/bg_live_ready_btn2.xml | 9 + .../layout/dialog_anchor_call_edit_app.xml | 78 ++++++ .../main/res/layout/dialog_anchor_call_me.xml | 104 +++++++ .../src/main/res/layout/dialog_anchor_say.xml | 4 +- .../layout/dialog_live_select_gift_wrap.xml | 1 + .../res/layout/item_anchor_call_me_app.xml | 57 ++++ .../res/layout/item_anchor_call_me_gift.xml | 63 +++++ .../res/layout/item_anchor_call_me_letter.xml | 50 ++++ live/src/main/res/mipmap-mdpi/icon_line_x.png | Bin 0 -> 14057 bytes .../main/res/mipmap-mdpi/icon_wechat_x.png | Bin 0 -> 15642 bytes .../main/res/mipmap-mdpi/icon_whatsapp_x.png | Bin 0 -> 17745 bytes .../ic_live_anchor_edit_call_me_edit.png | Bin 0 -> 623 bytes .../ic_live_anchor_edit_call_me_r.png | Bin 0 -> 207 bytes .../yunbao/main/views/MainHomeViewHolder.java | 9 +- 22 files changed, 941 insertions(+), 69 deletions(-) create mode 100644 common/src/main/res/layout/live_anchor_call_me_edit_title.xml create mode 100644 live/src/main/java/com/yunbao/live/adapter/LiveAnchorEditCallMeAdapter.java create mode 100644 live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java create mode 100644 live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java rename {main => live}/src/main/res/drawable/background_33ffffff.xml (100%) create mode 100644 live/src/main/res/drawable/bg_live_ready_btn2.xml create mode 100644 live/src/main/res/layout/dialog_anchor_call_edit_app.xml create mode 100644 live/src/main/res/layout/dialog_anchor_call_me.xml create mode 100644 live/src/main/res/layout/item_anchor_call_me_app.xml create mode 100644 live/src/main/res/layout/item_anchor_call_me_gift.xml create mode 100644 live/src/main/res/layout/item_anchor_call_me_letter.xml create mode 100644 live/src/main/res/mipmap-mdpi/icon_line_x.png create mode 100644 live/src/main/res/mipmap-mdpi/icon_wechat_x.png create mode 100644 live/src/main/res/mipmap-mdpi/icon_whatsapp_x.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_anchor_edit_call_me_edit.png create mode 100644 live/src/main/res/mipmap-xhdpi/ic_live_anchor_edit_call_me_r.png diff --git a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java index 87fccce94..5e7fecaa1 100644 --- a/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java +++ b/app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java @@ -8,6 +8,7 @@ import android.os.Looper; import android.util.Log; import android.widget.Toast; +import com.yunbao.common.BuildConfig; import com.yunbao.common.bean.CrashSaveBean; import com.yunbao.common.utils.FileUtil; import com.yunbao.common.utils.SpUtil; @@ -101,7 +102,9 @@ public class NeverCrashUtils { Log.e(TAG, "未捕获的主线程异常行为", e); } e.printStackTrace(); - //Toast.makeText(application, "发生闪退:"+e.getMessage(), Toast.LENGTH_SHORT).show(); + if(BuildConfig.DEBUG) { + Toast.makeText(application, "发生闪退:"+e.getMessage(), Toast.LENGTH_SHORT).show(); + } FileUtil.saveStringToFile(new File(application.getDir("files", Context.MODE_PRIVATE).getAbsolutePath()), throwableToString(e), "error.log"); getMainCrashHandler().mainException(Looper.getMainLooper().getThread(), e); // return; diff --git a/common/src/main/res/layout/live_anchor_call_me_edit_title.xml b/common/src/main/res/layout/live_anchor_call_me_edit_title.xml new file mode 100644 index 000000000..964b43618 --- /dev/null +++ b/common/src/main/res/layout/live_anchor_call_me_edit_title.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveAnchorEditCallMeAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorEditCallMeAdapter.java new file mode 100644 index 000000000..11d08543b --- /dev/null +++ b/live/src/main/java/com/yunbao/live/adapter/LiveAnchorEditCallMeAdapter.java @@ -0,0 +1,262 @@ +package com.yunbao.live.adapter; + +import android.app.Dialog; +import android.content.Context; +import android.graphics.Color; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.yunbao.common.bean.PrankGiftBean; +import com.yunbao.common.glide.ImgLoader; +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.StringUtil; +import com.yunbao.common.utils.ToastUtil; +import com.yunbao.live.R; +import com.yunbao.live.dialog.GiftPopDialog; +import com.yunbao.live.dialog.LiveAnchorEditCallMeEditAppDialog; + +import java.util.ArrayList; +import java.util.List; + +public class LiveAnchorEditCallMeAdapter extends RecyclerView.Adapter { + public static final int TYPE_GIFT = 0; + public static final int TYPE_LETTER = 1; + public static final int TYPE_APP_WECHAT = 2; + public static final int TYPE_APP_LINE = 3; + public static final int TYPE_APP_WHATSAPP = 4; + private Context mContext; + private OnItemClickListener onItemClickListener; + private List list = new ArrayList<>(); + private String mLiveUid = "98275"; + private View mParent; + + public LiveAnchorEditCallMeAdapter(Context mContext, View parent) { + this.mContext = mContext; + this.mParent = parent; + } + + public void setList(List list) { + this.list = list; + notifyDataSetChanged(); + } + + public void setOnItemClickListener(OnItemClickListener onItemClickListener) { + this.onItemClickListener = onItemClickListener; + } + + @Override + public int getItemViewType(int position) { + return list.get(position).getType(); + } + + @NonNull + @Override + public BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + BaseViewHolder holder; + switch (viewType) { + case TYPE_GIFT: + holder = new GiftViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_anchor_call_me_gift, parent, false)); + break; + case TYPE_LETTER: + holder = new LetterViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_anchor_call_me_letter, parent, false)); + break; + default: + holder = new AppViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_anchor_call_me_app, parent, false)); + } + return holder; + } + + @Override + public void onBindViewHolder(@NonNull BaseViewHolder holder, int position) { + holder.setData(list.get(position), position); + } + + @Override + public int getItemCount() { + return list.size(); + } + + public static class TmpData { + private String value; + private int status; + private int type; + + public TmpData() { + } + + public TmpData(String value, int status, int type) { + this.value = value; + this.status = status; + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + } + + public class BaseViewHolder extends RecyclerView.ViewHolder { + + public BaseViewHolder(@NonNull View itemView) { + super(itemView); + } + + public void setData(TmpData data, int position) { + + } + } + + public class GiftViewHolder extends BaseViewHolder { + + private View select; + private ImageView giftIcon; + + public GiftViewHolder(@NonNull View itemView) { + super(itemView); + select = itemView.findViewById(R.id.select); + giftIcon = itemView.findViewById(R.id.gift_icon); + select.setOnClickListener(v -> { + initGiftData(); + }); + } + + @Override + public void setData(TmpData data, int position) { + super.setData(data, position); + } + + + private void initGiftData() { + new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() { + + @Override + public void onSelectGift(PrankGiftBean bean) { + if (bean != null) { + ImgLoader.display(mContext, bean.getIcon(), giftIcon); + } + } + + @Override + public void onDismiss() { + } + }) + .setShowNumber(false) + .setTitle("選擇禮物") + .showDialog() + ; + } + } + + + public class LetterViewHolder extends BaseViewHolder { + TextView letter; + View edit; + + public LetterViewHolder(@NonNull View itemView) { + super(itemView); + letter = itemView.findViewById(R.id.letterText); + edit = itemView.findViewById(R.id.edit); + edit.setOnClickListener(v -> { + new LiveAnchorEditCallMeEditAppDialog(mContext, LiveAnchorEditCallMeEditAppDialog.TYPE_LETTER).setOnValueListener(new OnItemClickListener() { + @Override + public void onItemClick(String bean, int position) { + letter.setText(bean); + } + }).showDialog(); + }); + } + + @Override + public void setData(TmpData data, int position) { + super.setData(data, position); + letter.setText(data.getValue()); + } + } + + public class AppViewHolder extends BaseViewHolder { + TextView contact; + View edit; + ImageView status; + ImageView icon; + + public AppViewHolder(@NonNull View itemView) { + super(itemView); + contact = itemView.findViewById(R.id.contact); + edit = itemView.findViewById(R.id.app_edit); + status = itemView.findViewById(R.id.app_switch); + icon = itemView.findViewById(R.id.gift_icon); + itemView.setOnClickListener(v -> { + if (onItemClickListener != null) { + onItemClickListener.onItemClick(list.get(getAbsoluteAdapterPosition()), getAbsoluteAdapterPosition()); + } + }); + } + + @Override + public void setData(TmpData data, int position) { + super.setData(data, position); + if (StringUtil.isEmpty(data.getValue())) { + contact.setText("未填写"); + contact.setTextColor(Color.parseColor("#80FFFFFF")); + } else { + contact.setText(data.getValue()); + contact.setTextColor(Color.WHITE); + } + if (data.getStatus() == 0) { + status.setImageResource(R.mipmap.special_icon_off); + } else if (data.getStatus() == 1) { + status.setImageResource(R.mipmap.special_icon_on); + } + edit.setOnClickListener(v -> { + new LiveAnchorEditCallMeEditAppDialog(mContext, data.getType()).setOnValueListener(new OnItemClickListener() { + @Override + public void onItemClick(String bean, int position) { + contact.setText(bean); + } + }).showDialog(); + }); + switch (data.getType()) { + case TYPE_APP_WECHAT: + icon.setImageResource(R.mipmap.icon_wechat_x); + break; + case TYPE_APP_LINE: + icon.setImageResource(R.mipmap.icon_line_x); + break; + case TYPE_APP_WHATSAPP: + icon.setImageResource(R.mipmap.icon_whatsapp_x); + break; + } + } + + } +} diff --git a/live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java b/live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java index 0fcae4596..662e3dcda 100644 --- a/live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java +++ b/live/src/main/java/com/yunbao/live/dialog/GiftPopDialog.java @@ -17,8 +17,10 @@ import android.widget.TextView; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.lxj.xpopup.XPopup; import com.yunbao.common.bean.LiveGiftBean; import com.yunbao.common.bean.PrankGiftBean; +import com.yunbao.common.dialog.AbsDialogPopupWindow; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.StringUtil; @@ -34,15 +36,14 @@ import com.yunbao.live.http.LiveHttpUtil; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -public class GiftPopDialog extends PopupWindow implements ActionListener, View.OnClickListener { +public class GiftPopDialog extends AbsDialogPopupWindow implements ActionListener, View.OnClickListener { - private View mParent; private Context mContext; - private View mContentView; private LiveGiftPagerAdapter mLiveGiftPagerAdapter; private GiftPopDialog.ActionListener mActionListener; private View mLoading; @@ -60,16 +61,27 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O private int prangNum; private InputMethodManager imm; private List giftBeans; + private boolean showNumber = true; + private View numberView; + private String title; + private TextView mTitle; - private void initView(View mRootView) { - mLoading = mRootView.findViewById(R.id.loading); - items = (RecyclerView) mRootView.findViewById(R.id.items); - mViewPager = (ViewPager) mRootView.findViewById(R.id.viewPager); - mRadioGroup = (RadioGroup) mRootView.findViewById(R.id.radio_group); - mBtnSend = mRootView.findViewById(R.id.btn_send); - mBtnContext = mRootView.findViewById(R.id.btn_context); - mBtn = mRootView.findViewById(R.id.gift_btn); - mBack = mRootView.findViewById(R.id.gift_back); + + public GiftPopDialog(@NonNull Context context) { + super(context); + } + + private void initView() { + mLoading = findViewById(R.id.loading); + items = (RecyclerView) findViewById(R.id.items); + mViewPager = (ViewPager) findViewById(R.id.viewPager); + mRadioGroup = (RadioGroup) findViewById(R.id.radio_group); + mBtnSend = findViewById(R.id.btn_send); + mBtnContext = findViewById(R.id.btn_context); + mBtn = findViewById(R.id.gift_btn); + mBack = findViewById(R.id.gift_back); + mTitle = findViewById(R.id.title); + numberView = findViewById(R.id.btn_send_group); final LinearLayoutManager manager = new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false); items.setLayoutManager(manager); mViewPager.setOffscreenPageLimit(5); @@ -112,52 +124,41 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O } }); + if (!showNumber) { + numberView.setVisibility(View.GONE); + prangNum = 1; + prangContext = "null"; + } + if (!StringUtil.isEmpty(title)) { + mTitle.setText(title); + } } - public GiftPopDialog(Context mContext, View parent, GiftPopDialog.ActionListener actionListener) { + public GiftPopDialog(Context mContext, GiftPopDialog.ActionListener actionListener) { + super(mContext); this.mContext = mContext; - mParent = parent; mActionListener = actionListener; - mContentView = LayoutInflater.from(mContext).inflate(R.layout.dialog_live_select_gift_wrap, null); - ViewParent viewParent = mContentView.getParent(); - if (viewParent != null) { - ((ViewGroup) viewParent).removeView(mContentView); - } - setContentView(mContentView); - setWidth(ViewGroup.LayoutParams.MATCH_PARENT); - setHeight(ViewGroup.LayoutParams.MATCH_PARENT); - setBackgroundDrawable(new ColorDrawable()); - setOutsideTouchable(true); - setFocusable(true); - setAnimationStyle(R.style.leftToRightAnim); - setOnDismissListener(new OnDismissListener() { - @Override - public void onDismiss() { - if (mActionListener != null) { - if (bean == null || StringUtil.isEmpty(prangContext) || prangNum == 0) { - mActionListener.onDismiss(); - return; - } - PrankGiftBean giftBean = new PrankGiftBean(); - giftBean.setGiftId(bean.getId() + ""); - giftBean.setNum(prangNum); - giftBean.setIcon(bean.getIcon()); - giftBean.setTitle(prangContext); - giftBean.setName(bean.getName()); - mActionListener.onSelectGift(giftBean); - System.out.println("gift.bean = " + bean); - } - ViewParent viewParent = mContentView.getParent(); - if (viewParent != null) { - ((ViewGroup) viewParent).removeView(mContentView); - } - mContentView = null; - } - }); - initView(mContentView); + // setAnimationStyle(R.style.leftToRightAnim); + + } + + @Override + protected void onCreate() { + super.onCreate(); + initView(); initDate(); } + public GiftPopDialog setShowNumber(boolean showNumber) { + this.showNumber = showNumber; + return this; + } + + public GiftPopDialog setTitle(String title) { + this.title = title; + return this; + } + private void initDate() { LiveHttpUtil.getNewGiftList(new HttpCallback() { @Override @@ -214,10 +215,6 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O } } - public void show() { - showAtLocation(mParent, Gravity.CENTER, 0, 0); - } - @Override public void onItemChecked(LiveGiftBean bean) { @@ -233,11 +230,11 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O public void onConfirmClick(Dialog dialog, String content) { try { prangNum = Integer.parseInt(content); - if (prangNum <= 0 ) { + if (prangNum <= 0) { ToastUtil.show("數量不能為0或負數"); return; } - if(prangNum>999){ + if (prangNum > 999) { ToastUtil.show("數量不能大於999"); return; } @@ -298,6 +295,14 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O } } dismiss(); + + PrankGiftBean giftBean = new PrankGiftBean(); + giftBean.setGiftId(bean.getId() + ""); + giftBean.setNum(prangNum); + giftBean.setIcon(bean.getIcon()); + giftBean.setTitle(prangContext); + giftBean.setName(bean.getName()); + mActionListener.onSelectGift(giftBean); } else if (id == R.id.gift_back) { dismiss(); } @@ -307,6 +312,16 @@ public class GiftPopDialog extends PopupWindow implements ActionListener, View.O this.giftBeans = giftBeans; } + @Override + public void buildDialog(XPopup.Builder builder) { + builder.enableDrag(false); + } + + @Override + public int bindLayoutId() { + return R.layout.dialog_live_select_gift_wrap; + } + public interface ActionListener { void onSelectGift(PrankGiftBean bean); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java new file mode 100644 index 000000000..4d5d1c03f --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeDialog.java @@ -0,0 +1,73 @@ +package com.yunbao.live.dialog; + +import android.app.Dialog; +import android.content.Context; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.lxj.xpopup.XPopup; +import com.yunbao.common.bean.PrankGiftBean; +import com.yunbao.common.dialog.AbsDialogPopupWindow; +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.live.R; +import com.yunbao.live.adapter.LiveAnchorEditCallMeAdapter; +import com.yunbao.live.adapter.LivePrankRecyclerAdapter; + +import java.util.ArrayList; +import java.util.List; + +public class LiveAnchorEditCallMeDialog extends AbsDialogPopupWindow { + String mLiveUid = "98275"; + RecyclerView list; + LiveAnchorEditCallMeAdapter adapter; + + public LiveAnchorEditCallMeDialog(@NonNull Context context) { + super(context); + } + + @Override + public void buildDialog(XPopup.Builder builder) { + builder.enableDrag(false); + builder.autoFocusEditText(false); + } + + @Override + public int bindLayoutId() { + return R.layout.dialog_anchor_call_me; + } + + @Override + protected void onCreate() { + super.onCreate(); + initView(); + initData(); + } + + private void initData() { + List data = new ArrayList<>(); + data.add(new LiveAnchorEditCallMeAdapter.TmpData(null, 1, LiveAnchorEditCallMeAdapter.TYPE_GIFT)); + data.add(new LiveAnchorEditCallMeAdapter.TmpData("测试测试", 1, LiveAnchorEditCallMeAdapter.TYPE_LETTER)); + data.add(new LiveAnchorEditCallMeAdapter.TmpData("13333333333", 1, LiveAnchorEditCallMeAdapter.TYPE_APP_WECHAT)); + data.add(new LiveAnchorEditCallMeAdapter.TmpData("13333333333", 0, LiveAnchorEditCallMeAdapter.TYPE_APP_LINE)); + data.add(new LiveAnchorEditCallMeAdapter.TmpData(null, 0, LiveAnchorEditCallMeAdapter.TYPE_APP_WHATSAPP)); + adapter.setList(data); + } + + private void initView() { + list = findViewById(R.id.anchor_call_list); + adapter = new LiveAnchorEditCallMeAdapter(getContext(),getRootView()); + + list.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); + list.setAdapter(adapter); + + } + + +} diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java new file mode 100644 index 000000000..4c9c6b83a --- /dev/null +++ b/live/src/main/java/com/yunbao/live/dialog/LiveAnchorEditCallMeEditAppDialog.java @@ -0,0 +1,107 @@ +package com.yunbao.live.dialog; + +import android.content.Context; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import androidx.annotation.NonNull; + +import com.lxj.xpopup.XPopup; +import com.yunbao.common.dialog.AbsDialogPopupWindow; +import com.yunbao.common.interfaces.OnItemClickListener; +import com.yunbao.common.utils.StringUtil; +import com.yunbao.live.R; + +public class LiveAnchorEditCallMeEditAppDialog extends AbsDialogPopupWindow { + public static final int TYPE_LETTER = 0; + public static final int TYPE_APP_WECHAT = 2; + public static final int TYPE_APP_LINE = 3; + public static final int TYPE_APP_WHATSAPP = 4; + OnItemClickListener clickListener; + private int type; + private String defValue; + + private TextView titleView; + private TextView title; + private EditText edit; + + public LiveAnchorEditCallMeEditAppDialog(@NonNull Context context) { + super(context); + this.type = TYPE_LETTER; + } + + public LiveAnchorEditCallMeEditAppDialog(@NonNull Context context, int type) { + super(context); + this.type = type; + } + + @Override + public void buildDialog(XPopup.Builder builder) { + builder.autoFocusEditText(false); + builder.moveUpToKeyboard(false); + builder.enableDrag(false); + } + + @Override + public int bindLayoutId() { + return R.layout.dialog_anchor_call_edit_app; + } + + public void setDefValue(String defValue) { + this.defValue = defValue; + } + + public LiveAnchorEditCallMeEditAppDialog setOnValueListener(OnItemClickListener clickListener) { + this.clickListener = clickListener; + return this; + } + + @Override + protected void onCreate() { + super.onCreate(); + initView(); + initData(); + + switch (type) { + case TYPE_LETTER: + titleView.setText("填寫信內容"); + edit.setHint("我能想到最浪漫的事,就是和你一起慢慢變老,一路上收藏點點滴滴的歡笑,留到以後坐著搖椅慢慢聊。"); + title.setText("信內容"); + break; + case TYPE_APP_WECHAT: + titleView.setText("填寫聯系方式"); + edit.setHint("请输入"); + title.setText("Wechat账号"); + break; + case TYPE_APP_LINE: + titleView.setText("填寫聯系方式"); + edit.setHint("请输入"); + title.setText("Line账号"); + break; + case TYPE_APP_WHATSAPP: + titleView.setText("填寫聯系方式"); + edit.setHint("请输入"); + title.setText("WhatsApp账号"); + break; + } + } + + private void initData() { + if (!StringUtil.isEmpty(defValue)) { + edit.setText(defValue); + } + } + + void initView() { + titleView = findViewById(R.id.titleView); + title = findViewById(R.id.title); + edit = findViewById(R.id.edit); + findViewById(R.id.btn_back).setOnClickListener(v -> dismiss()); + findViewById(R.id.submit).setOnClickListener(v -> { + clickListener.onItemClick(edit.getText().toString(), 0); + dismiss(); + }); + } +} diff --git a/live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java index 110932759..a5e0d1cf2 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LivePrankDialogFragment.java @@ -141,7 +141,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O ToastUtil.show("可添加禮物數量達到上限"); return; } - GiftPopDialog dialog = new GiftPopDialog(mContext, mRootView, new GiftPopDialog.ActionListener() { + GiftPopDialog dialog = new GiftPopDialog(mContext, new GiftPopDialog.ActionListener() { @Override public void onSelectGift(PrankGiftBean bean) { @@ -156,7 +156,7 @@ public class LivePrankDialogFragment extends AbsDialogFragment implements View.O } }); dialog.setList(giftBeans); - dialog.show(); + dialog.showDialog(); } else { setPrankConfig(); } diff --git a/main/src/main/res/drawable/background_33ffffff.xml b/live/src/main/res/drawable/background_33ffffff.xml similarity index 100% rename from main/src/main/res/drawable/background_33ffffff.xml rename to live/src/main/res/drawable/background_33ffffff.xml diff --git a/live/src/main/res/drawable/bg_live_ready_btn2.xml b/live/src/main/res/drawable/bg_live_ready_btn2.xml new file mode 100644 index 000000000..f7cda2e72 --- /dev/null +++ b/live/src/main/res/drawable/bg_live_ready_btn2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/live/src/main/res/layout/dialog_anchor_call_edit_app.xml b/live/src/main/res/layout/dialog_anchor_call_edit_app.xml new file mode 100644 index 000000000..a398e27b8 --- /dev/null +++ b/live/src/main/res/layout/dialog_anchor_call_edit_app.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + +