From 874800c19d95dce33db29d91d35bea201eb26275 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Sat, 24 Dec 2022 14:45:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yunbao/common/Constants.java | 1 + .../res/layout/dialog_live_new_function.xml | 22 ++++++++++++++++++ .../mipmap-xxhdpi/live_more_icon_robot.png | Bin 0 -> 24900 bytes common/src/main/res/values/strings.xml | 1 + .../live/activity/LiveRyAnchorActivity.java | 8 ++++++- .../dialog/LiveNewFunctionDialogFragment.java | 4 ++++ 6 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 common/src/main/res/mipmap-xxhdpi/live_more_icon_robot.png diff --git a/common/src/main/java/com/yunbao/common/Constants.java b/common/src/main/java/com/yunbao/common/Constants.java index 02b0020ea..fabbf6967 100644 --- a/common/src/main/java/com/yunbao/common/Constants.java +++ b/common/src/main/java/com/yunbao/common/Constants.java @@ -133,6 +133,7 @@ public class Constants { public static final int LIVE_FUNC_WKS = 2014;//語音 public static final int LIVE_FUNC_ZSLK = 2015;//語音 public static final int LIVE_FUNC_RANDOM_PK = 2016;//随机PK + public static final int LIVE_ROBOT= 2017;//机器人 //socket public static final String SOCKET_CONN = "conn"; diff --git a/common/src/main/res/layout/dialog_live_new_function.xml b/common/src/main/res/layout/dialog_live_new_function.xml index c60106ebf..4182a2fc9 100644 --- a/common/src/main/res/layout/dialog_live_new_function.xml +++ b/common/src/main/res/layout/dialog_live_new_function.xml @@ -95,6 +95,28 @@ android:textSize="12sp" /> + + + + + + + diff --git a/common/src/main/res/mipmap-xxhdpi/live_more_icon_robot.png b/common/src/main/res/mipmap-xxhdpi/live_more_icon_robot.png new file mode 100644 index 0000000000000000000000000000000000000000..bba2b06628ef01c9a32f6b927554c0792d412465 GIT binary patch literal 24900 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%0D!Uo?Yf=tk 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最少間隔5分鐘1次 當有用戶進入直播間時,機器人會@該用戶並自動 隨機以下一句話。最少設置1條,最多20條。 + 機器人設置 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java index ae79b5bb8..8a46d8030 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java @@ -34,6 +34,7 @@ import com.alibaba.fastjson.JSONObject; import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; +import com.lxj.xpopup.XPopup; import com.opensource.svgaplayer.SVGAImageView; import com.tencent.trtc.TRTCCloudDef; import com.yunbao.common.CommonAppConfig; @@ -66,13 +67,13 @@ 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.common.views.LiveRobotSettingCustomPopup; import com.yunbao.faceunity.FaceManager; import com.yunbao.live.R; import com.yunbao.live.bean.LiveGuardInfo; import com.yunbao.live.bean.LiveKsyConfigBean; import com.yunbao.live.bean.LiveReceiveGiftBean; import com.yunbao.live.dialog.FreePkDialogFragment; -import com.yunbao.live.dialog.LiveLinkMicListDialogFragment; import com.yunbao.live.dialog.LiveNewFunctionDialogFragment; import com.yunbao.live.dialog.LiveNewWishListDialogFragment; import com.yunbao.live.dialog.LivePrankDialogFragment; @@ -281,6 +282,11 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl @Override public void onClick(int functionID) { switch (functionID) { + case Constants.LIVE_ROBOT: + new XPopup.Builder(mContext) + .asCustom(new LiveRobotSettingCustomPopup(mContext)) + .show(); + break; case Constants.LIVE_FUNC_ZG://zg // ToastUtil.show("開發中,敬請期待"); LivePrankDialogFragment fragment = new LivePrankDialogFragment(); diff --git a/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java b/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java index 364ea23fd..48e7168ef 100644 --- a/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java +++ b/live/src/main/java/com/yunbao/live/dialog/LiveNewFunctionDialogFragment.java @@ -92,6 +92,7 @@ public class LiveNewFunctionDialogFragment extends AbsDialogFragment implements mMultiPkView.setOnClickListener(this); mMicView.setOnClickListener(this); mRandomPk.setOnClickListener(this); + findViewById(R.id.live_tool_robot).setOnClickListener(this); if (leave == 0) { ((ImageView) mLeaveView.findViewById(R.id.live_tool_leave_img)).setImageResource(R.mipmap.icon_leave); @@ -145,6 +146,9 @@ public class LiveNewFunctionDialogFragment extends AbsDialogFragment implements mFunctionClickListener.onClick(LIVE_FUNC_MIC); } else if (id == R.id.live_tool_random_pk) { mFunctionClickListener.onClick(LIVE_FUNC_RANDOM_PK); + }else if (id==R.id.live_tool_robot){ + mFunctionClickListener.onClick(LIVE_ROBOT); + dismiss(); } } }